X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/609ea9cf02f31b653b3a3455ed950ef01dbfc32c..b5fe7ca67bf3121959a0b5a59afd00c1708f2f03:/tests/xlocale/xlocale.cpp

diff --git a/tests/xlocale/xlocale.cpp b/tests/xlocale/xlocale.cpp
index 157afad2b3..07172bb09c 100644
--- 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("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,13 +172,15 @@ 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) );
-    CPPUNIT_ASSERT( wxIslower_l('é', locFR) );
-    CPPUNIT_ASSERT( !wxIslower_l('É', locFR) );
-    CPPUNIT_ASSERT( wxIsupper_l('É', locFR) );
+    CPPUNIT_ASSERT( wxIsalpha_l('\xe9', locFR) );
+    CPPUNIT_ASSERT( wxIslower_l('\xe9', locFR) );
+    CPPUNIT_ASSERT( !wxIslower_l('\xc9', locFR) );
+    CPPUNIT_ASSERT( wxIsupper_l('\xc9', locFR) );
 #endif
 }