AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-02-10 17:16:31 +00:00
parent 45f5fbd438
commit a4e53d4658
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/xlocale.h
View File

@ -268,7 +268,6 @@ private:
#endif // wxUSE_UNICDE (ctype functions) #endif // wxUSE_UNICDE (ctype functions)
#else // !wxHAS_XLOCALE_SUPPORT #else // !wxHAS_XLOCALE_SUPPORT
// ctype functions // ctype functions
int WXDLLIMPEXP_BASE wxIsalnum_l(const wxUniChar& c, const wxXLocale& loc); int WXDLLIMPEXP_BASE wxIsalnum_l(const wxUniChar& c, const wxXLocale& loc);
int WXDLLIMPEXP_BASE wxIsalpha_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 wxIsspace_l(const wxUniChar& c, const wxXLocale& loc);
int WXDLLIMPEXP_BASE wxIsupper_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); int WXDLLIMPEXP_BASE wxIsxdigit_l(const wxUniChar& c, const wxXLocale& loc);
wxUniChar WXDLLIMPEXP_BASE wxTolower_l(const wxUniChar& c, const wxXLocale& loc); int WXDLLIMPEXP_BASE wxTolower_l(const wxUniChar& c, const wxXLocale& loc);
wxUniChar WXDLLIMPEXP_BASE wxToupper_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 // wxHAS_XLOCALE_SUPPORT/!wxHAS_XLOCALE_SUPPORT
#endif // wxUSE_XLOCALE #endif // wxUSE_XLOCALE

4
src/common/xlocale.cpp
View File

@ -199,7 +199,7 @@ GEN_ISFUNC(wxIsspace_l, CTYPE_SPACE)
GEN_ISFUNC(wxIsupper_l, CTYPE_UPPER) GEN_ISFUNC(wxIsupper_l, CTYPE_UPPER)
GEN_ISFUNC(wxIsxdigit_l, CTYPE_XDIGIT) 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);
@ -211,7 +211,7 @@ 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);