fixed wxXLocale(wxLanguage) ctor under Windows, use it instead of ctor from locale...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/xlocale.cpp b/src/common/xlocale.cpp
index 14c7a5b35c92cd64280648b18c87742c2f0b6162..e72fd843a058b91396770b96254a16caf0fc1042 100644 (file)
--- a/src/common/xlocale.cpp
+++ b/src/common/xlocale.cpp
@@ -88,7 +88,11 @@ wxXLocale::wxXLocale(wxLanguage lang)
     }
     else
     {
     }
     else
     {

+#ifdef __WXMSW__
+        Init(info->Description);
+#else

         Init(info->CanonicalName);
         Init(info->CanonicalName);

+#endif

     }
 }
 
     }
 }
 

diff --git a/tests/xlocale/xlocale.cpp b/tests/xlocale/xlocale.cpp
index 157afad2b359bd14922b99acca64cda4e20adfb4..d0502e48874919172e08a67fe2dcb0f52d31a2a1 100644 (file)
--- a/tests/xlocale/xlocale.cpp
+++ b/tests/xlocale/xlocale.cpp
@@ -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("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() );
     CPPUNIT_ASSERT( wxXLocale("french").IsOk() );

+#else
+    CPPUNIT_ASSERT( wxXLocale("fr_FR").IsOk() );
+#endif

 #endif
     CPPUNIT_ASSERT( !wxXLocale("bloordyblop").IsOk() );
 }
 #endif
     CPPUNIT_ASSERT( !wxXLocale("bloordyblop").IsOk() );
 }


@@ -169,7 +172,9 @@ void XLocaleTestCase::TestCtypeFunctions()
     TestCtypeFunctionsWith(wxCLocale);
 
 #ifdef wxHAS_XLOCALE_SUPPORT
     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) );
     TestCtypeFunctionsWith(locFR);
 
     CPPUNIT_ASSERT( wxIsalpha_l('é', locFR) );