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

due to a typo in #if condition, validation was disabled for wizard pages -- fixed now

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-08-04 00:22:47 +00:00
parent 39de6d6ca1
commit 25e6c06102
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/wx/wizard.h
View File

@@ -76,21 +76,28 @@ public:
// wxNullBitmap from here - the default one will be used then. // wxNullBitmap from here - the default one will be used then.
virtual wxBitmap GetBitmap() const { return m_bitmap; } virtual wxBitmap GetBitmap() const { return m_bitmap; }
#if wxUSE_VALIDATOR // due to a typo in #if condition, the validation functions were disabled
/// Override the base functions to allow a validator to be assigned to this page. // in 2.6.[01] releases so check for wxABI_VERSION here
bool TransferDataToWindow() #if wxUSE_VALIDATORS && (wxABI_VERSION >= 20602)
// Override the base functions to allow a validator to be assigned to this page.
virtual bool TransferDataToWindow()
{ {
return GetValidator() ? GetValidator()->TransferToWindow() : wxPanel::TransferDataToWindow(); return GetValidator() ? GetValidator()->TransferToWindow()
: wxPanel::TransferDataToWindow();
} }
bool TransferDataFromWindow()
virtual bool TransferDataFromWindow()
{ {
return GetValidator() ? GetValidator()->TransferFromWindow() : wxPanel::TransferDataFromWindow(); return GetValidator() ? GetValidator()->TransferFromWindow()
: wxPanel::TransferDataFromWindow();
} }
bool Validate()
virtual bool Validate()
{ {
return GetValidator() ? GetValidator()->Validate(this) : wxPanel::Validate(); return GetValidator() ? GetValidator()->Validate(this)
: wxPanel::Validate();
} }
#endif // wxUSE_VALIDATOR #endif // wxUSE_VALIDATORS
protected: protected:
// common part of ctors: // common part of ctors:

3
version-script.in
View File

@@ -50,6 +50,9 @@
*wxVectorBase*size*; *wxVectorBase*size*;
*wxVectorBase*wxVectorBase*; *wxVectorBase*wxVectorBase*;
*wxWizard*FinishLayout*; *wxWizard*FinishLayout*;
*wxWizardPage*TransferDataFromWindow*;
*wxWizardPage*TransferDataToWindow*;
*wxWizardPage*Validate*;
*wxXmlResource*ConvertFileNameToURL*wxString*; *wxXmlResource*ConvertFileNameToURL*wxString*;
*wxXmlResource*IsArchive*wxString*; *wxXmlResource*IsArchive*wxString*;
*wxXmlResource*Unload*wxString*; *wxXmlResource*Unload*wxString*;