AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed wxXLocale(wxLanguage) ctor under Windows, use it instead of ctor from locale string in the test

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-02-10 17:38:37 +00:00
parent 609ea9cf02
commit f9727b1be5
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/xlocale.cpp
View File

@ -88,7 +88,11 @@ wxXLocale::wxXLocale(wxLanguage lang)
}
else
{
#ifdef __WXMSW__
Init(info->Description);
#else
Init(info->CanonicalName);
#endif
}
}

9
tests/xlocale/xlocale.cpp
View File

@ -65,8 +65,11 @@ void XLocaleTestCase::TestCtor()
CPPUNIT_ASSERT( wxXLocale("C").IsOk() );
#ifdef wxHAS_XLOCALE_SUPPORT
CPPUNIT_ASSERT( wxXLocale(wxLANGUAGE_FRENCH).IsOk() );
CPPUNIT_ASSERT( wxXLocale("fr_FR").IsOk() );
#ifdef __WXMSW__
CPPUNIT_ASSERT( wxXLocale("french").IsOk() );
#else
CPPUNIT_ASSERT( wxXLocale("fr_FR").IsOk() );
#endif
#endif
CPPUNIT_ASSERT( !wxXLocale("bloordyblop").IsOk() );
}
@ -169,7 +172,9 @@ void XLocaleTestCase::TestCtypeFunctions()
TestCtypeFunctionsWith(wxCLocale);
#ifdef wxHAS_XLOCALE_SUPPORT
wxXLocale locFR("fr_FR");
wxXLocale locFR(wxLANGUAGE_FRENCH);
CPPUNIT_ASSERT( locFR.IsOk() ); // doesn't make sense to continue otherwise
TestCtypeFunctionsWith(locFR);
CPPUNIT_ASSERT( wxIsalpha_l('é', locFR) );