diff --git a/src/common/string.cpp b/src/common/string.cpp index 7ac3f254a2..29d51e71b8 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -1017,7 +1017,7 @@ bool wxString::IsAscii() const { const wxChar *s = (const wxChar*) *this; while(*s){ - if(!wxIsascii(*s)) return(FALSE); + if(!isascii(*s)) return(FALSE); s++; } return(TRUE); diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp index 7ca1758c3d..16dadf77a5 100644 --- a/src/common/valtext.cpp +++ b/src/common/valtext.cpp @@ -246,7 +246,7 @@ void wxTextValidator::OnChar(wxKeyEvent& event) ( ((m_validatorStyle & wxFILTER_INCLUDE_CHAR_LIST) && !IsInCharIncludeList(wxString((char) keyCode, 1))) || ((m_validatorStyle & wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludeList(wxString((char) keyCode, 1))) || - ((m_validatorStyle & wxFILTER_ASCII) && !wxIsascii(keyCode)) || + ((m_validatorStyle & wxFILTER_ASCII) && !isascii(keyCode)) || ((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) || ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) || ((m_validatorStyle & wxFILTER_NUMERIC) && !wxIsdigit(keyCode)