X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1e4e7cc9624f20989abbd3d8c303062c34d8a5e..4aa1406671c5d6abded83e3713b423ac4d40b7c9:/src/common/valtext.cpp?ds=sidebyside diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp index 16dadf77a5..2732e560b3 100644 --- a/src/common/valtext.cpp +++ b/src/common/valtext.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: valtext.cpp +// Name: src/common/valtext.cpp // Purpose: wxTextValidator // Author: Julian Smart // Modified by: @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "valtext.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -20,43 +16,96 @@ #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" #endif -#include "wx/valtext.h" - #include #include #include -#ifdef __SALFORDC__ - #include -#endif +// ---------------------------------------------------------------------------- +// global helpers +// ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator) +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; +} + + +// ---------------------------------------------------------------------------- +// 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 = style ; - m_stringValue = 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; /* m_refData = new wxVTextRefData; - M_VTEXTDATA->m_validatorStyle = style ; - M_VTEXTDATA->m_stringValue = val ; + M_VTEXTDATA->m_validatorStyle = style; + M_VTEXTDATA->m_stringValue = val; */ } @@ -70,113 +119,103 @@ bool wxTextValidator::Copy(const wxTextValidator& val) { wxValidator::Copy(val); - m_validatorStyle = val.m_validatorStyle ; - m_stringValue = val.m_stringValue ; + m_validatorStyle = val.m_validatorStyle; + m_stringValue = val.m_stringValue; - m_includeList = val.m_includeList; - m_excludeList = val.m_excludeList; - - return TRUE; -} + m_includes = val.m_includes; + m_excludes = val.m_excludes; -wxTextValidator::~wxTextValidator() -{ + 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() ) - return TRUE; + 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 includeList = (m_validatorStyle & wxFILTER_INCLUDE_LIST) != 0; - if ( includeList || (m_validatorStyle & wxFILTER_EXCLUDE_LIST) ) + switch (m_validatorStyle) { - // 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 ) - { + case wxFILTER_INCLUDE_LIST: + if ( m_includes.Index(val) == wxNOT_FOUND ) errormsg = _("'%s' is invalid"); - } - } - else if ( (m_validatorStyle & wxFILTER_ASCII) && !val.IsAscii() ) - { - ok = FALSE; + break; - errormsg = _("'%s' should only contain ASCII characters."); - } - else if ( (m_validatorStyle & wxFILTER_ALPHA) && !wxIsAlpha(val) ) - { - ok = FALSE; - - 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) && !IsInCharIncludeList(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) && !IsNotInCharExcludeList(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; @@ -184,49 +223,63 @@ 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) - return TRUE; + if ( m_stringValue ) + { + wxTextEntry * const text = GetTextEntry(); + if ( !text ) + return false; - wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ; - control->SetValue(* m_stringValue) ; + text->SetValue(*m_stringValue); + } - return TRUE; + return true; } // Called to transfer data to the window bool wxTextValidator::TransferFromWindow(void) { - if( !CheckValidator() ) - return FALSE; - - if (!m_stringValue) - return TRUE; + if ( m_stringValue ) + { + wxTextEntry * const text = GetTextEntry(); + if ( !text ) + return false; - wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ; - * m_stringValue = control->GetValue() ; + *m_stringValue = text->GetValue(); + } - return TRUE; + return true; } -void wxTextValidator::SetIncludeList(const wxStringList& list) +bool wxTextValidator::IsInCharIncludes(const wxString& val) { - m_includeList = list; + size_t i; + for ( i = 0; i < val.length(); i++) + { + if (m_includes.Index((wxString) val[i]) == wxNOT_FOUND) + return false; + } + return true; } -void wxTextValidator::SetExcludeList(const wxStringList& list) +bool wxTextValidator::IsNotInCharExcludes(const wxString& val) { - m_excludeList = list; + size_t i; + for ( i = 0; i < val.length(); i++) + { + if (m_excludes.Index((wxString) val[i]) != wxNOT_FOUND) + return false; + } + return true; } void wxTextValidator::OnChar(wxKeyEvent& event) @@ -244,13 +297,14 @@ 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_ASCII) && !isascii(keyCode)) || - ((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) || - ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) || - ((m_validatorStyle & wxFILTER_NUMERIC) && !wxIsdigit(keyCode) - && keyCode != '.' && keyCode != ',' && keyCode != '-') + ((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')) ) ) { @@ -265,40 +319,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] != '.') && (val[i] != ',') && (val[i] != wxT('e')) && (val[i] != wxT('E')) && (val[i] != wxT('+')) && (val[i] != wxT('-'))) - return FALSE; - } - return TRUE; -} - -bool wxTextValidator::IsInCharIncludeList(const wxString& val) -{ - size_t i; - for ( i = 0; i < val.Length(); i++) - { - if (!m_includeList.Member((wxString) val[i])) - return FALSE; - } - return TRUE; -} - -bool wxTextValidator::IsNotInCharExcludeList(const wxString& val) -{ - size_t i; - for ( i = 0; i < val.Length(); i++) - { - if (m_excludeList.Member((wxString) val[i])) - return FALSE; - } - return TRUE; -} #endif - // wxUSE_VALIDATORS && wxUSE_TEXTCTRL + // wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)