Revised #ifndef WX_PRECOMP headers, added missing #include wx/wxcrtvararg.h

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

diff --git a/src/common/xlocale.cpp b/src/common/xlocale.cpp
index 1f00c13c9865b74caad7ee0dd9a6f88c586cf4ff..6adb86b8d996cb5a4baf1e5bbd8c451c81d3cf51 100644 (file)
--- a/src/common/xlocale.cpp
+++ b/src/common/xlocale.cpp
@@ -77,6 +77,8 @@ wxXLocale& wxXLocale::GetCLocale()
     return *gs_cLocale;
 }
 
     return *gs_cLocale;
 }
 

+#ifdef wxHAS_XLOCALE_SUPPORT
+

 wxXLocale::wxXLocale(wxLanguage lang)
 {
     const wxLanguageInfo * const info = wxLocale::GetLanguageInfo(lang);
 wxXLocale::wxXLocale(wxLanguage lang)
 {
     const wxLanguageInfo * const info = wxLocale::GetLanguageInfo(lang);


@@ -86,12 +88,10 @@ wxXLocale::wxXLocale(wxLanguage lang)
     }
     else
     {
     }
     else
     {

-        Init(info->CanonicalName);
+        Init(info->GetLocaleName().c_str());

     }
 }
 
     }
 }
 

-#ifdef wxHAS_XLOCALE_SUPPORT
-

 #if wxCHECK_VISUALC_VERSION(8)
 
 // ----------------------------------------------------------------------------
 #if wxCHECK_VISUALC_VERSION(8)
 
 // ----------------------------------------------------------------------------


@@ -199,11 +199,11 @@ GEN_ISFUNC(wxIsspace_l, CTYPE_SPACE)
 GEN_ISFUNC(wxIsupper_l, CTYPE_UPPER)
 GEN_ISFUNC(wxIsxdigit_l, CTYPE_XDIGIT)
 
 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);
 
 {
     wxCHECK(loc.IsOk(), false);
 

-    if(CTYPE_TEST(c, CTYPE_UPPER))
+    if(CTYPE_TEST(c.GetValue(), CTYPE_UPPER))

     {
         return c - 'A' + 'a';
     }
     {
         return c - 'A' + 'a';
     }


@@ -211,11 +211,11 @@ wxUniChar wxTolower_l(const wxUniChar& c, const wxXLocale& loc)
     return c;
 }
 
     return c;
 }
 

-wxUniChar wxToupper_l(const wxUniChar& c, const wxXLocale& loc)
+int wxToupper_l(const wxUniChar& c, const wxXLocale& loc)

 {
     wxCHECK(loc.IsOk(), false);
 
 {
     wxCHECK(loc.IsOk(), false);
 

-    if(CTYPE_TEST(c, CTYPE_LOWER))
+    if(CTYPE_TEST(c.GetValue(), CTYPE_LOWER))

     {
         return c - 'a' + 'A';
     }
     {
         return c - 'a' + 'A';
     }