Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change wxTextValidator to use wxArrayString instead of wxStringList

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2005-02-07 23:46:42 +00:00
parent 2c3a10641d
commit f94a790daf
3 changed files with 111 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/wx/valtext.h
View File

@@ -64,25 +64,41 @@ public:
inline long GetStyle() const { return m_validatorStyle; }
inline void SetStyle(long style) { m_validatorStyle = style; }
void SetIncludeList(const wxStringList& list);
inline wxStringList& GetIncludeList() { return m_includeList; }
#if WXWIN_COMPATIBILITY_2_4
wxDEPRECATED( void SetIncludeList(const wxStringList& list) );
wxDEPRECATED( inline wxStringList& GetIncludeList() );
void SetExcludeList(const wxStringList& list);
inline wxStringList& GetExcludeList() { return m_excludeList; }
wxDEPRECATED( void SetExcludeList(const wxStringList& list) );
wxDEPRECATED( inline 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; }
void SetExcludes(const wxArrayString& excludes) { m_excludes = excludes; }
inline wxArrayString& GetExcludes() { return m_excludes; }
bool IsInCharIncludes(const wxString& val);
bool IsNotInCharExcludes(const wxString& val);
// Filter keystrokes
void OnChar(wxKeyEvent& event);
bool IsInCharIncludeList(const wxString& val);
bool IsNotInCharExcludeList(const wxString& val);
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
{