X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/543f08a67631f2849872d5d3ee7cb99047718560..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/common/valtext.cpp diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp index 0bc8568d54..483b71d075 100644 --- a/src/common/valtext.cpp +++ b/src/common/valtext.cpp @@ -40,13 +40,11 @@ #include #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator) BEGIN_EVENT_TABLE(wxTextValidator, wxValidator) EVT_CHAR(wxTextValidator::OnChar) END_EVENT_TABLE() -#endif static bool wxIsNumeric(const wxString& val); @@ -100,7 +98,7 @@ static bool wxIsAlpha(const wxString& val) int i; for ( i = 0; i < (int)val.Length(); i++) { - if (!isalpha(val[i])) + if (!wxIsalpha(val[i])) return FALSE; } return TRUE; @@ -111,7 +109,7 @@ static bool wxIsAlphaNumeric(const wxString& val) int i; for ( i = 0; i < (int)val.Length(); i++) { - if (!isalnum(val[i])) + if (!wxIsalnum(val[i])) return FALSE; } return TRUE; @@ -121,11 +119,7 @@ static bool wxIsAlphaNumeric(const wxString& val) // This function can pop up an error message. bool wxTextValidator::Validate(wxWindow *parent) { - if ( !m_validatorWindow ) - return FALSE; - if ( !m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) ) - return FALSE; - if ( !m_stringValue ) + if( !CheckValidator() ) return FALSE; wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ; @@ -138,21 +132,18 @@ bool wxTextValidator::Validate(wxWindow *parent) bool ok = TRUE; - // this format string should contian exactly one '%s' - const wxChar *errormsg = _("'%s' is invalid"); + // NB: this format string should contian exactly one '%s' + wxString errormsg; - if ( m_validatorStyle & wxFILTER_INCLUDE_LIST ) - { - if ( !m_includeList.Member(val) ) - { - ok = FALSE; - } - } - else if ( m_validatorStyle & wxFILTER_EXCLUDE_LIST ) + bool includeList = (m_validatorStyle & wxFILTER_INCLUDE_LIST) != 0; + if ( includeList || (m_validatorStyle & wxFILTER_EXCLUDE_LIST) ) { - if ( m_excludeList.Member(val) ) + // if includeList, it's only ok to have the members of the list, + // otherwise it's only ok to have non-members + ok = includeList == m_includeList.Member(val); + if ( !ok ) { - ok = FALSE; + errormsg = _("'%s' is invalid"); } } else if ( (m_validatorStyle & wxFILTER_ASCII) && !val.IsAscii() ) @@ -182,6 +173,8 @@ bool wxTextValidator::Validate(wxWindow *parent) if ( !ok ) { + wxASSERT_MSG( !errormsg.empty(), _T("you forgot to set errormsg") ); + m_validatorWindow->SetFocus(); wxString buf; @@ -197,11 +190,7 @@ bool wxTextValidator::Validate(wxWindow *parent) // Called to transfer data to the window bool wxTextValidator::TransferToWindow(void) { - if ( !m_validatorWindow ) - return FALSE; - if ( !m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) ) - return FALSE; - if ( !m_stringValue ) + if( !CheckValidator() ) return FALSE; wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ; @@ -213,11 +202,7 @@ bool wxTextValidator::TransferToWindow(void) // Called to transfer data to the window bool wxTextValidator::TransferFromWindow(void) { - if ( !m_validatorWindow ) - return FALSE; - if ( !m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) ) - return FALSE; - if ( !m_stringValue ) + if( !CheckValidator() ) return FALSE; wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ; @@ -271,16 +256,16 @@ void wxTextValidator::OnChar(wxKeyEvent& event) if ( m_validatorWindow ) { - int keyCode = event.KeyCode(); + int keyCode = (int)event.KeyCode(); // we don't filter special keys and Delete if ( !(keyCode < WXK_SPACE || keyCode == WXK_DELETE || keyCode > WXK_START) && ( ((m_validatorStyle & wxFILTER_ASCII) && !isascii(keyCode)) || - ((m_validatorStyle & wxFILTER_ALPHA) && !isalpha(keyCode)) || - ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !isalnum(keyCode)) || - ((m_validatorStyle & wxFILTER_NUMERIC) && !isdigit(keyCode) + ((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) || + ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) || + ((m_validatorStyle & wxFILTER_NUMERIC) && !wxIsdigit(keyCode) && keyCode != '.' && keyCode != ',' && keyCode != '-') ) ) @@ -312,4 +297,3 @@ static bool wxIsNumeric(const wxString& val) #endif // wxUSE_VALIDATORS - \ No newline at end of file