// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "valtext.h"
#endif
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;
*/
}
{
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;
- 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;
}
if( !CheckValidator() )
return FALSE;
- wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
+ wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow;
// If window is disabled, simply return
if ( !control->IsEnabled() )
if( !CheckValidator() )
return FALSE;
- if (!m_stringValue)
- return TRUE;
-
- wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
- control->SetValue(* m_stringValue) ;
+ if ( m_stringValue )
+ {
+ wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow;
+ control->SetValue(* m_stringValue);
+ }
return TRUE;
}
if( !CheckValidator() )
return FALSE;
- if (!m_stringValue)
- return TRUE;
-
- 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 =
- 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)
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)) ||
{
// 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] != ',') && (val[i] != wxT('e')) && (val[i] != wxT('E')) && (val[i] != wxT('+')) && (val[i] != wxT('-')))
+ 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;