return int, not wxUniChar, from wxTo{upp,low}er_l() for consistency with the standard...

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

diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h
index 58069d63b4e77ba1520202b0807d206e31817feb..75c3f08d423dce4b4acee2e8ccfccdc8db0c049b 100644 (file)
--- a/include/wx/xlocale.h
+++ b/include/wx/xlocale.h
@@ -268,7 +268,6 @@ private:
 
     #endif // wxUSE_UNICDE (ctype functions)
 #else // !wxHAS_XLOCALE_SUPPORT
-
     // ctype functions
     int WXDLLIMPEXP_BASE wxIsalnum_l(const wxUniChar& c, const wxXLocale& loc);
     int WXDLLIMPEXP_BASE wxIsalpha_l(const wxUniChar& c, const wxXLocale& loc);
@@ -281,10 +280,8 @@ private:
     int WXDLLIMPEXP_BASE wxIsspace_l(const wxUniChar& c, const wxXLocale& loc);
     int WXDLLIMPEXP_BASE wxIsupper_l(const wxUniChar& c, const wxXLocale& loc);
     int WXDLLIMPEXP_BASE wxIsxdigit_l(const wxUniChar& c, const wxXLocale& loc);
-    wxUniChar WXDLLIMPEXP_BASE wxTolower_l(const wxUniChar& c, const wxXLocale& loc);
-    wxUniChar WXDLLIMPEXP_BASE wxToupper_l(const wxUniChar& c, const wxXLocale& loc);
-
-
+    int WXDLLIMPEXP_BASE wxTolower_l(const wxUniChar& c, const wxXLocale& loc);
+    int WXDLLIMPEXP_BASE wxToupper_l(const wxUniChar& c, const wxXLocale& loc);
 #endif // wxHAS_XLOCALE_SUPPORT/!wxHAS_XLOCALE_SUPPORT
 
 #endif // wxUSE_XLOCALE

diff --git a/src/common/xlocale.cpp b/src/common/xlocale.cpp
index ad9fb2cd6a8c485e1283cd8b4c6a52a78c2204ed..14c7a5b35c92cd64280648b18c87742c2f0b6162 100644 (file)
--- a/src/common/xlocale.cpp
+++ b/src/common/xlocale.cpp
@@ -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);