revert my last change

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

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index 259b201326f81b6295cd5ea2abb49879276bd3ad..530772a890fc3d967eda09a4323f582863576678 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -5,27 +5,29 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // 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__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-    #pragma implementation "valtext.h"
+#pragma implementation "valtext.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-    #pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_VALIDATORS && wxUSE_TEXTCTRL
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include <stdio.h>
-    #include "wx/textctrl.h"
-    #include "wx/utils.h"
-    #include "wx/msgdlg.h"
-    #include "wx/intl.h"
+  #include <stdio.h>
+  #include "wx/textctrl.h"
+  #include "wx/utils.h"
+  #include "wx/msgdlg.h"
+  #include "wx/intl.h"

 #endif
 
 #include "wx/valtext.h"
 #endif
 
 #include "wx/valtext.h"


@@ -38,13 +40,11 @@
     #include <clib.h>
 #endif
 
     #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()
 IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator)
 
 BEGIN_EVENT_TABLE(wxTextValidator, wxValidator)
     EVT_CHAR(wxTextValidator::OnChar)
 END_EVENT_TABLE()

-#endif

 
 static bool wxIsNumeric(const wxString& val);
 
 
 static bool wxIsNumeric(const wxString& val);
 


@@ -61,6 +61,7 @@ wxTextValidator::wxTextValidator(long style, wxString *val)
 }
 
 wxTextValidator::wxTextValidator(const wxTextValidator& val)
 }
 
 wxTextValidator::wxTextValidator(const wxTextValidator& val)

+    : wxValidator()

 {
     Copy(val);
 }
 {
     Copy(val);
 }


@@ -72,19 +73,19 @@ bool wxTextValidator::Copy(const wxTextValidator& 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() ;
+    wxStringList::Node *node = val.m_includeList.GetFirst() ;

     while ( node )
     {
     while ( node )
     {

-        char *s = (char *)node->Data();
+        wxChar *s = node->GetData();

         m_includeList.Add(s);
         m_includeList.Add(s);

-        node = node->Next();
+        node = node->GetNext();

     }
     }

-    node = val.m_excludeList.First() ;
+    node = val.m_excludeList.GetFirst() ;

     while ( node )
     {
     while ( node )
     {

-        char *s = (char *)node->Data();
+        wxChar *s = node->GetData();

         m_excludeList.Add(s);
         m_excludeList.Add(s);

-        node = node->Next();
+        node = node->GetNext();

     }
     return TRUE;
 }
     }
     return TRUE;
 }


@@ -98,7 +99,7 @@ static bool wxIsAlpha(const wxString& val)
     int i;
     for ( i = 0; i < (int)val.Length(); i++)
     {
     int i;
     for ( i = 0; i < (int)val.Length(); i++)
     {

-        if (!isalpha(val[i]))
+        if (!wxIsalpha(val[i]))

             return FALSE;
     }
     return TRUE;
             return FALSE;
     }
     return TRUE;


@@ -109,7 +110,7 @@ static bool wxIsAlphaNumeric(const wxString& val)
     int i;
     for ( i = 0; i < (int)val.Length(); i++)
     {
     int i;
     for ( i = 0; i < (int)val.Length(); i++)
     {

-        if (!isalnum(val[i]))
+        if (!wxIsalnum(val[i]))

             return FALSE;
     }
     return TRUE;
             return FALSE;
     }
     return TRUE;


@@ -119,67 +120,74 @@ static bool wxIsAlphaNumeric(const wxString& val)
 // This function can pop up an error message.
 bool wxTextValidator::Validate(wxWindow *parent)
 {
 // 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 ;
 
         return FALSE;
 
     wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
 

-    // If window is disabled, don't validate
-    if ( !control->Enabled() )
-        return FALSE;
+    // If window is disabled, simply return
+    if ( !control->IsEnabled() )
+        return TRUE;

 
     wxString val(control->GetValue());
 
 
     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 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() )
     {
         }
     }
     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) )
     {
 
         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))
     {
 
         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))
     {
 
         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.");
     }
 
         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 )
     {
 
     if ( !ok )
     {

+        wxASSERT_MSG( !errormsg.empty(), _T("you forgot to set errormsg") );
+

         m_validatorWindow->SetFocus();
 
         wxString buf;
         m_validatorWindow->SetFocus();
 
         wxString buf;


@@ -195,11 +203,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
 // Called to transfer data to the window
 bool wxTextValidator::TransferToWindow(void)
 {
 // 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 ;
         return FALSE;
 
     wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;


@@ -211,11 +215,7 @@ bool wxTextValidator::TransferToWindow(void)
 // Called to transfer data to the window
 bool wxTextValidator::TransferFromWindow(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 ;
         return FALSE;
 
     wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;


@@ -233,12 +233,12 @@ void wxTextValidator::SetIncludeList(const wxStringList& list)
 
     m_includeList.Clear();
     // TODO: replace with =
 
     m_includeList.Clear();
     // TODO: replace with =

-    wxNode *node = list.First() ;
+    wxStringList::Node     *node = list.GetFirst();

     while ( node )
     {
     while ( node )
     {

-        char *s = (char *)node->Data();
+        wxChar *s = node->GetData();

         m_includeList.Add(s);
         m_includeList.Add(s);

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 
     }
 }
 


@@ -251,12 +251,12 @@ void wxTextValidator::SetExcludeList(const wxStringList& list)
 
     m_excludeList.Clear();
     // TODO: replace with =
 
     m_excludeList.Clear();
     // TODO: replace with =

-    wxNode *node = list.First() ;
+    wxStringList::Node  *node = list.GetFirst() ;

     while ( node )
     {
     while ( node )
     {

-        char *s = (char *)node->Data();
+        wxChar *s = node->GetData();

         m_excludeList.Add(s);
         m_excludeList.Add(s);

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 
     }
 }
 


@@ -269,17 +269,19 @@ void wxTextValidator::OnChar(wxKeyEvent& event)
 
     if ( m_validatorWindow )
     {
 
     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) &&
              (
 
         // 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_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 != '-')

              )
            )
         {
              )
            )
         {


@@ -299,10 +301,35 @@ static bool wxIsNumeric(const wxString& val)
     int i;
     for ( i = 0; i < (int)val.Length(); i++)
     {
     int i;
     for ( i = 0; i < (int)val.Length(); i++)
     {

-        if ((!isdigit(val[i])) && (val[i] != '.'))
-          if(!((i == 0) && (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] != ',') && (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;
 }
 
             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_TEXTCTRL