X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88ac883a0d005437c97a60d8195bd5e4719b1154..82df67d960355e99a66b1db473b9d6236bf2fbb9:/include/wx/valtext.h diff --git a/include/wx/valtext.h b/include/wx/valtext.h index 391ed8dfb2..c879505abc 100644 --- a/include/wx/valtext.h +++ b/include/wx/valtext.h @@ -16,10 +16,11 @@ #pragma interface "valtext.h" #endif -#if defined(wxUSE_VALIDATORS) && !wxUSE_VALIDATORS - #error "wxWindows is compiled without support for wxValidator" -#endif +#include "wx/defs.h" + +#if wxUSE_VALIDATORS +#include "wx/textctrl.h" #include "wx/validate.h" #define wxFILTER_NONE 0x0000 @@ -29,45 +30,51 @@ #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 class WXDLLEXPORT wxTextValidator: public wxValidator { DECLARE_DYNAMIC_CLASS(wxTextValidator) public: - wxTextValidator(long style = wxFILTER_NONE, wxString *val = (wxString *) NULL); - wxTextValidator(const wxTextValidator& val); - ~wxTextValidator(); + wxTextValidator(long style = wxFILTER_NONE, wxString *val = 0); + wxTextValidator(const wxTextValidator& val); + + ~wxTextValidator(); + + // Make a clone of this validator (or return NULL) - currently necessary + // if you're passing a reference to a validator. + // Another possibility is to always pass a pointer to a new validator + // (so the calling code can use a copy constructor of the relevant class). + virtual wxObject *Clone() const { return new wxTextValidator(*this); } + bool Copy(const wxTextValidator& val); - // Make a clone of this validator (or return NULL) - currently necessary - // if you're passing a reference to a validator. - // Another possibility is to always pass a pointer to a new validator - // (so the calling code can use a copy constructor of the relevant class). - virtual wxObject *Clone(void) const { return new wxTextValidator(*this); } - bool Copy(const wxTextValidator& val); + // Called when the value in the window must be validated. + // This function can pop up an error message. + virtual bool Validate(wxWindow *parent); - // Called when the value in the window must be validated. - // This function can pop up an error message. - virtual bool Validate(wxWindow *parent); + // Called to transfer data to the window + virtual bool TransferToWindow(); - // Called to transfer data to the window - virtual bool TransferToWindow(void); + // Called to transfer data to the window + virtual bool TransferFromWindow(); - // Called to transfer data to the window - virtual bool TransferFromWindow(void); + // ACCESSORS + inline long GetStyle() const { return m_validatorStyle; } + inline void SetStyle(long style) { m_validatorStyle = style; } - // ACCESSORS - inline long GetStyle(void) const { return m_validatorStyle; } - inline void SetStyle(long style) { m_validatorStyle = style; } + void SetIncludeList(const wxStringList& list); + inline wxStringList& GetIncludeList() { return m_includeList; } - void SetIncludeList(const wxStringList& list); - inline wxStringList& GetIncludeList(void) { return m_includeList; } + void SetExcludeList(const wxStringList& list); + inline wxStringList& GetExcludeList() { return m_excludeList; } - void SetExcludeList(const wxStringList& list); - inline wxStringList& GetExcludeList(void) { return m_excludeList; } + // Filter keystrokes + void OnChar(wxKeyEvent& event); - // Filter keystrokes - void OnChar(wxKeyEvent& event); + bool IsInCharIncludeList(const wxString& val); + bool IsNotInCharExcludeList(const wxString& val); DECLARE_EVENT_TABLE() @@ -76,6 +83,22 @@ protected: wxString * m_stringValue; wxStringList m_includeList; wxStringList m_excludeList; + + bool CheckValidator() const + { + wxCHECK_MSG( m_validatorWindow, FALSE, + _T("No window associated with validator") ); + wxCHECK_MSG( m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)), FALSE, + _T("wxTextValidator is only for wxTextCtrl's") ); + wxCHECK_MSG( m_stringValue, FALSE, + _T("No variable storage for validator") ); + + return TRUE; + } }; #endif + // wxUSE_VALIDATORS + +#endif + // _WX_VALTEXTH__