Don't do the wx cleanup if wxPython didn't do the initialization.

[wxWidgets.git] / src / generic / wizard.cpp

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index 334c5859a5e5711d649cbaca9b44d7acb7ce5f68..ec746149a314899bd70db5301e2ce5056afab5e1 100644 (file)
--- 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;