wxImage::Ok() now returns false for images with 0 width or height

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

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index a3b027ea0acf5160d7c374450a0dcc566da5ec03..9e7599571ba2d86d407f1deb5ad45bdef46d9aa5 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -20,10 +20,6 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
-#endif
-

 #if wxUSE_VALIDATORS
 
 #ifndef WX_PRECOMP
 #if wxUSE_VALIDATORS
 
 #ifndef WX_PRECOMP


@@ -44,13 +40,11 @@
     #include <clib.h>
 #endif
 
     #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()
 IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator)
 
 BEGIN_EVENT_TABLE(wxTextValidator, wxValidator)
     EVT_CHAR(wxTextValidator::OnChar)
 END_EVENT_TABLE()

-#endif

 
 static bool wxIsNumeric(const wxString& val);
 
 
 static bool wxIsNumeric(const wxString& val);
 


@@ -104,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;


@@ -115,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;


@@ -275,17 +269,17 @@ 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)
-                                && keyCode != '.' && keyCode != '-')
+              ((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) ||
+              ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) ||
+              ((m_validatorStyle & wxFILTER_NUMERIC) && !wxIsdigit(keyCode)
+                                && keyCode != '.' && keyCode != ',' && keyCode != '-')

              )
            )
         {
              )
            )
         {


@@ -305,7 +299,9 @@ 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;
     }
           if(!((i == 0) && (val[i] == '-')))
             return FALSE;
     }


@@ -314,4 +310,3 @@ static bool wxIsNumeric(const wxString& val)
 
 #endif
   // wxUSE_VALIDATORS
 
 #endif
   // wxUSE_VALIDATORS

-  
\ No newline at end of file