drawing optimization fix

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

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index a14a082387d8bdad1765258a547f9f1a8aab9474..7da74055f5c58e23358f79885b06c6da4b847937 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -134,6 +134,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
        {
                if ( !m_includeList.Member(val) )
                {
        {
                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);
                        char buf[512];
                        sprintf(buf, _("%s is invalid."), (const char *)val);
                        wxMessageBox(buf, _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);


@@ -144,6 +145,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
        {
                if ( m_excludeList.Member(val) )
                {
        {
                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);
                        char buf[512];
                        sprintf(buf, _("%s is invalid."), (const char *)val);
                        wxMessageBox(buf, _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);


@@ -152,6 +154,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
        }
        if ( (m_validatorStyle & wxFILTER_ASCII) && !val.IsAscii() )
        {
        }
        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);
                        char buf[512];
                        sprintf(buf, _("%s should only contain ASCII characters."), (const char *)val);
                        wxMessageBox(buf, _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);


@@ -159,6 +162,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
        }
        if ( (m_validatorStyle & wxFILTER_ALPHA) && !wxIsAlpha(val) )
        {
        }
        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);
                        char buf[512];
                        sprintf(buf, _("%s should only contain alphabetic characters."), (const char *)val);
                        wxMessageBox(buf, _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);


@@ -166,6 +170,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
        }
        if ( (m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsAlphaNumeric(val))
        {
        }
        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);
                        char buf[512];
                        sprintf(buf, _("%s should only contain alphabetic or numeric characters."), (const char *)val);
                        wxMessageBox(buf,_("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);


@@ -174,6 +179,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
        if ( (m_validatorStyle & wxFILTER_NUMERIC) && !wxIsNumeric(val))
 
        {
        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);
                        char buf[512];
                        sprintf(buf, _("%s should be numeric."), (const char *)val);
                        wxMessageBox(buf, _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);