implement wxListBox::EnsureVisible() in wxGTK; add a test for it to the widgets sample

[wxWidgets.git] / src / common / xlocale.cpp

diff --git a/src/common/xlocale.cpp b/src/common/xlocale.cpp
index ad9fb2cd6a8c485e1283cd8b4c6a52a78c2204ed..24d1a3f443e61ca9752c667b9083e82872dbacf6 100644 (file)
--- a/src/common/xlocale.cpp
+++ b/src/common/xlocale.cpp
@@ -88,7 +88,14 @@ wxXLocale::wxXLocale(wxLanguage lang)
     }
     else
     {
-        Init(info->CanonicalName);
+        wxString loc;
+#ifdef __WXMSW__
+        loc = info->Description;
+#else
+        loc = info->CanonicalName;
+#endif
+
+        Init(loc.c_str());
     }
 }
 
@@ -199,7 +206,7 @@ GEN_ISFUNC(wxIsspace_l, CTYPE_SPACE)
 GEN_ISFUNC(wxIsupper_l, CTYPE_UPPER)
 GEN_ISFUNC(wxIsxdigit_l, CTYPE_XDIGIT)
 
-wxUniChar wxTolower_l(const wxUniChar& c, const wxXLocale& loc)
+int wxTolower_l(const wxUniChar& c, const wxXLocale& loc)
 {
     wxCHECK(loc.IsOk(), false);
 
@@ -211,7 +218,7 @@ wxUniChar wxTolower_l(const wxUniChar& c, const wxXLocale& loc)
     return c;
 }
 
-wxUniChar wxToupper_l(const wxUniChar& c, const wxXLocale& loc)
+int wxToupper_l(const wxUniChar& c, const wxXLocale& loc)
 {
     wxCHECK(loc.IsOk(), false);