// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "valtext.h"
#endif
#pragma hdrstop
#endif
-#if wxUSE_VALIDATORS
+#if wxUSE_VALIDATORS && wxUSE_TEXTCTRL
#ifndef WX_PRECOMP
#include <stdio.h>
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;
- 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_includes = val.m_includes;
+ m_excludes = val.m_excludes;
-wxTextValidator::~wxTextValidator()
-{
+ return true;
}
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)
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.
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;
- 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");
}
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.");
}
- 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 )
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 WXWIN_COMPATIBILITY_2_4
+
+inline void wxCopyStringListToArrayString(wxArrayString& to, const wxStringList& from)
{
-/*
- if ( !M_VTEXTDATA )
- return;
-*/
+ to.Clear();
- m_includeList.Clear();
- // TODO: replace with =
- wxStringList::Node *node = list.GetFirst();
- while ( node )
+ for ( wxStringList::compatibility_iterator pNode = from.GetFirst();
+ pNode;
+ pNode = pNode->GetNext() )
{
- wxChar *s = node->GetData();
- m_includeList.Add(s);
- node = node->GetNext();
+ to.Add(pNode->GetData());
}
}
+inline void wxCopyArrayStringToStringList(wxStringList& to, const wxArrayString& from)
+{
+ to.Clear();
+
+ for(size_t i = 0; i < from.GetCount(); ++i)
+ to.Add(from[i]);
+}
+
+wxStringList& wxTextValidator::GetIncludeList()
+{
+ wxCopyArrayStringToStringList(m_includeList, m_includes);
+ return m_includeList;
+}
+
+wxStringList& wxTextValidator::GetExcludeList()
+{
+ wxCopyArrayStringToStringList(m_excludeList, m_excludes);
+ return m_excludeList;
+}
+
+void wxTextValidator::SetIncludeList(const wxStringList& list)
+{
+ wxCopyStringListToArrayString(m_includes, list);
+}
+
void wxTextValidator::SetExcludeList(const wxStringList& list)
{
-/*
- if ( !M_VTEXTDATA )
- return;
-*/
+ wxCopyStringListToArrayString(m_excludes, list);
+}
- m_excludeList.Clear();
- // TODO: replace with =
- wxStringList::Node *node = list.GetFirst() ;
- while ( node )
+bool wxTextValidator::IsInCharIncludeList(const wxString& val)
+{
+ return IsInCharIncludes(val);
+}
+
+bool wxTextValidator::IsNotInCharExcludeList(const wxString& val)
+{
+ return IsNotInCharExcludes(val);
+}
+
+#endif //compat 2.4
+
+
+bool wxTextValidator::IsInCharIncludes(const wxString& val)
+{
+ size_t i;
+ for ( i = 0; i < val.Length(); i++)
{
- wxChar *s = node->GetData();
- m_excludeList.Add(s);
- node = node->GetNext();
+ if (m_includes.Index((wxString) val[i]) == wxNOT_FOUND)
+ return false;
}
+ return true;
+}
+
+bool wxTextValidator::IsNotInCharExcludes(const wxString& val)
+{
+ size_t i;
+ for ( i = 0; i < val.Length(); i++)
+ {
+ if (m_excludes.Index((wxString) val[i]) != wxNOT_FOUND)
+ return false;
+ }
+ return true;
}
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)) ||
{
// 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('-')))
- 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)
-{
- 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
projects / wxWidgets.git / blobdiff