/////////////////////////////////////////////////////////////////////////////
-// Name: valtext.cpp
+// Name: src/common/valtext.cpp
// Purpose: wxTextValidator
// Author: Julian Smart
// 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__
-#pragma implementation "valtext.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
-#if wxUSE_VALIDATORS
+#if wxUSE_VALIDATORS && wxUSE_TEXTCTRL
+
+#include "wx/valtext.h"
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/intl.h"
#endif
-#include "wx/valtext.h"
-
#include <ctype.h>
#include <string.h>
#include <stdlib.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)
{
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;
if( !CheckValidator() )
return false;
- wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
+ wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow;
// If window is disabled, simply return
if ( !control->IsEnabled() )
// 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;
+ 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 )
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;
}
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)
+bool wxTextValidator::IsInCharIncludes(const wxString& val)
{
-/*
- if ( !M_VTEXTDATA )
- return;
-*/
-
- m_includeList.Clear();
- // TODO: replace with =
- wxStringList::Node *node = list.GetFirst();
- while ( node )
+ size_t i;
+ for ( i = 0; i < val.length(); i++)
{
- wxChar *s = node->GetData();
- m_includeList.Add(s);
- node = node->GetNext();
+ if (m_includes.Index((wxString) val[i]) == wxNOT_FOUND)
+ return false;
}
+ return true;
}
-void wxTextValidator::SetExcludeList(const wxStringList& list)
+bool wxTextValidator::IsNotInCharExcludes(const wxString& val)
{
-/*
- if ( !M_VTEXTDATA )
- return;
-*/
-
- m_excludeList.Clear();
- // TODO: replace with =
- wxStringList::Node *node = list.GetFirst() ;
- while ( node )
+ size_t i;
+ for ( i = 0; i < val.length(); i++)
{
- wxChar *s = node->GetData();
- m_excludeList.Add(s);
- node = node->GetNext();
+ 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)) ||
((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 ((!isdigit(val[i])) && (val[i] != '.') && (val[i] != ','))
- if(!((i == 0) && (val[i] == '-')))
+ 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_VALIDATORS && wxUSE_TEXTCTRL
projects / wxWidgets.git / blobdiff