X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/543f08a67631f2849872d5d3ee7cb99047718560..68698f0308f5c46966b7de12b34f68ec23dd3ec8:/src/common/valtext.cpp?ds=sidebyside

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index 0bc8568d54..e527198cbc 100644
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -5,8 +5,8 @@
 // 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__
@@ -40,13 +40,11 @@
     #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);
 
@@ -63,6 +61,7 @@ wxTextValidator::wxTextValidator(long style, wxString *val)
 }
 
 wxTextValidator::wxTextValidator(const wxTextValidator& val)
+    : wxValidator()
 {
     Copy(val);
 }
@@ -74,19 +73,19 @@ bool wxTextValidator::Copy(const wxTextValidator& 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;
 }
@@ -100,7 +99,7 @@ static bool wxIsAlpha(const wxString& val)
     int i;
     for ( i = 0; i < (int)val.Length(); i++)
     {
-        if (!isalpha(val[i]))
+        if (!wxIsalpha(val[i]))
             return FALSE;
     }
     return TRUE;
@@ -111,7 +110,7 @@ static bool wxIsAlphaNumeric(const wxString& val)
     int i;
     for ( i = 0; i < (int)val.Length(); i++)
     {
-        if (!isalnum(val[i]))
+        if (!wxIsalnum(val[i]))
             return FALSE;
     }
     return TRUE;
@@ -121,11 +120,7 @@ static bool wxIsAlphaNumeric(const wxString& val)
 // 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 ;
@@ -138,21 +133,18 @@ bool wxTextValidator::Validate(wxWindow *parent)
 
     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() )
@@ -179,9 +171,23 @@ bool wxTextValidator::Validate(wxWindow *parent)
 
         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;
@@ -197,11 +203,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
 // 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 ;
@@ -213,11 +215,7 @@ bool wxTextValidator::TransferToWindow(void)
 // 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 ;
@@ -235,12 +233,12 @@ void wxTextValidator::SetIncludeList(const wxStringList& list)
 
     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();
     }
 }
 
@@ -253,12 +251,12 @@ void wxTextValidator::SetExcludeList(const wxStringList& list)
 
     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();
     }
 }
 
@@ -271,16 +269,18 @@ 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) && !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)
+              ((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) ||
+              ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) ||
+              ((m_validatorStyle & wxFILTER_NUMERIC) && !wxIsdigit(keyCode)
                                 && keyCode != '.' && keyCode != ',' && keyCode != '-')
              )
            )
@@ -310,6 +310,27 @@ static bool wxIsNumeric(const wxString& val)
     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