X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/479cd5de40ca8029c79e780170fa7c0af7ec0297..121fa06ab6af9129e776af13949fc251a3cafc49:/src/common/valtext.cpp?ds=sidebyside diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp index 6e65f76bef..0e62b5ded3 100644 --- a/src/common/valtext.cpp +++ b/src/common/valtext.cpp @@ -5,11 +5,11 @@ // 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__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "valtext.h" #endif @@ -20,7 +20,7 @@ #pragma hdrstop #endif -#if wxUSE_VALIDATORS +#if wxUSE_VALIDATORS && wxUSE_TEXTCTRL #ifndef WX_PRECOMP #include @@ -50,17 +50,18 @@ 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; */ } wxTextValidator::wxTextValidator(const wxTextValidator& val) + : wxValidator() { Copy(val); } @@ -69,23 +70,12 @@ 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; - wxNode *node = val.m_includeList.First() ; - while ( node ) - { - wxChar *s = (wxChar *)node->Data(); - m_includeList.Add(s); - node = node->Next(); - } - node = val.m_excludeList.First() ; - while ( node ) - { - wxChar *s = (wxChar *)node->Data(); - m_excludeList.Add(s); - node = node->Next(); - } return TRUE; } @@ -98,7 +88,7 @@ static bool wxIsAlpha(const wxString& val) int i; for ( i = 0; i < (int)val.Length(); i++) { - if (!isalpha(val[i])) + if (!wxIsalpha(val[i])) return FALSE; } return TRUE; @@ -109,7 +99,7 @@ static bool wxIsAlphaNumeric(const wxString& val) int i; for ( i = 0; i < (int)val.Length(); i++) { - if (!isalnum(val[i])) + if (!wxIsalnum(val[i])) return FALSE; } return TRUE; @@ -119,14 +109,10 @@ static bool wxIsAlphaNumeric(const wxString& val) // This function can pop up an error message. bool wxTextValidator::Validate(wxWindow *parent) { - if ( !m_validatorWindow ) - return FALSE; - if ( !m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) ) - return FALSE; - if ( !m_stringValue ) + if( !CheckValidator() ) return FALSE; - wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ; + wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow; // If window is disabled, simply return if ( !control->IsEnabled() ) @@ -136,21 +122,18 @@ bool wxTextValidator::Validate(wxWindow *parent) bool ok = TRUE; - // this format string should contian exactly one '%s' - const wxChar *errormsg = _("'%s' is invalid"); + // NB: this format string should contian exactly one '%s' + wxString errormsg; - if ( m_validatorStyle & wxFILTER_INCLUDE_LIST ) + bool includeList = (m_validatorStyle & wxFILTER_INCLUDE_LIST) != 0; + if ( includeList || (m_validatorStyle & wxFILTER_EXCLUDE_LIST) ) { - if ( !m_includeList.Member(val) ) + // 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 ) { - ok = FALSE; - } - } - else if ( m_validatorStyle & wxFILTER_EXCLUDE_LIST ) - { - if ( m_excludeList.Member(val) ) - { - ok = FALSE; + errormsg = _("'%s' is invalid"); } } else if ( (m_validatorStyle & wxFILTER_ASCII) && !val.IsAscii() ) @@ -177,9 +160,23 @@ bool wxTextValidator::Validate(wxWindow *parent) 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; + } if ( !ok ) { + wxASSERT_MSG( !errormsg.empty(), _T("you forgot to set errormsg") ); + m_validatorWindow->SetFocus(); wxString buf; @@ -195,15 +192,14 @@ bool wxTextValidator::Validate(wxWindow *parent) // Called to transfer data to the window bool wxTextValidator::TransferToWindow(void) { - if ( !m_validatorWindow ) - return FALSE; - if ( !m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) ) - return FALSE; - if ( !m_stringValue ) + if( !CheckValidator() ) return FALSE; - wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ; - control->SetValue(* m_stringValue) ; + if ( m_stringValue ) + { + wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow; + control->SetValue(* m_stringValue); + } return TRUE; } @@ -211,53 +207,26 @@ bool wxTextValidator::TransferToWindow(void) // Called to transfer data to the window bool wxTextValidator::TransferFromWindow(void) { - if ( !m_validatorWindow ) - return FALSE; - if ( !m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) ) - return FALSE; - if ( !m_stringValue ) + if( !CheckValidator() ) return FALSE; - wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ; - * m_stringValue = control->GetValue() ; + if ( m_stringValue ) + { + wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow; + *m_stringValue = control->GetValue(); + } return TRUE; } void wxTextValidator::SetIncludeList(const wxStringList& list) { -/* - if ( !M_VTEXTDATA ) - return; -*/ - - m_includeList.Clear(); - // TODO: replace with = - wxNode *node = list.First() ; - while ( node ) - { - wxChar *s = (wxChar *)node->Data(); - m_includeList.Add(s); - node = node->Next(); - } + m_includeList = list; } void wxTextValidator::SetExcludeList(const wxStringList& list) { -/* - if ( !M_VTEXTDATA ) - return; -*/ - - m_excludeList.Clear(); - // TODO: replace with = - wxNode *node = list.First() ; - while ( node ) - { - wxChar *s = (wxChar *)node->Data(); - m_excludeList.Add(s); - node = node->Next(); - } + m_excludeList = list; } void wxTextValidator::OnChar(wxKeyEvent& event) @@ -269,16 +238,18 @@ void wxTextValidator::OnChar(wxKeyEvent& event) if ( m_validatorWindow ) { - long keyCode = event.KeyCode(); + 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) && !isalpha(keyCode)) || - ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !isalnum(keyCode)) || - ((m_validatorStyle & wxFILTER_NUMERIC) && !isdigit(keyCode) + ((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) || + ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) || + ((m_validatorStyle & wxFILTER_NUMERIC) && !wxIsdigit(keyCode) && keyCode != '.' && keyCode != ',' && keyCode != '-') ) ) @@ -301,12 +272,33 @@ static bool wxIsNumeric(const wxString& val) { // 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] == '-'))) + 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_VALIDATORS && wxUSE_TEXTCTRL