// 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__
#include <clib.h>
#endif
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator)
BEGIN_EVENT_TABLE(wxTextValidator, wxValidator)
EVT_CHAR(wxTextValidator::OnChar)
END_EVENT_TABLE()
-#endif
static bool wxIsNumeric(const wxString& val);
}
wxTextValidator::wxTextValidator(const wxTextValidator& val)
+ : wxValidator()
{
Copy(val);
}
m_validatorStyle = val.m_validatorStyle ;
m_stringValue = val.m_stringValue ;
- wxNode *node = val.m_includeList.First() ;
+ wxStringList::Node *node = val.m_includeList.GetFirst() ;
while ( node )
{
- wxChar *s = (wxChar *)node->Data();
+ wxChar *s = node->GetData();
m_includeList.Add(s);
- node = node->Next();
+ node = node->GetNext();
}
- node = val.m_excludeList.First() ;
+ node = val.m_excludeList.GetFirst() ;
while ( node )
{
- wxChar *s = (wxChar *)node->Data();
+ wxChar *s = node->GetData();
m_excludeList.Add(s);
- node = node->Next();
+ node = node->GetNext();
}
return TRUE;
}
int i;
for ( i = 0; i < (int)val.Length(); i++)
{
- if (!isalpha(val[i]))
+ if (!wxIsalpha(val[i]))
return FALSE;
}
return TRUE;
int i;
for ( i = 0; i < (int)val.Length(); i++)
{
- if (!isalnum(val[i]))
+ if (!wxIsalnum(val[i]))
return FALSE;
}
return TRUE;
// This function can pop up an error message.
bool wxTextValidator::Validate(wxWindow *parent)
{
- if ( !m_validatorWindow )
- return FALSE;
- if ( !m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
- return FALSE;
- if ( !m_stringValue )
+ if( !CheckValidator() )
return FALSE;
wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
bool ok = TRUE;
- // this format string should contian exactly one '%s'
- const wxChar *errormsg = _("'%s' is invalid");
+ // NB: this format string should contian exactly one '%s'
+ wxString errormsg;
- if ( m_validatorStyle & wxFILTER_INCLUDE_LIST )
- {
- if ( !m_includeList.Member(val) )
- {
- ok = FALSE;
- }
- }
- else if ( m_validatorStyle & wxFILTER_EXCLUDE_LIST )
+ bool includeList = (m_validatorStyle & wxFILTER_INCLUDE_LIST) != 0;
+ if ( includeList || (m_validatorStyle & wxFILTER_EXCLUDE_LIST) )
{
- if ( m_excludeList.Member(val) )
+ // if includeList, 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);
+ if ( !ok )
{
- ok = FALSE;
+ errormsg = _("'%s' is invalid");
}
}
else if ( (m_validatorStyle & wxFILTER_ASCII) && !val.IsAscii() )
errormsg = _("'%s' should be numeric.");
}
+ else if ( (m_validatorStyle & wxFILTER_INCLUDE_CHAR_LIST) && !IsInCharIncludeList(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))
+ {
+ // it's only ok to have non-members of the list
+ errormsg = _("'%s' is invalid");
+ ok = FALSE;
+ }
if ( !ok )
{
+ wxASSERT_MSG( !errormsg.empty(), _T("you forgot to set errormsg") );
+
m_validatorWindow->SetFocus();
wxString buf;
// Called to transfer data to the window
bool wxTextValidator::TransferToWindow(void)
{
- if ( !m_validatorWindow )
- return FALSE;
- if ( !m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
- return FALSE;
- if ( !m_stringValue )
+ if( !CheckValidator() )
return FALSE;
wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
// Called to transfer data to the window
bool wxTextValidator::TransferFromWindow(void)
{
- if ( !m_validatorWindow )
- return FALSE;
- if ( !m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
- return FALSE;
- if ( !m_stringValue )
+ if( !CheckValidator() )
return FALSE;
wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
m_includeList.Clear();
// TODO: replace with =
- wxNode *node = list.First() ;
+ wxStringList::Node *node = list.GetFirst();
while ( node )
{
- wxChar *s = (wxChar *)node->Data();
+ wxChar *s = node->GetData();
m_includeList.Add(s);
- node = node->Next();
+ node = node->GetNext();
}
}
m_excludeList.Clear();
// TODO: replace with =
- wxNode *node = list.First() ;
+ wxStringList::Node *node = list.GetFirst() ;
while ( node )
{
- wxChar *s = (wxChar *)node->Data();
+ wxChar *s = node->GetData();
m_excludeList.Add(s);
- node = node->Next();
+ node = node->GetNext();
}
}
if ( m_validatorWindow )
{
- int keyCode = event.KeyCode();
+ int keyCode = event.GetKeyCode();
// we don't filter special keys and Delete
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_ASCII) && !isascii(keyCode)) ||
- ((m_validatorStyle & wxFILTER_ALPHA) && !isalpha(keyCode)) ||
- ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !isalnum(keyCode)) ||
- ((m_validatorStyle & wxFILTER_NUMERIC) && !isdigit(keyCode)
- && keyCode != '.' && keyCode != '-')
+ ((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) ||
+ ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) ||
+ ((m_validatorStyle & wxFILTER_NUMERIC) && !wxIsdigit(keyCode)
+ && keyCode != '.' && keyCode != ',' && keyCode != '-')
)
)
{
int i;
for ( i = 0; i < (int)val.Length(); i++)
{
- if ((!isdigit(val[i])) && (val[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] == '-')))
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
-
\ No newline at end of file
projects / wxWidgets.git / blobdiff