X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/10b0f4894bcfc158dc406700365887da74ddbf15..a721fd82b7ca8c97048453d4aaff559e8f741d69:/include/wx/valtext.h?ds=inline diff --git a/include/wx/valtext.h b/include/wx/valtext.h index 1408a09eff..c5ca124b67 100644 --- a/include/wx/valtext.h +++ b/include/wx/valtext.h @@ -22,24 +22,23 @@ class WXDLLIMPEXP_FWD_CORE wxTextEntry; enum wxTextValidatorStyle { - wxFILTER_NONE, - wxFILTER_ASCII, - wxFILTER_ALPHA, - wxFILTER_ALPHANUMERIC, - 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(){} @@ -65,34 +64,36 @@ 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(); + void SetCharIncludes(const wxString& chars); void SetIncludes(const wxArrayString& includes) { m_includes = includes; } inline wxArrayString& GetIncludes() { return m_includes; } + void SetCharExcludes(const wxString& chars); 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 IsInCharIncludes(const wxString& val) const; + bool ContainsOnlyIncludedCharacters(const wxString& val) const; // returns true if all characters of the given string are NOT present in m_excludes - bool IsNotInCharExcludes(const wxString& val) const; + bool ContainsExcludedCharacters(const wxString& val) const; - // returns true if the contents of 'val' are valid for the current validation style - 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;