wxDirDialog now has the same ctor under all platforms and also uses the

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

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index eed6e10755973e8622f6eff18a0e8a8ae6a287e6..3d1654bef721f6813d723d2a48fbcff23cdfd134 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -79,14 +79,28 @@ IMPLEMENT_DYNAMIC_CLASS(wxWizardEvent, wxNotifyEvent)
 // wxWizardPage
 // ----------------------------------------------------------------------------
 
+void wxWizardPage::Init()
+{
+    m_bitmap = wxNullBitmap;
+}
+
 wxWizardPage::wxWizardPage(wxWizard *parent,
                            const wxBitmap& bitmap,
                            const wxChar *resource)
-            : wxPanel(parent)
 {
+    Create(parent, bitmap, resource);
+}
+    
+bool wxWizardPage::Create(wxWizard *parent,
+                          const wxBitmap& bitmap,
+                          const wxChar *resource)
+{
+    if ( !wxPanel::Create(parent, -1) )
+        return FALSE;
+
     if ( resource != NULL )
     {
-#if wxUSE_RESOURCES
+#if wxUSE_WX_RESOURCES
         if ( !LoadFromResource(this, resource) )
         {
             wxFAIL_MSG(wxT("wxWizardPage LoadFromResource failed!!!!"));
@@ -98,6 +112,8 @@ wxWizardPage::wxWizardPage(wxWizard *parent,
 
     // initially the page is hidden, it's shown only when it becomes current
     Hide();
+    
+    return TRUE;
 }
 
 // ----------------------------------------------------------------------------