/////////////////////////////////////////////////////////////////////////////
-// Name: valtext.cpp
+// Name: src/common/valtext.cpp
// Purpose: wxTextValidator
// Author: Julian Smart
// Modified by:
// 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"
#if wxUSE_VALIDATORS && wxUSE_TEXTCTRL
+#include "wx/valtext.h"
+
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/textctrl.h"
#include "wx/intl.h"
#endif
-#include "wx/valtext.h"
-
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
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;
}
static bool wxIsAlpha(const wxString& val)
{
int i;
- for ( i = 0; i < (int)val.Length(); i++)
+ for ( i = 0; i < (int)val.length(); i++)
{
if (!wxIsalpha(val[i]))
return false;
static bool wxIsAlphaNumeric(const wxString& val)
{
int i;
- for ( i = 0; i < (int)val.Length(); i++)
+ for ( i = 0; i < (int)val.length(); i++)
{
if (!wxIsalnum(val[i]))
return false;
// 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");
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;
}
- 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");
return true;
}
+#if WXWIN_COMPATIBILITY_2_4
+
+inline void wxCopyStringListToArrayString(wxArrayString& to, const wxStringList& from)
+{
+ to.Clear();
+
+ for ( wxStringList::compatibility_iterator pNode = from.GetFirst();
+ pNode;
+ pNode = pNode->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)
{
- m_includeList = list;
+ wxCopyStringListToArrayString(m_includes, list);
}
void wxTextValidator::SetExcludeList(const wxStringList& list)
{
- m_excludeList = list;
+ wxCopyStringListToArrayString(m_excludes, list);
+}
+
+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++)
+ {
+ 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((wxChar) keyCode, 1))) ||
- ((m_validatorStyle & wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludeList(wxString((wxChar) 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)) ||
((m_validatorStyle & wxFILTER_NUMERIC) && !wxIsdigit(keyCode)
- && keyCode != '.' && keyCode != ',' && keyCode != '-')
+ && keyCode != wxT('.') && keyCode != wxT(',') && keyCode != wxT('-') && keyCode != wxT('+') && keyCode != wxT('e') && keyCode != wxT('E'))
)
)
{
static bool wxIsNumeric(const wxString& val)
{
int i;
- for ( i = 0; i < (int)val.Length(); 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('-')))
+ 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;
}
-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_TEXTCTRL
projects / wxWidgets.git / blobdiff