X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/264cb7f5f33e6d4fcae54093f5169c559190ecd0..12b5f4b4d2d8a07962da7ba3b78c8c1ec2634a67:/src/common/valtext.cpp diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp index 4acfd58319..a2f5c621ef 100644 --- a/src/common/valtext.cpp +++ b/src/common/valtext.cpp @@ -16,13 +16,14 @@ #pragma hdrstop #endif -#if wxUSE_VALIDATORS && wxUSE_TEXTCTRL +#if wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX) #include "wx/valtext.h" #ifndef WX_PRECOMP #include #include "wx/textctrl.h" + #include "wx/combobox.h" #include "wx/utils.h" #include "wx/msgdlg.h" #include "wx/intl.h" @@ -32,19 +33,71 @@ #include #include -#ifdef __SALFORDC__ - #include -#endif +// ---------------------------------------------------------------------------- +// global helpers +// ---------------------------------------------------------------------------- + +static bool wxIsAlpha(const wxString& val) +{ + int i; + for ( i = 0; i < (int)val.length(); i++) + { + if (!wxIsalpha(val[i])) + return false; + } + return true; +} + +static bool wxIsAlphaNumeric(const wxString& val) +{ + int i; + for ( i = 0; i < (int)val.length(); i++) + { + if (!wxIsalnum(val[i])) + return false; + } + return true; +} + +static bool wxIsNumeric(const wxString& val) +{ + int i; + for ( i = 0; i < (int)val.length(); i++) + { + // Allow for "," (French) as well as "." -- in future we should + // use wxSystemSettings or other to do better localisation + if ((!wxIsdigit(val[i])) && (val[i] != wxT('.')) && (val[i] != wxT(',')) && (val[i] != wxT('e')) && + (val[i] != wxT('E')) && (val[i] != wxT('+')) && (val[i] != wxT('-'))) + return false; + } + return true; +} -IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator) +// ---------------------------------------------------------------------------- +// wxTextValidator +// ---------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator) BEGIN_EVENT_TABLE(wxTextValidator, wxValidator) EVT_CHAR(wxTextValidator::OnChar) END_EVENT_TABLE() -static bool wxIsNumeric(const wxString& val); +#if WXWIN_COMPATIBILITY_2_8 wxTextValidator::wxTextValidator(long style, wxString *val) +{ + m_validatorStyle = (wxTextValidatorStyle)style; + m_stringValue = val; +} + +void wxTextValidator::SetStyle(long style) +{ + SetStyle((wxTextValidatorStyle)style); +} +#endif + +wxTextValidator::wxTextValidator(wxTextValidatorStyle style, wxString *val) { m_validatorStyle = style; m_stringValue = val; @@ -75,100 +128,98 @@ bool wxTextValidator::Copy(const wxTextValidator& val) return true; } -static bool wxIsAlpha(const wxString& val) +wxTextEntry *wxTextValidator::GetTextEntry() { - int i; - for ( i = 0; i < (int)val.length(); i++) +#if wxUSE_TEXTCTRL + if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl))) { - if (!wxIsalpha(val[i])) - return false; + return (wxTextCtrl*)m_validatorWindow; } - return true; -} +#endif -static bool wxIsAlphaNumeric(const wxString& val) -{ - int i; - for ( i = 0; i < (int)val.length(); i++) +#if wxUSE_COMBOBOX + if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox))) { - if (!wxIsalnum(val[i])) - return false; + return (wxComboBox*)m_validatorWindow; } - return true; +#endif + + wxFAIL_MSG( + _T("wxTextValidator can only be used with wxTextCtrl or wxComboBox") + ); + + return NULL; } // Called when the value in the window must be validated. // This function can pop up an error message. bool wxTextValidator::Validate(wxWindow *parent) { - if( !CheckValidator() ) - return false; - - wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow; - // If window is disabled, simply return - if ( !control->IsEnabled() ) + if ( !m_validatorWindow->IsEnabled() ) return true; - wxString val(control->GetValue()); + wxTextEntry * const text = GetTextEntry(); + if ( !text ) + return false; - bool ok = true; + wxString val(text->GetValue()); - // NB: this format string should contian exactly one '%s' + // NB: this format string should always contain exactly one '%s' wxString errormsg; - bool includes = (m_validatorStyle & wxFILTER_INCLUDE_LIST) != 0; - if ( includes || (m_validatorStyle & wxFILTER_EXCLUDE_LIST) ) - { - // if includes, it's only ok to have the members of the list, - // otherwise it's only ok to have non-members - ok = includes == (m_includes.Index(val) != wxNOT_FOUND); - if ( !ok ) - { - errormsg = _("'%s' is invalid"); - } - } - else if ( (m_validatorStyle & wxFILTER_ASCII) && !val.IsAscii() ) + switch (m_validatorStyle) { - ok = false; + case wxFILTER_NONE: + // nothing to do... + break; - errormsg = _("'%s' should only contain ASCII characters."); - } - else if ( (m_validatorStyle & wxFILTER_ALPHA) && !wxIsAlpha(val) ) - { - ok = false; + case wxFILTER_INCLUDE_LIST: + if ( m_includes.Index(val) == wxNOT_FOUND ) + errormsg = _("'%s' is invalid"); + break; - errormsg = _("'%s' should only contain alphabetic characters."); - } - else if ( (m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsAlphaNumeric(val)) - { - ok = false; + case wxFILTER_EXCLUDE_LIST: + if ( m_excludes.Index(val) != wxNOT_FOUND ) + errormsg = _("'%s' is invalid"); + break; + + case wxFILTER_ASCII: + if ( !val.IsAscii() ) + errormsg = _("'%s' should only contain ASCII characters."); + break; + + case wxFILTER_ALPHA: + if ( !wxIsAlpha(val) ) + errormsg = _("'%s' should only contain alphabetic characters."); + break; + + case wxFILTER_ALPHANUMERIC: + if ( !wxIsAlphaNumeric(val) ) + errormsg = _("'%s' should only contain alphabetic or numeric characters."); + break; + + case wxFILTER_NUMERIC: + if ( !wxIsNumeric(val) ) + errormsg = _("'%s' should be numeric."); + break; + + case wxFILTER_INCLUDE_CHAR_LIST: + if ( !IsInCharIncludes(val) ) + errormsg = _("'%s' is invalid"); + break; - errormsg = _("'%s' should only contain alphabetic or numeric characters."); - } - else if ( (m_validatorStyle & wxFILTER_NUMERIC) && !wxIsNumeric(val)) - { - ok = false; + case wxFILTER_EXCLUDE_CHAR_LIST: + if ( !IsNotInCharExcludes(val) ) + errormsg = _("'%s' is invalid"); + break; - errormsg = _("'%s' should be numeric."); - } - else if ( (m_validatorStyle & wxFILTER_INCLUDE_CHAR_LIST) && !IsInCharIncludes(val)) - { - //it's only ok to have the members of the list - errormsg = _("'%s' is invalid"); - ok = false; - } - else if ( (m_validatorStyle & wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludes(val)) - { - // it's only ok to have non-members of the list - errormsg = _("'%s' is invalid"); - ok = false; + default: + wxFAIL_MSG("invalid text validator style"); } - if ( !ok ) + if ( !errormsg.empty() ) { - wxASSERT_MSG( !errormsg.empty(), _T("you forgot to set errormsg") ); - m_validatorWindow->SetFocus(); wxString buf; @@ -176,21 +227,23 @@ bool wxTextValidator::Validate(wxWindow *parent) wxMessageBox(buf, _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent); + + return false; } - return ok; + return true; } // Called to transfer data to the window bool wxTextValidator::TransferToWindow(void) { - if( !CheckValidator() ) - return false; - if ( m_stringValue ) { - wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow; - control->SetValue(* m_stringValue); + wxTextEntry * const text = GetTextEntry(); + if ( !text ) + return false; + + text->SetValue(*m_stringValue); } return true; @@ -199,75 +252,18 @@ bool wxTextValidator::TransferToWindow(void) // Called to transfer data to the window bool wxTextValidator::TransferFromWindow(void) { - if( !CheckValidator() ) - return false; - if ( m_stringValue ) { - wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow; - *m_stringValue = control->GetValue(); - } - - return true; -} - -#if WXWIN_COMPATIBILITY_2_4 - -inline void wxCopyStringListToArrayString(wxArrayString& to, const wxStringList& from) -{ - to.Clear(); + wxTextEntry * const text = GetTextEntry(); + if ( !text ) + return false; - for ( wxStringList::compatibility_iterator pNode = from.GetFirst(); - pNode; - pNode = pNode->GetNext() ) - { - to.Add(pNode->GetData()); + *m_stringValue = text->GetValue(); } -} -inline void wxCopyArrayStringToStringList(wxStringList& to, const wxArrayString& from) -{ - to.Clear(); - - for(size_t i = 0; i < from.GetCount(); ++i) - to.Add(from[i]); -} - -wxStringList& wxTextValidator::GetIncludeList() -{ - wxCopyArrayStringToStringList(m_includeList, m_includes); - return m_includeList; -} - -wxStringList& wxTextValidator::GetExcludeList() -{ - wxCopyArrayStringToStringList(m_excludeList, m_excludes); - return m_excludeList; -} - -void wxTextValidator::SetIncludeList(const wxStringList& list) -{ - wxCopyStringListToArrayString(m_includes, list); -} - -void wxTextValidator::SetExcludeList(const wxStringList& list) -{ - wxCopyStringListToArrayString(m_excludes, list); -} - -bool wxTextValidator::IsInCharIncludeList(const wxString& val) -{ - return IsInCharIncludes(val); -} - -bool wxTextValidator::IsNotInCharExcludeList(const wxString& val) -{ - return IsNotInCharExcludes(val); + return true; } -#endif //compat 2.4 - - bool wxTextValidator::IsInCharIncludes(const wxString& val) { size_t i; @@ -305,13 +301,14 @@ void wxTextValidator::OnChar(wxKeyEvent& event) if ( !(keyCode < WXK_SPACE || keyCode == WXK_DELETE || keyCode > WXK_START) && ( - ((m_validatorStyle & wxFILTER_INCLUDE_CHAR_LIST) && !IsInCharIncludes(wxString((wxChar) keyCode, 1))) || - ((m_validatorStyle & wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludes(wxString((wxChar) keyCode, 1))) || - ((m_validatorStyle & wxFILTER_ASCII) && !isascii(keyCode)) || - ((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) || - ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) || - ((m_validatorStyle & wxFILTER_NUMERIC) && !wxIsdigit(keyCode) - && keyCode != wxT('.') && keyCode != wxT(',') && keyCode != wxT('-') && keyCode != wxT('+') && keyCode != wxT('e') && keyCode != wxT('E')) + ((m_validatorStyle == wxFILTER_INCLUDE_CHAR_LIST) && !IsInCharIncludes(wxString((wxChar) keyCode, 1))) || + ((m_validatorStyle == wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludes(wxString((wxChar) keyCode, 1))) || + ((m_validatorStyle == wxFILTER_ASCII) && !isascii(keyCode)) || + ((m_validatorStyle == wxFILTER_ALPHA) && !wxIsalpha(keyCode)) || + ((m_validatorStyle == wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) || + ((m_validatorStyle == wxFILTER_NUMERIC) && !wxIsdigit(keyCode) + && keyCode != wxT('.') && keyCode != wxT(',') && keyCode != wxT('-') && keyCode != wxT('+') + && keyCode != wxT('e') && keyCode != wxT('E')) ) ) { @@ -326,19 +323,6 @@ void wxTextValidator::OnChar(wxKeyEvent& event) event.Skip(); } -static bool wxIsNumeric(const wxString& val) -{ - int i; - for ( i = 0; i < (int)val.length(); i++) - { - // Allow for "," (French) as well as "." -- in future we should - // use wxSystemSettings or other to do better localisation - if ((!wxIsdigit(val[i])) && (val[i] != wxT('.')) && (val[i] != wxT(',')) && (val[i] != wxT('e')) && (val[i] != wxT('E')) && (val[i] != wxT('+')) && (val[i] != wxT('-'))) - return false; - } - return true; -} - #endif - // wxUSE_VALIDATORS && wxUSE_TEXTCTRL + // wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)