X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fcd209b6a20b41e7ddf9acf837311ac6779ea41f..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/valtext.h?ds=inline diff --git a/include/wx/valtext.h b/include/wx/valtext.h index b096aa2c6f..93f5dd614e 100644 --- a/include/wx/valtext.h +++ b/include/wx/valtext.h @@ -1,10 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: valtext.h +// Name: wx/valtext.h // Purpose: wxTextValidator class // Author: Julian Smart // Modified by: Francesco Montorsi // Created: 29/01/98 -// RCS-ID: $Id$ // Copyright: (c) 1998 Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -22,25 +21,23 @@ class WXDLLIMPEXP_FWD_CORE wxTextEntry; enum wxTextValidatorStyle { - wxFILTER_NONE, - wxFILTER_ASCII, - wxFILTER_ALPHA, - wxFILTER_ALPHANUMERIC, - wxFILTER_SIMPLE_NUMBER, - wxFILTER_NUMERIC, - wxFILTER_INCLUDE_LIST, - wxFILTER_EXCLUDE_LIST, - wxFILTER_INCLUDE_CHAR_LIST, - wxFILTER_EXCLUDE_CHAR_LIST + wxFILTER_NONE = 0x0, + wxFILTER_EMPTY = 0x1, + wxFILTER_ASCII = 0x2, + wxFILTER_ALPHA = 0x4, + wxFILTER_ALPHANUMERIC = 0x8, + wxFILTER_DIGITS = 0x10, + wxFILTER_NUMERIC = 0x20, + wxFILTER_INCLUDE_LIST = 0x40, + wxFILTER_INCLUDE_CHAR_LIST = 0x80, + wxFILTER_EXCLUDE_LIST = 0x100, + wxFILTER_EXCLUDE_CHAR_LIST = 0x200 }; 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(long style = wxFILTER_NONE, wxString *val = NULL); wxTextValidator(const wxTextValidator& val); virtual ~wxTextValidator(){} @@ -66,11 +63,8 @@ public: void OnChar(wxKeyEvent& event); // ACCESSORS - 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 + inline long GetStyle() const { return m_validatorStyle; } + void SetStyle(long style); wxTextEntry *GetTextEntry(); @@ -82,25 +76,28 @@ public: void SetExcludes(const wxArrayString& excludes) { m_excludes = excludes; } inline wxArrayString& GetExcludes() { return m_excludes; } + bool HasFlag(wxTextValidatorStyle style) const + { return (m_validatorStyle & style) != 0; } + protected: // returns true if all characters of the given string are present in m_includes bool ContainsOnlyIncludedCharacters(const wxString& val) const; - // returns true if all characters of the given string are NOT present in m_excludes + // returns true if at least one character of the given string is present in m_excludes bool ContainsExcludedCharacters(const wxString& val) const; - // returns true if the contents of 'val' are valid for the current validation style - virtual bool IsValid(const wxString& val, wxString* errormsg) const; + // returns the error message if the contents of 'val' are invalid + virtual wxString IsValid(const wxString& val) const; protected: - wxTextValidatorStyle m_validatorStyle; - wxString * m_stringValue; + long m_validatorStyle; + wxString* m_stringValue; wxArrayString m_includes; wxArrayString m_excludes; private: - DECLARE_NO_ASSIGN_CLASS(wxTextValidator) + wxDECLARE_NO_ASSIGN_CLASS(wxTextValidator); DECLARE_DYNAMIC_CLASS(wxTextValidator) DECLARE_EVENT_TABLE() };