copyright update

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

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index 2d6bbca2f47fe88680d084d21d8b8cd414190e8d..3ecc428116642a2cc1e079baf98d0fc4bdef5d38 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -98,7 +98,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 +109,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,11 +119,7 @@ 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 ;


@@ -195,11 +191,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 +203,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 ;


@@ -269,16 +257,16 @@ void wxTextValidator::OnChar(wxKeyEvent& event)
 
     if ( m_validatorWindow )
     {
 
     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)) ||
 
         // 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)
+              ((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) ||
+              ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) ||
+              ((m_validatorStyle & wxFILTER_NUMERIC) && !wxIsdigit(keyCode)

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