backwards incompatible change to wxWizardPage reverted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
a9fd2e6f1b
commit
636d266b89
@ -63,10 +63,10 @@ public:
|
||||
// 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
|
||||
// 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:
|
||||
wxBitmap m_PageBitmap;
|
||||
wxBitmap m_bitmap;
|
||||
|
||||
private:
|
||||
DECLARE_ABSTRACT_CLASS(wxWizardPage)
|
||||
|
@ -94,7 +94,7 @@ wxWizardPage::wxWizardPage(wxWizard *parent,
|
||||
#endif // wxUSE_RESOURCES
|
||||
}
|
||||
|
||||
m_PageBitmap = bitmap;
|
||||
m_bitmap = bitmap;
|
||||
|
||||
// initially the page is hidden, it's shown only when it becomes current
|
||||
Hide();
|
||||
@ -133,6 +133,7 @@ bool wxWizard::Create(wxWindow *parent,
|
||||
{
|
||||
m_posWizard = pos;
|
||||
m_bitmap = bitmap ;
|
||||
|
||||
// just create the dialog itself here, the controls will be created in
|
||||
// DoCreateControls() called later when we know our final size
|
||||
m_page = (wxWizardPage *)NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user