X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52437a76c384f7f27ff3632e152e71847b34f65e..e93523680ba3c83cdae75b511214c82f28a2d853:/include/wx/valtext.h?ds=sidebyside diff --git a/include/wx/valtext.h b/include/wx/valtext.h index 394c160fcf..8c06688bfe 100644 --- a/include/wx/valtext.h +++ b/include/wx/valtext.h @@ -37,7 +37,7 @@ public: wxTextValidator(long style = wxFILTER_NONE, wxString *val = 0); 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. @@ -60,16 +60,6 @@ public: 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( wxStringList& GetIncludeList() ); - - wxDEPRECATED( void SetExcludeList(const wxStringList& list) ); - wxDEPRECATED( wxStringList& GetExcludeList() ); - - wxDEPRECATED( bool IsInCharIncludeList(const wxString& val) ); - wxDEPRECATED( bool IsNotInCharExcludeList(const wxString& val) ); -#endif void SetIncludes(const wxArrayString& includes) { m_includes = includes; } inline wxArrayString& GetIncludes() { return m_includes; } @@ -89,10 +79,6 @@ 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;