From ab431d9e3d4bf8e853c15fb8fb585f746bda081f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 10 Feb 2008 17:43:43 +0000 Subject: [PATCH] cast char values to unsigned char before passing them to CRT functions as MSVC CRT asserts if passed a negative value git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/xlocale.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h index 75c3f08d42..198a9921cb 100644 --- a/include/wx/xlocale.h +++ b/include/wx/xlocale.h @@ -198,31 +198,31 @@ private: #define wxCRT_Toupper_lA wxXLOCALE_IDENT(toupper_l) inline int wxIsalnum_l(char c, const wxXLocale& loc) - { return wxCRT_Isalnum_lA(c, loc.Get()); } + { return wxCRT_Isalnum_lA(wx_static_cast(unsigned char, c), loc.Get()); } inline int wxIsalpha_l(char c, const wxXLocale& loc) - { return wxCRT_Isalpha_lA(c, loc.Get()); } + { return wxCRT_Isalpha_lA(wx_static_cast(unsigned char, c), loc.Get()); } inline int wxIscntrl_l(char c, const wxXLocale& loc) - { return wxCRT_Iscntrl_lA(c, loc.Get()); } + { return wxCRT_Iscntrl_lA(wx_static_cast(unsigned char, c), loc.Get()); } inline int wxIsdigit_l(char c, const wxXLocale& loc) - { return wxCRT_Isdigit_lA(c, loc.Get()); } + { return wxCRT_Isdigit_lA(wx_static_cast(unsigned char, c), loc.Get()); } inline int wxIsgraph_l(char c, const wxXLocale& loc) - { return wxCRT_Isgraph_lA(c, loc.Get()); } + { return wxCRT_Isgraph_lA(wx_static_cast(unsigned char, c), loc.Get()); } inline int wxIslower_l(char c, const wxXLocale& loc) - { return wxCRT_Islower_lA(c, loc.Get()); } + { return wxCRT_Islower_lA(wx_static_cast(unsigned char, c), loc.Get()); } inline int wxIsprint_l(char c, const wxXLocale& loc) - { return wxCRT_Isprint_lA(c, loc.Get()); } + { return wxCRT_Isprint_lA(wx_static_cast(unsigned char, c), loc.Get()); } inline int wxIspunct_l(char c, const wxXLocale& loc) - { return wxCRT_Ispunct_lA(c, loc.Get()); } + { return wxCRT_Ispunct_lA(wx_static_cast(unsigned char, c), loc.Get()); } inline int wxIsspace_l(char c, const wxXLocale& loc) - { return wxCRT_Isspace_lA(c, loc.Get()); } + { return wxCRT_Isspace_lA(wx_static_cast(unsigned char, c), loc.Get()); } inline int wxIsupper_l(char c, const wxXLocale& loc) - { return wxCRT_Isupper_lA(c, loc.Get()); } + { return wxCRT_Isupper_lA(wx_static_cast(unsigned char, c), loc.Get()); } inline int wxIsxdigit_l(char c, const wxXLocale& loc) - { return wxCRT_Isxdigit_lA(c, loc.Get()); } - inline char wxTolower_l(char c, const wxXLocale& loc) - { return wxCRT_Tolower_lA(c, loc.Get()); } - inline char wxToupper_l(char c, const wxXLocale& loc) - { return wxCRT_Toupper_lA(c, loc.Get()); } + { return wxCRT_Isxdigit_lA(wx_static_cast(unsigned char, c), loc.Get()); } + inline int wxTolower_l(char c, const wxXLocale& loc) + { return wxCRT_Tolower_lA(wx_static_cast(unsigned char, c), loc.Get()); } + inline int wxToupper_l(char c, const wxXLocale& loc) + { return wxCRT_Toupper_lA(wx_static_cast(unsigned char, c), loc.Get()); } #if wxUSE_UNICODE #define wxCRT_Isalnum_lW wxXLOCALE_IDENT(iswalnum_l) -- 2.45.2