X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cab1a6053dce9f0a2dcd87d8e2d12d8633f4785f..4863e55108155a4e109e401407e01495ebf45b36:/src/common/valtext.cpp?ds=inline diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp index 430ca9b772..d150671737 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: +// Modified by: Francesco Montorsi // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart // 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,44 +16,91 @@ #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 +// ---------------------------------------------------------------------------- + +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 = style; + m_validatorStyle = (wxTextValidatorStyle)style; m_stringValue = val; -/* - m_refData = new wxVTextRefData; +} + +void wxTextValidator::SetStyle(long style) +{ + SetStyle((wxTextValidatorStyle)style); +} +#endif - M_VTEXTDATA->m_validatorStyle = style; - M_VTEXTDATA->m_stringValue = val; -*/ +wxTextValidator::wxTextValidator(wxTextValidatorStyle style, wxString *val) +{ + m_validatorStyle = style; + m_stringValue = val; } wxTextValidator::wxTextValidator(const wxTextValidator& val) @@ -73,109 +116,54 @@ 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; } -wxTextValidator::~wxTextValidator() -{ -} - -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 includeList = (m_validatorStyle & wxFILTER_INCLUDE_LIST) != 0; - if ( includeList || (m_validatorStyle & wxFILTER_EXCLUDE_LIST) ) - { - // 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 ) - { - errormsg = _("'%s' is invalid"); - } - } - else if ( (m_validatorStyle & wxFILTER_ASCII) && !val.IsAscii() ) - { - ok = false; - - 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; - - errormsg = _("'%s' should only contain alphabetic or numeric characters."); - } - else if ( (m_validatorStyle & wxFILTER_NUMERIC) && !wxIsNumeric(val)) - { - ok = false; - - 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)) + if (!IsValid(val, &errormsg)) { - // it's only ok to have non-members of the list - errormsg = _("'%s' is invalid"); - ok = false; - } - - if ( !ok ) - { - wxASSERT_MSG( !errormsg.empty(), _T("you forgot to set errormsg") ); + wxASSERT(!errormsg.empty()); m_validatorWindow->SetFocus(); @@ -184,121 +172,154 @@ 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) +bool wxTextValidator::TransferToWindow() { - 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; } // Called to transfer data to the window -bool wxTextValidator::TransferFromWindow(void) +bool wxTextValidator::TransferFromWindow() { - 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::IsValid(const wxString& val, wxString* pErr) const { - m_includeList = list; -} + wxString errormsg; + switch (m_validatorStyle) + { + case wxFILTER_NONE: + // nothing to do... + break; -void wxTextValidator::SetExcludeList(const wxStringList& list) -{ - m_excludeList = list; -} + case wxFILTER_INCLUDE_LIST: + if ( m_includes.Index(val) == wxNOT_FOUND ) + errormsg = _("'%s' is invalid"); + break; -void wxTextValidator::OnChar(wxKeyEvent& event) -{ -/* - if ( !M_VTEXTDATA ) - return; -*/ + 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; - if ( m_validatorWindow ) - { - int keyCode = event.GetKeyCode(); - - // we don't filter special keys and Delete - 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_ASCII) && !isascii(keyCode)) || - ((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) || - ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) || - ((m_validatorStyle & wxFILTER_NUMERIC) && !wxIsdigit(keyCode) - && keyCode != '.' && keyCode != ',' && keyCode != '-') - ) - ) - { - if ( !wxValidator::IsSilent() ) - wxBell(); - - // eat message - return; - } + case wxFILTER_EXCLUDE_CHAR_LIST: + if ( !IsNotInCharExcludes(val) ) + errormsg = _("'%s' is invalid"); + break; + + default: + wxFAIL_MSG("invalid text validator style"); } - event.Skip(); + if (pErr) + *pErr = errormsg; + + return errormsg.empty(); } -static bool wxIsNumeric(const wxString& val) +bool wxTextValidator::IsInCharIncludes(const wxString& val) const { - 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('-'))) + for (size_t i = 0; i < val.length(); i++) + if (m_includes.Index((wxString) val[i]) == wxNOT_FOUND) + // one character of 'val' is NOT present in m_includes... return false; - } + + // all characters of 'val' are present in m_includes return true; } -bool wxTextValidator::IsInCharIncludeList(const wxString& val) +bool wxTextValidator::IsNotInCharExcludes(const wxString& val) const { - size_t i; - for ( i = 0; i < val.Length(); i++) - { - if (!m_includeList.Member((wxString) val[i])) + for (size_t i = 0; i < val.length(); i++) + if (m_excludes.Index((wxString) val[i]) != wxNOT_FOUND) + // one character of 'val' is present in m_excludes... return false; - } + + // all characters of 'val' are NOT present in m_excludes return true; } -bool wxTextValidator::IsNotInCharExcludeList(const wxString& val) +void wxTextValidator::OnChar(wxKeyEvent& event) { - size_t i; - for ( i = 0; i < val.Length(); i++) + if (!m_validatorWindow) { - if (m_excludeList.Member((wxString) val[i])) - return false; + event.Skip(); + return; } - return true; + + int keyCode = event.GetKeyCode(); + + // we don't filter special keys and delete + if (keyCode < WXK_SPACE || keyCode == WXK_DELETE || keyCode >= WXK_START) + { + event.Skip(); + return; + } + + wxString str((wxUniChar)keyCode, 1); + if (!IsValid(str, NULL)) + { + if ( !wxValidator::IsSilent() ) + wxBell(); + + // eat message + return; + } + else + event.Skip(); } + #endif - // wxUSE_VALIDATORS && wxUSE_TEXTCTRL + // wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)