Better fix

[wxWidgets.git] / include / wx / valtext.h

diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 8c06688bfe1a5dc8601283af52b2ad3354c6523f..5f85d95c27f624e821003acbed438966ca2a0ff9 100644 (file)
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -9,14 +9,15 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_VALTEXTH__
-#define _WX_VALTEXTH__
+#ifndef _WX_VALTEXT_H_
+#define _WX_VALTEXT_H_
 
 #include "wx/defs.h"
 
-#if wxUSE_VALIDATORS && wxUSE_TEXTCTRL
+#if wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)
+
+class WXDLLIMPEXP_FWD_CORE wxTextEntry;
 
-#include "wx/textctrl.h"
 #include "wx/validate.h"
 
 #define wxFILTER_NONE           0x0000
@@ -60,6 +61,7 @@ public:
     inline long GetStyle() const { return m_validatorStyle; }
     inline void SetStyle(long style) { m_validatorStyle = style; }
 
+    wxTextEntry *GetTextEntry();
 
     void SetIncludes(const wxArrayString& includes) { m_includes = includes; }
     inline wxArrayString& GetIncludes() { return m_includes; }
@@ -73,7 +75,6 @@ public:
     // Filter keystrokes
     void OnChar(wxKeyEvent& event);
 
-
 DECLARE_EVENT_TABLE()
 
 protected:
@@ -82,16 +83,6 @@ protected:
     wxArrayString   m_includes;
     wxArrayString   m_excludes;
 
-    bool CheckValidator() const
-    {
-        wxCHECK_MSG( m_validatorWindow, false,
-                     _T("No window associated with validator") );
-        wxCHECK_MSG( m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)), false,
-                     _T("wxTextValidator is only for wxTextCtrl's") );
-
-        return true;
-    }
-
 private:
 // Cannot use
 //  DECLARE_NO_COPY_CLASS(wxTextValidator)
@@ -102,7 +93,6 @@ private:
 };
 
 #endif
-  // wxUSE_VALIDATORS && wxUSE_TEXTCTRL
+  // wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)
 
-#endif
-  // _WX_VALTEXTH__
+#endif // _WX_VALTEXT_H_