wxDataObejct and related changes (won't compile right now)

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

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index 4f1740a7499d2cfe82306e4d74345eeb13d63fed..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"


@@ -129,7 +131,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
     wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
 
     // If window is disabled, simply return
     wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
 
     // If window is disabled, simply return

-    if ( !control->Enabled() )
+    if ( !control->IsEnabled() )

         return TRUE;
 
     wxString val(control->GetValue());
         return TRUE;
 
     wxString val(control->GetValue());


@@ -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