added init.cpp

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

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index 4c8a4748688dcc0828ae8577306d0078744ca9a9..530772a890fc3d967eda09a4323f582863576678 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -5,8 +5,8 @@
 // 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__


@@ -20,7 +20,7 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

-#if wxUSE_VALIDATORS
+#if wxUSE_VALIDATORS && wxUSE_TEXTCTRL

 
 #ifndef WX_PRECOMP
   #include <stdio.h>
 
 #ifndef WX_PRECOMP
   #include <stdio.h>


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

-        wxChar *s = (wxChar *)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 )
     {

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

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

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

     }
     return TRUE;
 }
     }
     return TRUE;
 }


@@ -174,13 +175,13 @@ bool wxTextValidator::Validate(wxWindow *parent)
     {
         //it's only ok to have the members of the list
         errormsg = _("'%s' is invalid");
     {
         //it's only ok to have the members of the list
         errormsg = _("'%s' is invalid");

-        ok = FALSE;    
+        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");
     }
     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;    
+        ok = FALSE;

     }
 
     if ( !ok )
     }
 
     if ( !ok )


@@ -232,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 )
     {

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

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

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

     }
 }
 
     }
 }
 


@@ -250,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 )
     {

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

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

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

     }
 }
 
     }
 }
 


@@ -268,13 +269,13 @@ void wxTextValidator::OnChar(wxKeyEvent& event)
 
     if ( m_validatorWindow )
     {
 
     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) &&
              (
 
         // 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_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_ALPHA) && !wxIsalpha(keyCode)) ||
               ((m_validatorStyle & wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludeList(wxString((char) keyCode, 1))) ||
               ((m_validatorStyle & wxFILTER_ASCII) && !isascii(keyCode)) ||
               ((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) ||


@@ -302,8 +303,7 @@ static bool wxIsNumeric(const wxString& val)
     {
         // Allow for "," (French) as well as "." -- in future we should
         // use wxSystemSettings or other to do better localisation
     {
         // 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 ((!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;
             return FALSE;
     }
     return TRUE;


@@ -332,4 +332,4 @@ bool wxTextValidator::IsNotInCharExcludeList(const wxString& val)
 }
 
 #endif
 }
 
 #endif

-  // wxUSE_VALIDATORS
+  // wxUSE_VALIDATORS && wxUSE_TEXTCTRL