X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..e2cb366f612460ba70fb12560c112fef2d8389dd:/include/wx/valtext.h diff --git a/include/wx/valtext.h b/include/wx/valtext.h index c2a45e8040..955a7f38f8 100644 --- a/include/wx/valtext.h +++ b/include/wx/valtext.h @@ -2,7 +2,7 @@ // Name: valtext.h // Purpose: wxTextValidator class // Author: Julian Smart -// Modified by: +// Modified by: Francesco Montorsi // Created: 29/01/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Julian Smart @@ -20,22 +20,25 @@ class WXDLLIMPEXP_FWD_CORE wxTextEntry; #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 +enum wxTextValidatorStyle +{ + 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 { -DECLARE_DYNAMIC_CLASS(wxTextValidator) public: - - wxTextValidator(long style = wxFILTER_NONE, wxString *val = 0); + wxTextValidator(long style = wxFILTER_NONE, wxString *val = NULL); wxTextValidator(const wxTextValidator& val); virtual ~wxTextValidator(){} @@ -57,39 +60,47 @@ public: // Called to transfer data from the window virtual bool TransferFromWindow(); + // Filter keystrokes + void OnChar(wxKeyEvent& event); + // ACCESSORS inline long GetStyle() const { return m_validatorStyle; } - inline void SetStyle(long style) { m_validatorStyle = style; } + 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 IsInCharIncludes(const wxString& val); - bool IsNotInCharExcludes(const wxString& val); + bool HasFlag(wxTextValidatorStyle style) const + { return (m_validatorStyle & style) != 0; } - // Filter keystrokes - void OnChar(wxKeyEvent& event); +protected: + + // returns true if all characters of the given string are present in m_includes + bool ContainsOnlyIncludedCharacters(const wxString& val) const; + + // returns true if at least one character of the given string is present in m_excludes + bool ContainsExcludedCharacters(const wxString& val) const; -DECLARE_EVENT_TABLE() + // returns the error message if the contents of 'val' are invalid + virtual wxString IsValid(const wxString& val) const; protected: - long m_validatorStyle; - wxString * m_stringValue; - wxArrayString m_includes; - wxArrayString m_excludes; + long 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