X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7cc5041d03515c7f749638a9af9cca46c0918dde..2d956b58023a4955313a1c1531bc70a0deb0b831:/src/generic/wizard.cpp diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp index 334c5859a5..ec746149a3 100644 --- a/src/generic/wizard.cpp +++ b/src/generic/wizard.cpp @@ -86,13 +86,15 @@ wxWizardPage::wxWizardPage(wxWizard *parent, { if ( resource != NULL ) { +#if wxUSE_WX_RESOURCES if ( !LoadFromResource(this, resource) ) { wxFAIL_MSG(wxT("wxWizardPage LoadFromResource failed!!!!")); } +#endif // wxUSE_RESOURCES } - m_PageBitmap = bitmap; + m_bitmap = bitmap; // initially the page is hidden, it's shown only when it becomes current Hide(); @@ -131,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;