Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Put the locale funcs here and had them call the correct CRT function via wx versions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2003-12-14 23:06:05 +00:00
parent f5386212fe
commit f97c9db7ae
1 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/common/regex.cpp
View File

@@ -188,7 +188,7 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
// compile it // compile it
#if wxUSE_UNICODE #if wxUSE_UNICODE
int errorcode = wx_regcomp(&m_RegEx, expr, expr.Length(), flagsRE); int errorcode = wx_regcomp(&m_RegEx, expr, expr.Length(), REG_ADVANCED);
#else #else
int errorcode = regcomp(&m_RegEx, expr.mb_str(), flagsRE); int errorcode = regcomp(&m_RegEx, expr.mb_str(), flagsRE);
#endif #endif
@@ -484,4 +484,38 @@ int wxRegEx::Replace(wxString *pattern,
return m_impl->Replace(pattern, replacement, maxMatches); return m_impl->Replace(pattern, replacement, maxMatches);
} }
#ifdef wx_wchar
/** Locale functions */
extern "C" {
int wx_isdigit(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIsdigit((unsigned char) c));}
int wx_isalpha(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIsalpha((unsigned char) c));}
int wx_isalnum(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIsalnum((unsigned char) c));}
int wx_isupper(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIsupper((unsigned char) c));}
int wx_islower(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIslower((unsigned char) c));}
int wx_isgraph(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIsgraph((unsigned char) c));}
int wx_ispunct(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIspunct((unsigned char) c));}
int wx_isspace(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIsspace((unsigned char) c));}
wx_wchar wx_toupper(wx_wchar c)
{
if (c >= 0 && c <= UCHAR_MAX)
return wxToupper((unsigned char) c);
return c;
}
wx_wchar wx_tolower(wx_wchar c)
{
if (c >= 0 && c <= UCHAR_MAX)
return wxTolower((unsigned char) c);
return c;
}
}
#endif
#endif // wxUSE_REGEX #endif // wxUSE_REGEX