X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1d4dd7add411ebff1ce4a8d1d992e0e43ee26b1..a8db7a5fc1e6403cec1ccc32b7a5881d751732f3:/src/common/valtext.cpp diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp index 687e677852..8c69b0692b 100644 --- a/src/common/valtext.cpp +++ b/src/common/valtext.cpp @@ -1,18 +1,14 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: valtext.cpp +// Name: src/common/valtext.cpp // Purpose: wxTextValidator // Author: Julian Smart // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#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 +#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) @@ -50,13 +43,13 @@ static bool wxIsNumeric(const wxString& val); wxTextValidator::wxTextValidator(long style, wxString *val) { - m_validatorStyle = style ; - m_stringValue = 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,34 +63,42 @@ 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_includes = val.m_includes; + m_excludes = val.m_excludes; - wxStringList::Node *node = val.m_includeList.GetFirst() ; - while ( node ) + return true; +} + +wxTextEntry *wxTextValidator::GetTextEntry() +{ +#if wxUSE_TEXTCTRL + if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl))) { - wxChar *s = node->GetData(); - m_includeList.Add(s); - node = node->GetNext(); + return (wxTextCtrl*)m_validatorWindow; } - node = val.m_excludeList.GetFirst() ; - while ( node ) +#endif + +#if wxUSE_COMBOBOX + if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox))) { - wxChar *s = node->GetData(); - m_excludeList.Add(s); - node = node->GetNext(); + return (wxComboBox*)m_validatorWindow; } - return true; -} +#endif -wxTextValidator::~wxTextValidator() -{ + 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; @@ -108,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; @@ -120,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"); @@ -171,17 +171,17 @@ 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; + 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"); - ok = false; + ok = false; } if ( !ok ) @@ -203,11 +203,14 @@ bool wxTextValidator::Validate(wxWindow *parent) // Called to transfer data to the window bool wxTextValidator::TransferToWindow(void) { - if( !CheckValidator() ) - return false; + 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; } @@ -215,49 +218,38 @@ bool wxTextValidator::TransferToWindow(void) // Called to transfer data to the window bool wxTextValidator::TransferFromWindow(void) { - if( !CheckValidator() ) - return false; + 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; } -void wxTextValidator::SetIncludeList(const wxStringList& list) +bool wxTextValidator::IsInCharIncludes(const wxString& val) { -/* - if ( !M_VTEXTDATA ) - return; -*/ - - m_includeList.Clear(); - // TODO: replace with = - wxStringList::Node *node = list.GetFirst(); - while ( node ) + size_t i; + for ( i = 0; i < val.length(); i++) { - wxChar *s = node->GetData(); - m_includeList.Add(s); - node = node->GetNext(); + 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) { -/* - if ( !M_VTEXTDATA ) - return; -*/ - - m_excludeList.Clear(); - // TODO: replace with = - wxStringList::Node *node = list.GetFirst() ; - while ( node ) + size_t i; + for ( i = 0; i < val.length(); i++) { - wxChar *s = node->GetData(); - m_excludeList.Add(s); - node = node->GetNext(); + if (m_excludes.Index((wxString) val[i]) != wxNOT_FOUND) + return false; } + return true; } void wxTextValidator::OnChar(wxKeyEvent& event) @@ -275,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((char) keyCode, 1))) || - ((m_validatorStyle & wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludeList(wxString((char) 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')) ) ) { @@ -299,38 +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 ((!isdigit(val[i])) && (val[i] != '.') && (val[i] != ',')) - if(!((i == 0) && (val[i] == '-'))) - 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])) + 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::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_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)