AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

backwards incompatible change to wxWizardPage reverted

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-11-20 17:23:58 +00:00
parent a9fd2e6f1b
commit 636d266b89
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/wizard.h
View File

@ -63,10 +63,10 @@ public:
// cases - override this method if you want to create the bitmap to be used // cases - override this method if you want to create the bitmap to be used
// dynamically or to do something even more fancy. It's ok to return // dynamically or to do something even more fancy. It's ok to return
// 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_PageBitmap; } virtual wxBitmap GetBitmap() const { return m_bitmap; }
protected: protected:
wxBitmap m_PageBitmap; wxBitmap m_bitmap;
private: private:
DECLARE_ABSTRACT_CLASS(wxWizardPage) DECLARE_ABSTRACT_CLASS(wxWizardPage)

3
src/generic/wizard.cpp
View File

@ -94,7 +94,7 @@ wxWizardPage::wxWizardPage(wxWizard *parent,
#endif // wxUSE_RESOURCES #endif // wxUSE_RESOURCES
} }
m_PageBitmap = bitmap; m_bitmap = bitmap;
// initially the page is hidden, it's shown only when it becomes current // initially the page is hidden, it's shown only when it becomes current
Hide(); Hide();
@ -133,6 +133,7 @@ bool wxWizard::Create(wxWindow *parent,
{ {
m_posWizard = pos; m_posWizard = pos;
m_bitmap = bitmap ; m_bitmap = bitmap ;
// just create the dialog itself here, the controls will be created in // just create the dialog itself here, the controls will be created in
// DoCreateControls() called later when we know our final size // DoCreateControls() called later when we know our final size
m_page = (wxWizardPage *)NULL; m_page = (wxWizardPage *)NULL;