X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/903f689bf7c3c379cba45881373aa9bdd15d6e70..e541d0bf0cc45b77ca30e2ade5745dfe36341d09:/src/common/valtext.cpp

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index 3973230d80..c3139ccfb6 100644
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -34,6 +34,10 @@
 #include <string.h>
 #include <stdlib.h>
 
+#ifdef __SALFORDC__
+#include <clib.h>
+#endif
+
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator)
 
@@ -42,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 ;
@@ -132,6 +138,7 @@ 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);
@@ -142,6 +149,7 @@ 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);
@@ -150,6 +158,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
 	}
 	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);
@@ -157,6 +166,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
 	}
 	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);
@@ -164,13 +174,16 @@ bool wxTextValidator::Validate(wxWindow *parent)
 	}
 	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);
 			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);
@@ -261,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 ;
@@ -282,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;
@@ -291,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;
+}