X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0078f87f4032e82b755dd47327154c4761dea7ee..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/valtext.h?ds=inline diff --git a/include/wx/valtext.h b/include/wx/valtext.h index c879505abc..5f85d95c27 100644 --- a/include/wx/valtext.h +++ b/include/wx/valtext.h @@ -6,21 +6,18 @@ // Created: 29/01/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Julian Smart -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_VALTEXTH__ -#define _WX_VALTEXTH__ - -#ifdef __GNUG__ -#pragma interface "valtext.h" -#endif +#ifndef _WX_VALTEXT_H_ +#define _WX_VALTEXT_H_ #include "wx/defs.h" -#if wxUSE_VALIDATORS +#if wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX) + +class WXDLLIMPEXP_FWD_CORE wxTextEntry; -#include "wx/textctrl.h" #include "wx/validate.h" #define wxFILTER_NONE 0x0000 @@ -41,7 +38,7 @@ public: wxTextValidator(long style = wxFILTER_NONE, wxString *val = 0); wxTextValidator(const wxTextValidator& val); - ~wxTextValidator(); + virtual ~wxTextValidator(){} // Make a clone of this validator (or return NULL) - currently necessary // if you're passing a reference to a validator. @@ -57,48 +54,45 @@ public: // Called to transfer data to the window virtual bool TransferToWindow(); - // Called to transfer data to the window + // Called to transfer data from the window virtual bool TransferFromWindow(); // ACCESSORS 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; } + wxTextEntry *GetTextEntry(); - void SetExcludeList(const wxStringList& list); - inline wxStringList& GetExcludeList() { return m_excludeList; } + 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; - 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; - } + 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&); }; #endif - // wxUSE_VALIDATORS + // wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX) -#endif - // _WX_VALTEXTH__ +#endif // _WX_VALTEXT_H_