added #include <fcntl.h> to allow compilation under Linux

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

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index 117efff3153876a13947bf8cf04833d846040b76..c3139ccfb6d404471f2c297dd23ea243a201535b 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -24,7 +24,8 @@
 #include <stdio.h>
 #include "wx/textctrl.h"
 #include "wx/utils.h"
-#include "wx/msgbxdlg.h"
+#include "wx/msgdlg.h"
+#include "wx/intl.h"
 #endif
 
 #include "wx/valtext.h"
@@ -33,6 +34,10 @@
 #include <string.h>
 #include <stdlib.h>
 
+#ifdef __SALFORDC__
+#include <clib.h>
+#endif
+
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator)
 
@@ -41,6 +46,8 @@ BEGIN_EVENT_TABLE(wxTextValidator, wxValidator)
 END_EVENT_TABLE()
 #endif
 
+static bool wxIsNumeric(const wxString& val);
+
 wxTextValidator::wxTextValidator(long style, wxString *val)
 {
        m_validatorStyle = style ;
@@ -131,9 +138,10 @@ bool wxTextValidator::Validate(wxWindow *parent)
        {
                if ( !m_includeList.Member(val) )
                {
+            m_validatorWindow->SetFocus();
                        char buf[512];
-                       sprintf(buf, "%s is invalid.", (const char *)val);
-                       wxMessageBox(buf, "Validation conflict", wxOK | wxICON_EXCLAMATION, parent);
+                       sprintf(buf, _("%s is invalid."), (const char *)val);
+                       wxMessageBox(buf, _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);
                        return FALSE;
                }
        }
@@ -141,38 +149,44 @@ bool wxTextValidator::Validate(wxWindow *parent)
        {
                if ( m_excludeList.Member(val) )
                {
+            m_validatorWindow->SetFocus();
                        char buf[512];
-                       sprintf(buf, "%s is invalid.", (const char *)val);
-                       wxMessageBox(buf, "Validation conflict", wxOK | wxICON_EXCLAMATION, parent);
+                       sprintf(buf, _("%s is invalid."), (const char *)val);
+                       wxMessageBox(buf, _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);
                        return FALSE;
                }
        }
        if ( (m_validatorStyle & wxFILTER_ASCII) && !val.IsAscii() )
        {
+            m_validatorWindow->SetFocus();
                        char buf[512];
-                       sprintf(buf, "%s should only contain ASCII characters.", (const char *)val);
-                       wxMessageBox(buf, "Validation conflict", wxOK | wxICON_EXCLAMATION, parent);
+                       sprintf(buf, _("%s should only contain ASCII characters."), (const char *)val);
+                       wxMessageBox(buf, _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);
                        return FALSE;
        }
        if ( (m_validatorStyle & wxFILTER_ALPHA) && !wxIsAlpha(val) )
        {
+            m_validatorWindow->SetFocus();
                        char buf[512];
-                       sprintf(buf, "%s should only contain alphabetic characters.", (const char *)val);
-                       wxMessageBox(buf, "Validation conflict", wxOK | wxICON_EXCLAMATION, parent);
+                       sprintf(buf, _("%s should only contain alphabetic characters."), (const char *)val);
+                       wxMessageBox(buf, _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);
                        return FALSE;
        }
        if ( (m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsAlphaNumeric(val))
        {
+            m_validatorWindow->SetFocus();
                        char buf[512];
-                       sprintf(buf, "%s should only contain alphabetic or numeric characters.", (const char *)val);
-                       wxMessageBox(buf, "Validation conflict", wxOK | wxICON_EXCLAMATION, parent);
+                       sprintf(buf, _("%s should only contain alphabetic or numeric characters."), (const char *)val);
+                       wxMessageBox(buf,_("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);
                        return FALSE;
        }
-       if ( (m_validatorStyle & wxFILTER_NUMERIC) && !val.IsNumber())
+       if ( (m_validatorStyle & wxFILTER_NUMERIC) && !wxIsNumeric(val))
+
        {
+            m_validatorWindow->SetFocus();
                        char buf[512];
-                       sprintf(buf, "%s should be numeric.", (const char *)val);
-                       wxMessageBox(buf, "Validation conflict", wxOK | wxICON_EXCLAMATION, parent);
+                       sprintf(buf, _("%s should be numeric."), (const char *)val);
+                       wxMessageBox(buf, _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);
                        return FALSE;
        }
 
@@ -260,7 +274,10 @@ void wxTextValidator::OnChar(wxKeyEvent& event)
        wxTextCtrl *textCtrl = (wxTextCtrl *)m_validatorWindow;
 
        int keyCode = event.KeyCode();
-       if ( keyCode == WXK_DELETE || keyCode == WXK_RETURN || keyCode == WXK_BACK)
+       if (keyCode == WXK_DELETE || keyCode == WXK_RETURN || keyCode == WXK_BACK ||
+           keyCode == WXK_HOME || keyCode == WXK_LEFT || keyCode == WXK_UP ||
+           keyCode == WXK_RIGHT || keyCode == WXK_DOWN || keyCode == WXK_PRIOR ||
+           keyCode == WXK_NEXT || keyCode == WXK_END || keyCode == WXK_HOME)
        {
                textCtrl->wxTextCtrl::OnChar(event);
                return ;
@@ -281,7 +298,7 @@ void wxTextValidator::OnChar(wxKeyEvent& event)
                wxBell();
                return;
        }
-       if ( (m_validatorStyle & wxFILTER_NUMERIC) && !isdigit(keyCode) && keyCode != '.' )
+       if ( (m_validatorStyle & wxFILTER_NUMERIC) && !isdigit(keyCode) && keyCode != '.' && keyCode != '-')
        {
                wxBell();
                return;
@@ -290,4 +307,15 @@ void wxTextValidator::OnChar(wxKeyEvent& event)
        textCtrl->wxTextCtrl::OnChar(event);
 }
 
+static bool wxIsNumeric(const wxString& val)
+{
+       int i;
+       for ( i = 0; i < (int)val.Length(); i++)
+       {
+               if ((!isdigit(val[i])) && (val[i] != '.'))
+                 if(!((i == 0) && (val[i] == '-')))
+                       return FALSE;
+       }
+       return TRUE;
+}