another fix

[wxWidgets.git] / src / common / valtext.cpp

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index 483b71d07520cfb0345983c33fe624906a902431..0e62b5ded39745160391620b4ca305ad51f12aa9 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -5,11 +5,11 @@
 // 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "valtext.h"
 #endif
 
@@ -20,7 +20,7 @@
   #pragma hdrstop
 #endif
 
-#if wxUSE_VALIDATORS
+#if wxUSE_VALIDATORS && wxUSE_TEXTCTRL
 
 #ifndef WX_PRECOMP
   #include <stdio.h>
@@ -50,17 +50,18 @@ 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);
 }
@@ -69,23 +70,12 @@ bool wxTextValidator::Copy(const wxTextValidator& val)
 {
     wxValidator::Copy(val);
 
-    m_validatorStyle = val.m_validatorStyle ;
-    m_stringValue = val.m_stringValue ;
+    m_validatorStyle = val.m_validatorStyle;
+    m_stringValue = val.m_stringValue;
+
+    m_includeList = val.m_includeList;
+    m_excludeList = val.m_excludeList;
 
-    wxNode *node = val.m_includeList.First() ;
-    while ( node )
-    {
-        wxChar *s = (wxChar *)node->Data();
-        m_includeList.Add(s);
-        node = node->Next();
-    }
-    node = val.m_excludeList.First() ;
-    while ( node )
-    {
-        wxChar *s = (wxChar *)node->Data();
-        m_excludeList.Add(s);
-        node = node->Next();
-    }
     return TRUE;
 }
 
@@ -122,7 +112,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
     if( !CheckValidator() )
         return FALSE;
 
-    wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
+    wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow;
 
     // If window is disabled, simply return
     if ( !control->IsEnabled() )
@@ -170,6 +160,18 @@ 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 )
     {
@@ -193,8 +195,11 @@ bool wxTextValidator::TransferToWindow(void)
     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;
 }
@@ -205,46 +210,23 @@ bool wxTextValidator::TransferFromWindow(void)
     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)
 {
-/*
-    if ( !M_VTEXTDATA )
-        return;
-*/
-
-    m_includeList.Clear();
-    // TODO: replace with =
-    wxNode *node = list.First() ;
-    while ( node )
-    {
-        wxChar *s = (wxChar *)node->Data();
-        m_includeList.Add(s);
-        node = node->Next();
-    }
+    m_includeList = list;
 }
 
 void wxTextValidator::SetExcludeList(const wxStringList& list)
 {
-/*
-    if ( !M_VTEXTDATA )
-        return;
-*/
-
-    m_excludeList.Clear();
-    // TODO: replace with =
-    wxNode *node = list.First() ;
-    while ( node )
-    {
-        wxChar *s = (wxChar *)node->Data();
-        m_excludeList.Add(s);
-        node = node->Next();
-    }
+    m_excludeList = list;
 }
 
 void wxTextValidator::OnChar(wxKeyEvent& event)
@@ -256,12 +238,14 @@ void wxTextValidator::OnChar(wxKeyEvent& event)
 
     if ( m_validatorWindow )
     {
-        int keyCode = (int)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((wxChar) keyCode, 1))) ||
+              ((m_validatorStyle & wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludeList(wxString((wxChar) keyCode, 1))) ||
               ((m_validatorStyle & wxFILTER_ASCII) && !isascii(keyCode)) ||
               ((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) ||
               ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) ||
@@ -288,12 +272,33 @@ static bool wxIsNumeric(const wxString& val)
     {
         // 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] != '.') && (val[i] != ',') && (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