X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52cd14b1c8c74a8d52d5a4ae9a31cfa1d123297a..a7c26d107d0c6f191e55d30613f4816e9c2f9386:/src/common/valtext.cpp diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp index 0b8f2b0ecc..0e62b5ded3 100644 --- a/src/common/valtext.cpp +++ b/src/common/valtext.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "valtext.h" #endif @@ -229,10 +229,6 @@ void wxTextValidator::SetExcludeList(const wxStringList& list) m_excludeList = list; } -#ifdef __WXWINCE__ -inline int isascii(wxChar c) { return (c >= 0) && (c <=127); } -#endif - void wxTextValidator::OnChar(wxKeyEvent& event) { /* @@ -248,8 +244,8 @@ void wxTextValidator::OnChar(wxKeyEvent& event) if ( !(keyCode < WXK_SPACE || keyCode == WXK_DELETE || keyCode > WXK_START) && ( - ((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_INCLUDE_CHAR_LIST) && !IsInCharIncludeList(wxString((wxChar) keyCode, 1))) || + ((m_validatorStyle & wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludeList(wxString((wxChar) keyCode, 1))) || ((m_validatorStyle & wxFILTER_ASCII) && !isascii(keyCode)) || ((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) || ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) ||