corrected DoReadLong

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

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index 259b201326f81b6295cd5ea2abb49879276bd3ad..3ecc428116642a2cc1e079baf98d0fc4bdef5d38 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -10,22 +10,24 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #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__
-    #pragma hdrstop
+  #pragma hdrstop
 #endif
 
+#if wxUSE_VALIDATORS
+
 #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"
@@ -38,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);
 
@@ -75,14 +75,14 @@ bool wxTextValidator::Copy(const wxTextValidator& val)
     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 )
     {
-        char *s = (char *)node->Data();
+        wxChar *s = (wxChar *)node->Data();
         m_excludeList.Add(s);
         node = node->Next();
     }
@@ -98,7 +98,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;
@@ -109,7 +109,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;
@@ -119,61 +119,57 @@ 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 ;
 
-    // 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());
 
-    bool ok = true;
+    bool ok = TRUE;
 
     // 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) )
         {
-            ok = false;
+            ok = FALSE;
         }
     }
     else if ( m_validatorStyle & wxFILTER_EXCLUDE_LIST )
     {
         if ( m_excludeList.Member(val) )
         {
-            ok = false;
+            ok = FALSE;
         }
     }
     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.");
     }
@@ -195,11 +191,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 ;
@@ -211,11 +203,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 ;
@@ -236,7 +224,7 @@ void wxTextValidator::SetIncludeList(const wxStringList& list)
     wxNode *node = list.First() ;
     while ( node )
     {
-        char *s = (char *)node->Data();
+        wxChar *s = (wxChar *)node->Data();
         m_includeList.Add(s);
         node = node->Next();
     }
@@ -254,7 +242,7 @@ void wxTextValidator::SetExcludeList(const wxStringList& list)
     wxNode *node = list.First() ;
     while ( node )
     {
-        char *s = (char *)node->Data();
+        wxChar *s = (wxChar *)node->Data();
         m_excludeList.Add(s);
         node = node->Next();
     }
@@ -269,17 +257,17 @@ void wxTextValidator::OnChar(wxKeyEvent& event)
 
     if ( m_validatorWindow )
     {
-        int keyCode = event.KeyCode();
+        int keyCode = (int)event.KeyCode();
 
         // we don't filter special keys and Delete
         if (
              !(keyCode < WXK_SPACE || keyCode == WXK_DELETE || keyCode > WXK_START) &&
              (
               ((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 +287,14 @@ static bool wxIsNumeric(const wxString& val)
     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;
 }
 
+#endif
+  // wxUSE_VALIDATORS