X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc259b792613550edda31cc6202b42e172e2a240..3b01b1fe4cb656f39290bf7f3891667855abe601:/src/common/valtext.cpp?ds=inline diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp index 2f943f906f..bd3d8a0c75 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,13 +50,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,28 +70,13 @@ 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; - wxStringList::Node *node = val.m_includeList.GetFirst() ; - while ( node ) - { - wxChar *s = node->GetData(); - m_includeList.Add(s); - node = node->GetNext(); - } - node = val.m_excludeList.GetFirst() ; - while ( node ) - { - wxChar *s = node->GetData(); - m_excludeList.Add(s); - node = node->GetNext(); - } - return TRUE; -} + m_includeList = val.m_includeList; + m_excludeList = val.m_excludeList; -wxTextValidator::~wxTextValidator() -{ + return true; } static bool wxIsAlpha(const wxString& val) @@ -100,9 +85,9 @@ static bool wxIsAlpha(const wxString& val) for ( i = 0; i < (int)val.Length(); i++) { if (!wxIsalpha(val[i])) - return FALSE; + return false; } - return TRUE; + return true; } static bool wxIsAlphaNumeric(const wxString& val) @@ -111,9 +96,9 @@ static bool wxIsAlphaNumeric(const wxString& val) for ( i = 0; i < (int)val.Length(); i++) { if (!wxIsalnum(val[i])) - return FALSE; + return false; } - return TRUE; + return true; } // Called when the value in the window must be validated. @@ -121,17 +106,17 @@ static bool wxIsAlphaNumeric(const wxString& val) bool wxTextValidator::Validate(wxWindow *parent) { if( !CheckValidator() ) - return FALSE; + return false; - wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ; + wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow; // If window is disabled, simply return if ( !control->IsEnabled() ) - return TRUE; + return true; wxString val(control->GetValue()); - bool ok = TRUE; + bool ok = true; // NB: this format string should contian exactly one '%s' wxString errormsg; @@ -149,25 +134,25 @@ bool wxTextValidator::Validate(wxWindow *parent) } else if ( (m_validatorStyle & wxFILTER_ASCII) && !val.IsAscii() ) { - ok = FALSE; + ok = false; errormsg = _("'%s' should only contain ASCII characters."); } else if ( (m_validatorStyle & wxFILTER_ALPHA) && !wxIsAlpha(val) ) { - ok = FALSE; + ok = false; errormsg = _("'%s' should only contain alphabetic characters."); } else if ( (m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsAlphaNumeric(val)) { - ok = FALSE; + ok = false; errormsg = _("'%s' should only contain alphabetic or numeric characters."); } else if ( (m_validatorStyle & wxFILTER_NUMERIC) && !wxIsNumeric(val)) { - ok = FALSE; + ok = false; errormsg = _("'%s' should be numeric."); } @@ -175,13 +160,13 @@ bool wxTextValidator::Validate(wxWindow *parent) { //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)) { // it's only ok to have non-members of the list errormsg = _("'%s' is invalid"); - ok = FALSE; + ok = false; } if ( !ok ) @@ -204,60 +189,40 @@ bool wxTextValidator::Validate(wxWindow *parent) bool wxTextValidator::TransferToWindow(void) { if( !CheckValidator() ) - return FALSE; + 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; + return true; } // Called to transfer data to the window bool wxTextValidator::TransferFromWindow(void) { if( !CheckValidator() ) - return FALSE; + 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; + return true; } void wxTextValidator::SetIncludeList(const wxStringList& list) { -/* - if ( !M_VTEXTDATA ) - return; -*/ - - m_includeList.Clear(); - // TODO: replace with = - wxStringList::Node *node = list.GetFirst(); - while ( node ) - { - wxChar *s = node->GetData(); - m_includeList.Add(s); - node = node->GetNext(); - } + m_includeList = list; } void wxTextValidator::SetExcludeList(const wxStringList& list) { -/* - if ( !M_VTEXTDATA ) - return; -*/ - - m_excludeList.Clear(); - // TODO: replace with = - wxStringList::Node *node = list.GetFirst() ; - while ( node ) - { - wxChar *s = node->GetData(); - m_excludeList.Add(s); - node = node->GetNext(); - } + m_excludeList = list; } void wxTextValidator::OnChar(wxKeyEvent& event) @@ -275,8 +240,8 @@ 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) && !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)) || @@ -303,11 +268,10 @@ 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] == '-'))) - return FALSE; + 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; + return true; } bool wxTextValidator::IsInCharIncludeList(const wxString& val) @@ -316,9 +280,9 @@ bool wxTextValidator::IsInCharIncludeList(const wxString& val) for ( i = 0; i < val.Length(); i++) { if (!m_includeList.Member((wxString) val[i])) - return FALSE; + return false; } - return TRUE; + return true; } bool wxTextValidator::IsNotInCharExcludeList(const wxString& val) @@ -327,10 +291,10 @@ bool wxTextValidator::IsNotInCharExcludeList(const wxString& val) for ( i = 0; i < val.Length(); i++) { if (m_excludeList.Member((wxString) val[i])) - return FALSE; + return false; } - return TRUE; + return true; } #endif - // wxUSE_VALIDATORS + // wxUSE_VALIDATORS && wxUSE_TEXTCTRL