From 636d266b8993dd831aa47bdd7e673be32166b54a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 20 Nov 2001 17:23:58 +0000 Subject: [PATCH] backwards incompatible change to wxWizardPage reverted git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/wizard.h | 4 ++-- src/generic/wizard.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/wx/wizard.h b/include/wx/wizard.h index 05c3842f1b..77289c2d19 100644 --- a/include/wx/wizard.h +++ b/include/wx/wizard.h @@ -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) diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp index 8e88e0aa98..eed6e10755 100644 --- a/src/generic/wizard.cpp +++ b/src/generic/wizard.cpp @@ -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; -- 2.47.2