Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added slightly more informative failure reporting.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2001-12-24 12:12:30 +00:00
parent 9d155f504e
commit 33c5b54b68
2 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
include/wx/valtext.h
View File

@@ -34,40 +34,41 @@ class WXDLLEXPORT wxTextValidator: public wxValidator
{ {
DECLARE_DYNAMIC_CLASS(wxTextValidator) DECLARE_DYNAMIC_CLASS(wxTextValidator)
public: 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);
// Make a clone of this validator (or return NULL) - currently necessary ~wxTextValidator();
// 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. // Make a clone of this validator (or return NULL) - currently necessary
// This function can pop up an error message. // if you're passing a reference to a validator.
virtual bool Validate(wxWindow *parent); // 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);
// Called to transfer data to the window // Called when the value in the window must be validated.
virtual bool TransferToWindow(void); // This function can pop up an error message.
virtual bool Validate(wxWindow *parent);
// Called to transfer data to the window // Called to transfer data to the window
virtual bool TransferFromWindow(void); virtual bool TransferToWindow();
// ACCESSORS // Called to transfer data to the window
inline long GetStyle(void) const { return m_validatorStyle; } virtual bool TransferFromWindow();
inline void SetStyle(long style) { m_validatorStyle = style; }
void SetIncludeList(const wxStringList& list); // ACCESSORS
inline wxStringList& GetIncludeList(void) { return m_includeList; } inline long GetStyle() const { return m_validatorStyle; }
inline void SetStyle(long style) { m_validatorStyle = style; }
void SetExcludeList(const wxStringList& list); void SetIncludeList(const wxStringList& list);
inline wxStringList& GetExcludeList(void) { return m_excludeList; } inline wxStringList& GetIncludeList() { return m_includeList; }
// Filter keystrokes void SetExcludeList(const wxStringList& list);
void OnChar(wxKeyEvent& event); inline wxStringList& GetExcludeList() { return m_excludeList; }
// Filter keystrokes
void OnChar(wxKeyEvent& event);
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
@@ -76,6 +77,18 @@ protected:
wxString * m_stringValue; wxString * m_stringValue;
wxStringList m_includeList; wxStringList m_includeList;
wxStringList m_excludeList; 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 #endif

18
src/common/valtext.cpp
View File

@@ -119,11 +119,7 @@ static bool wxIsAlphaNumeric(const wxString& val)
// This function can pop up an error message. // This function can pop up an error message.
bool wxTextValidator::Validate(wxWindow *parent) bool wxTextValidator::Validate(wxWindow *parent)
{ {
if ( !m_validatorWindow ) if( !CheckValidator() )
return FALSE;
if ( !m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
return FALSE;
if ( !m_stringValue )
return FALSE; return FALSE;
wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ; wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
@@ -195,11 +191,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
// Called to transfer data to the window // Called to transfer data to the window
bool wxTextValidator::TransferToWindow(void) bool wxTextValidator::TransferToWindow(void)
{ {
if ( !m_validatorWindow ) if( !CheckValidator() )
return FALSE;
if ( !m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
return FALSE;
if ( !m_stringValue )
return FALSE; return FALSE;
wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ; wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
@@ -211,11 +203,7 @@ bool wxTextValidator::TransferToWindow(void)
// Called to transfer data to the window // Called to transfer data to the window
bool wxTextValidator::TransferFromWindow(void) bool wxTextValidator::TransferFromWindow(void)
{ {
if ( !m_validatorWindow ) if( !CheckValidator() )
return FALSE;
if ( !m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
return FALSE;
if ( !m_stringValue )
return FALSE; return FALSE;
wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ; wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;