To avoid error message, do not even try to set focus on MSW popup window that doesn...

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

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index e7f637ff255c75049ad458cfdb60764170ec7324..8c69b0692be75eb86e2778bd72956ea8555999ee 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -23,6 +23,7 @@
 #ifndef WX_PRECOMP
   #include <stdio.h>
   #include "wx/textctrl.h"
 #ifndef WX_PRECOMP
   #include <stdio.h>
   #include "wx/textctrl.h"

+  #include "wx/combobox.h"

   #include "wx/utils.h"
   #include "wx/msgdlg.h"
   #include "wx/intl.h"
   #include "wx/utils.h"
   #include "wx/msgdlg.h"
   #include "wx/intl.h"


@@ -32,10 +33,6 @@
 #include <string.h>
 #include <stdlib.h>
 
 #include <string.h>
 #include <stdlib.h>
 

-#ifdef __SALFORDC__
-    #include <clib.h>
-#endif
-

 IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator)
 
 BEGIN_EVENT_TABLE(wxTextValidator, wxValidator)
 IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator)
 
 BEGIN_EVENT_TABLE(wxTextValidator, wxValidator)


@@ -83,6 +80,7 @@ wxTextEntry *wxTextValidator::GetTextEntry()
         return (wxTextCtrl*)m_validatorWindow;
     }
 #endif
         return (wxTextCtrl*)m_validatorWindow;
     }
 #endif

+

 #if wxUSE_COMBOBOX
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)))
     {
 #if wxUSE_COMBOBOX
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)))
     {