X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f94a790dafd54c290618c97cb3d4feffc400fd15..3508c1432884472f0d24f0f98c0dc75ed35df297:/include/wx/valtext.h?ds=sidebyside

diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 0a047e199a..8aa0ea295c 100644
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -9,39 +9,40 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_VALTEXTH__
-#define _WX_VALTEXTH__
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "valtext.h"
-#endif
+#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
-#define wxFILTER_ASCII          0x0001
-#define wxFILTER_ALPHA          0x0002
-#define wxFILTER_ALPHANUMERIC   0x0004
-#define wxFILTER_NUMERIC        0x0008
-#define wxFILTER_INCLUDE_LIST   0x0010
-#define wxFILTER_EXCLUDE_LIST   0x0020
-#define wxFILTER_INCLUDE_CHAR_LIST 0x0040
-#define wxFILTER_EXCLUDE_CHAR_LIST 0x0080
-
-class WXDLLEXPORT wxTextValidator: public wxValidator
+enum wxTextValidatorStyle
 {
-DECLARE_DYNAMIC_CLASS(wxTextValidator)
-public:
+    wxFILTER_NONE,
+    wxFILTER_ASCII,
+    wxFILTER_ALPHA,
+    wxFILTER_ALPHANUMERIC,
+    wxFILTER_NUMERIC,
+    wxFILTER_INCLUDE_LIST,
+    wxFILTER_EXCLUDE_LIST,
+    wxFILTER_INCLUDE_CHAR_LIST,
+    wxFILTER_EXCLUDE_CHAR_LIST
+};
 
-    wxTextValidator(long style = wxFILTER_NONE, wxString *val = 0);
+class WXDLLIMPEXP_CORE wxTextValidator: public wxValidator
+{
+public:
+    wxTextValidator(wxTextValidatorStyle style = wxFILTER_NONE, wxString *val = NULL);
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED_CONSTRUCTOR( wxTextValidator(long style, wxString *val) );
+#endif
     wxTextValidator(const wxTextValidator& val);
 
-    ~wxTextValidator(){}
+    virtual ~wxTextValidator(){}
 
     // Make a clone of this validator (or return NULL) - currently necessary
     // if you're passing a reference to a validator.
@@ -57,24 +58,18 @@ public:
     // Called to transfer data to the window
     virtual bool TransferToWindow();
 
-    // Called to transfer data to the window
+    // Called to transfer data from the window
     virtual bool TransferFromWindow();
 
     // ACCESSORS
-    inline long GetStyle() const { return m_validatorStyle; }
-    inline void SetStyle(long style) { m_validatorStyle = style; }
-
-#if WXWIN_COMPATIBILITY_2_4
-    wxDEPRECATED( void SetIncludeList(const wxStringList& list) );
-    wxDEPRECATED( inline wxStringList& GetIncludeList() );
-
-    wxDEPRECATED( void SetExcludeList(const wxStringList& list) );
-    wxDEPRECATED( inline wxStringList& GetExcludeList() );
-
-    wxDEPRECATED( bool IsInCharIncludeList(const wxString& val) );
-    wxDEPRECATED( bool IsNotInCharExcludeList(const wxString& val) );
+    inline wxTextValidatorStyle GetStyle() const { return m_validatorStyle; }
+    inline void SetStyle(wxTextValidatorStyle style) { m_validatorStyle = style; }
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED( void SetStyle(long style) );
 #endif
 
+    wxTextEntry *GetTextEntry();
+
     void SetIncludes(const wxArrayString& includes) { m_includes = includes; }
     inline wxArrayString& GetIncludes() { return m_includes; }
 
@@ -87,42 +82,19 @@ public:
     // Filter keystrokes
     void OnChar(wxKeyEvent& event);
 
-
-DECLARE_EVENT_TABLE()
-
 protected:
-    long            m_validatorStyle;
-    wxString *      m_stringValue;
-#if WXWIN_COMPATIBILITY_2_4
-    wxStringList    m_includeList;
-    wxStringList    m_excludeList;
-#endif
-    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") );
-        wxCHECK_MSG( m_stringValue, false,
-                     _T("No variable storage for validator") );
-
-        return true;
-    }
+    wxTextValidatorStyle m_validatorStyle;
+    wxString *           m_stringValue;
+    wxArrayString        m_includes;
+    wxArrayString        m_excludes;
 
 private:
-// Cannot use
-//  DECLARE_NO_COPY_CLASS(wxTextValidator)
-// because copy constructor is explicitly declared above;
-// but no copy assignment operator is defined, so declare
-// it private to prevent the compiler from defining it:
-    wxTextValidator& operator=(const wxTextValidator&);
+    DECLARE_NO_ASSIGN_CLASS(wxTextValidator)
+    DECLARE_DYNAMIC_CLASS(wxTextValidator)
+    DECLARE_EVENT_TABLE()
 };
 
 #endif
-  // wxUSE_VALIDATORS && wxUSE_TEXTCTRL
+  // wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)
 
-#endif
-  // _WX_VALTEXTH__
+#endif // _WX_VALTEXT_H_