X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45f5fbd4388ec8e8349cd9912a12d980180a7e64..acd32ffcdb319f162633c20e0202db3f8542998a:/src/common/xlocale.cpp

diff --git a/src/common/xlocale.cpp b/src/common/xlocale.cpp
index ad9fb2cd6a..b04288c648 100644
--- a/src/common/xlocale.cpp
+++ b/src/common/xlocale.cpp
@@ -71,7 +71,7 @@ wxXLocale& wxXLocale::GetCLocale()
 {
     if ( !gs_cLocale )
     {
-        gs_cLocale = new wxXLocale(wx_static_cast(wxXLocaleCTag *, NULL));
+        gs_cLocale = new wxXLocale(static_cast<wxXLocaleCTag *>(NULL));
     }
 
     return *gs_cLocale;
@@ -88,7 +88,7 @@ wxXLocale::wxXLocale(wxLanguage lang)
     }
     else
     {
-        Init(info->CanonicalName);
+        Init(info->GetLocaleName().c_str());
     }
 }
 
@@ -199,7 +199,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 +211,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);