Committing in .

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

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index 259b201326f81b6295cd5ea2abb49879276bd3ad..9fdf5b77e78ad45f3bcb9be8e82da1bacd7be1bf 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -10,22 +10,24 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #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
+

 #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"


@@ -75,14 +77,14 @@ bool wxTextValidator::Copy(const wxTextValidator& val)
     wxNode *node = val.m_includeList.First() ;
     while ( node )
     {
     wxNode *node = val.m_includeList.First() ;
     while ( node )
     {

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

         m_includeList.Add(s);
         node = node->Next();
     }
     node = val.m_excludeList.First() ;
     while ( node )
     {
         m_includeList.Add(s);
         node = node->Next();
     }
     node = val.m_excludeList.First() ;
     while ( node )
     {

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

         m_excludeList.Add(s);
         node = node->Next();
     }
         m_excludeList.Add(s);
         node = node->Next();
     }


@@ -128,52 +130,52 @@ bool wxTextValidator::Validate(wxWindow *parent)
 
     wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
 
 
     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'
 
     // this format string should contian exactly one '%s'

-    const char *errormsg = _("'%s' is invalid");
+    const wxChar *errormsg = _("'%s' is invalid");

 
     if ( m_validatorStyle & wxFILTER_INCLUDE_LIST )
     {
         if ( !m_includeList.Member(val) )
         {
 
     if ( m_validatorStyle & wxFILTER_INCLUDE_LIST )
     {
         if ( !m_includeList.Member(val) )
         {

-            ok = false;
+            ok = FALSE;

         }
     }
     else if ( m_validatorStyle & wxFILTER_EXCLUDE_LIST )
     {
         if ( m_excludeList.Member(val) )
         {
         }
     }
     else if ( m_validatorStyle & wxFILTER_EXCLUDE_LIST )
     {
         if ( m_excludeList.Member(val) )
         {

-            ok = false;
+            ok = FALSE;

         }
     }
     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.");
     }


@@ -236,7 +238,7 @@ void wxTextValidator::SetIncludeList(const wxStringList& list)
     wxNode *node = list.First() ;
     while ( node )
     {
     wxNode *node = list.First() ;
     while ( node )
     {

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

         m_includeList.Add(s);
         node = node->Next();
     }
         m_includeList.Add(s);
         node = node->Next();
     }


@@ -254,7 +256,7 @@ void wxTextValidator::SetExcludeList(const wxStringList& list)
     wxNode *node = list.First() ;
     while ( node )
     {
     wxNode *node = list.First() ;
     while ( node )
     {

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

         m_excludeList.Add(s);
         node = node->Next();
     }
         m_excludeList.Add(s);
         node = node->Next();
     }


@@ -279,7 +281,7 @@ void wxTextValidator::OnChar(wxKeyEvent& event)
               ((m_validatorStyle & wxFILTER_ALPHA) && !isalpha(keyCode)) ||
               ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !isalnum(keyCode)) ||
               ((m_validatorStyle & wxFILTER_NUMERIC) && !isdigit(keyCode)
               ((m_validatorStyle & wxFILTER_ALPHA) && !isalpha(keyCode)) ||
               ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !isalnum(keyCode)) ||
               ((m_validatorStyle & wxFILTER_NUMERIC) && !isdigit(keyCode)

-                                && keyCode != '.' && keyCode != '-')
+                                && keyCode != '.' && keyCode != ',' && keyCode != '-')

              )
            )
         {
              )
            )
         {


@@ -299,10 +301,14 @@ 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] != '.'))
+        // 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;
 }
 
           if(!((i == 0) && (val[i] == '-')))
             return FALSE;
     }
     return TRUE;
 }
 

+#endif
+  // wxUSE_VALIDATORS