X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b941f2d3143c1205fc7c5b01bd254781db728b3..5b8cadd2bab565c99d0f13b2450bf30c0a626af9:/src/common/valtext.cpp?ds=inline diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp index bd3d8a0c75..8c69b0692b 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 ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "valtext.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -20,26 +16,23 @@ #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 - IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator) BEGIN_EVENT_TABLE(wxTextValidator, wxValidator) @@ -73,16 +66,39 @@ bool wxTextValidator::Copy(const wxTextValidator& val) m_validatorStyle = val.m_validatorStyle; m_stringValue = val.m_stringValue; - m_includeList = val.m_includeList; - m_excludeList = val.m_excludeList; + m_includes = val.m_includes; + m_excludes = val.m_excludes; return true; } +wxTextEntry *wxTextValidator::GetTextEntry() +{ +#if wxUSE_TEXTCTRL + if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl))) + { + return (wxTextCtrl*)m_validatorWindow; + } +#endif + +#if wxUSE_COMBOBOX + if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox))) + { + return (wxComboBox*)m_validatorWindow; + } +#endif + + wxFAIL_MSG( + _T("wxTextValidator can only be used with wxTextCtrl or wxComboBox") + ); + + return NULL; +} + static bool wxIsAlpha(const wxString& val) { int i; - for ( i = 0; i < (int)val.Length(); i++) + for ( i = 0; i < (int)val.length(); i++) { if (!wxIsalpha(val[i])) return false; @@ -93,7 +109,7 @@ static bool wxIsAlpha(const wxString& val) static bool wxIsAlphaNumeric(const wxString& val) { int i; - for ( i = 0; i < (int)val.Length(); i++) + for ( i = 0; i < (int)val.length(); i++) { if (!wxIsalnum(val[i])) return false; @@ -105,28 +121,27 @@ static bool wxIsAlphaNumeric(const wxString& val) // 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; + + wxString val(text->GetValue()); bool ok = true; // NB: this format string should contian exactly one '%s' wxString errormsg; - bool includeList = (m_validatorStyle & wxFILTER_INCLUDE_LIST) != 0; - if ( includeList || (m_validatorStyle & wxFILTER_EXCLUDE_LIST) ) + bool includes = (m_validatorStyle & wxFILTER_INCLUDE_LIST) != 0; + if ( includes || (m_validatorStyle & wxFILTER_EXCLUDE_LIST) ) { - // if includeList, it's only ok to have the members of the list, + // if includes, 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); + ok = includes == (m_includes.Index(val) != wxNOT_FOUND); if ( !ok ) { errormsg = _("'%s' is invalid"); @@ -156,13 +171,13 @@ bool wxTextValidator::Validate(wxWindow *parent) errormsg = _("'%s' should be numeric."); } - else if ( (m_validatorStyle & wxFILTER_INCLUDE_CHAR_LIST) && !IsInCharIncludeList(val)) + 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) && !IsNotInCharExcludeList(val)) + 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"); @@ -188,13 +203,13 @@ bool wxTextValidator::Validate(wxWindow *parent) // 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; @@ -203,26 +218,38 @@ 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(); + wxTextEntry * const text = GetTextEntry(); + if ( !text ) + return false; + + *m_stringValue = text->GetValue(); } 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) @@ -240,13 +267,13 @@ void wxTextValidator::OnChar(wxKeyEvent& event) if ( !(keyCode < WXK_SPACE || keyCode == WXK_DELETE || keyCode > WXK_START) && ( - ((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_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 != '.' && keyCode != ',' && keyCode != '-') + && keyCode != wxT('.') && keyCode != wxT(',') && keyCode != wxT('-') && keyCode != wxT('+') && keyCode != wxT('e') && keyCode != wxT('E')) ) ) { @@ -264,37 +291,16 @@ void wxTextValidator::OnChar(wxKeyEvent& event) static bool wxIsNumeric(const wxString& val) { int i; - for ( i = 0; i < (int)val.Length(); 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('-'))) + 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; } -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)