/////////////////////////////////////////////////////////////////////////////
-// 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"
#ifdef __BORLANDC__
- #pragma hdrstop
+ #pragma hdrstop
#endif
-#ifndef WX_PRECOMP
- #include <stdio.h>
- #include "wx/textctrl.h"
- #include "wx/utils.h"
- #include "wx/msgdlg.h"
- #include "wx/intl.h"
-#endif
+#if wxUSE_VALIDATORS && wxUSE_TEXTCTRL
#include "wx/valtext.h"
+#ifndef WX_PRECOMP
+ #include <stdio.h>
+ #include "wx/textctrl.h"
+ #include "wx/utils.h"
+ #include "wx/msgdlg.h"
+ #include "wx/intl.h"
+#endif
+
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
#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(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;
*/
}
wxTextValidator::wxTextValidator(const wxTextValidator& val)
+ : wxValidator()
{
Copy(val);
}
{
wxValidator::Copy(val);
- m_validatorStyle = val.m_validatorStyle ;
- m_stringValue = val.m_stringValue ;
+ m_validatorStyle = val.m_validatorStyle;
+ m_stringValue = val.m_stringValue;
- wxNode *node = val.m_includeList.First() ;
- while ( node )
- {
- char *s = (char *)node->Data();
- m_includeList.Add(s);
- node = node->Next();
- }
- node = val.m_excludeList.First() ;
- while ( node )
- {
- char *s = (char *)node->Data();
- m_excludeList.Add(s);
- node = node->Next();
- }
- 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 (!isalpha(val[i]))
- return FALSE;
+ if (!wxIsalpha(val[i]))
+ return false;
}
- return TRUE;
+ return true;
}
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 (!isalnum(val[i]))
- return FALSE;
+ if (!wxIsalnum(val[i]))
+ return false;
}
- return TRUE;
+ return true;
}
// Called when the value in the window must be validated.
// 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 )
- return FALSE;
+ if( !CheckValidator() )
+ return false;
- wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
+ wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow;
// If window is disabled, simply return
- if ( !control->Enabled() )
- return TRUE;
+ if ( !control->IsEnabled() )
+ return true;
wxString val(control->GetValue());
- bool ok = TRUE;
+ bool ok = true;
- // this format string should contian exactly one '%s'
- const char *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 includes = (m_validatorStyle & wxFILTER_INCLUDE_LIST) != 0;
+ if ( includes || (m_validatorStyle & wxFILTER_EXCLUDE_LIST) )
{
- if ( m_excludeList.Member(val) )
+ // if includes, it's only ok to have the members of the list,
+ // otherwise it's only ok to have non-members
+ ok = includes == (m_includes.Index(val) != wxNOT_FOUND);
+ if ( !ok )
{
- ok = FALSE;
+ 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) && !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) && !IsNotInCharExcludes(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 )
- return FALSE;
+ 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;
+ return true;
}
// 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 )
- return FALSE;
+ 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;
+ 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 =
- wxNode *node = list.First() ;
- while ( node )
+ for ( wxStringList::compatibility_iterator pNode = from.GetFirst();
+ pNode;
+ pNode = pNode->GetNext() )
{
- char *s = (char *)node->Data();
- m_includeList.Add(s);
- node = node->Next();
+ 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);
+}
+
+bool wxTextValidator::IsInCharIncludeList(const wxString& val)
+{
+ return IsInCharIncludes(val);
+}
+
+bool wxTextValidator::IsNotInCharExcludeList(const wxString& val)
+{
+ return IsNotInCharExcludes(val);
+}
+
+#endif //compat 2.4
+
- m_excludeList.Clear();
- // TODO: replace with =
- wxNode *node = list.First() ;
- while ( node )
+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++)
{
- char *s = (char *)node->Data();
- m_excludeList.Add(s);
- node = node->Next();
+ if (m_excludes.Index((wxString) val[i]) != wxNOT_FOUND)
+ return false;
}
+ return true;
}
void wxTextValidator::OnChar(wxKeyEvent& event)
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) && !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) && !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 != 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++)
{
- if ((!isdigit(val[i])) && (val[i] != '.'))
- if(!((i == 0) && (val[i] == '-')))
- return FALSE;
+ // Allow for "," (French) as well as "." -- in future we should
+ // use wxSystemSettings or other to do better localisation
+ 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;
+ return true;
}
+
+#endif
+ // wxUSE_VALIDATORS && wxUSE_TEXTCTRL
projects / wxWidgets.git / blobdiff