wxUniv compilation fixes (patch 559620)

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

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index 8e88e0aa9831c14bc7e026990b8a0cca6d76d184..325ff9974c93bdcbcf9f9e3da182b15b16321700 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -21,7 +21,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

-    #pragma implementation ".h"
+    #pragma implementation "wizardg.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -64,6 +64,11 @@ BEGIN_EVENT_TABLE(wxWizard, wxDialog)
     EVT_BUTTON(wxID_BACKWARD, wxWizard::OnBackOrNext)
     EVT_BUTTON(wxID_FORWARD, wxWizard::OnBackOrNext)
     EVT_BUTTON(wxID_HELP, wxWizard::OnHelp)
     EVT_BUTTON(wxID_BACKWARD, wxWizard::OnBackOrNext)
     EVT_BUTTON(wxID_FORWARD, wxWizard::OnBackOrNext)
     EVT_BUTTON(wxID_HELP, wxWizard::OnHelp)

+
+    EVT_WIZARD_PAGE_CHANGED(-1, wxWizard::OnWizEvent)
+    EVT_WIZARD_PAGE_CHANGING(-1, wxWizard::OnWizEvent)
+    EVT_WIZARD_CANCEL(-1, wxWizard::OnWizEvent)
+    EVT_WIZARD_HELP(-1, wxWizard::OnWizEvent)

 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxWizard, wxDialog)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxWizard, wxDialog)


@@ -79,14 +84,28 @@ IMPLEMENT_DYNAMIC_CLASS(wxWizardEvent, wxNotifyEvent)
 // wxWizardPage
 // ----------------------------------------------------------------------------
 
 // wxWizardPage
 // ----------------------------------------------------------------------------
 

+void wxWizardPage::Init()
+{
+    m_bitmap = wxNullBitmap;
+}
+

 wxWizardPage::wxWizardPage(wxWizard *parent,
                            const wxBitmap& bitmap,
                            const wxChar *resource)
 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 ( resource != NULL )
     {

-#if wxUSE_RESOURCES
+#if wxUSE_WX_RESOURCES

         if ( !LoadFromResource(this, resource) )
         {
             wxFAIL_MSG(wxT("wxWizardPage LoadFromResource failed!!!!"));
         if ( !LoadFromResource(this, resource) )
         {
             wxFAIL_MSG(wxT("wxWizardPage LoadFromResource failed!!!!"));


@@ -94,10 +113,12 @@ wxWizardPage::wxWizardPage(wxWizard *parent,
 #endif // wxUSE_RESOURCES
     }
 
 #endif // wxUSE_RESOURCES
     }
 

-    m_PageBitmap = bitmap;
+    m_bitmap = bitmap;

 
     // initially the page is hidden, it's shown only when it becomes current
     Hide();
 
     // initially the page is hidden, it's shown only when it becomes current
     Hide();

+
+    return TRUE;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -133,6 +154,7 @@ bool wxWizard::Create(wxWindow *parent,
 {
     m_posWizard = pos;
     m_bitmap = bitmap ;
 {
     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;
     // 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;


@@ -448,6 +470,23 @@ void wxWizard::OnHelp(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

+void wxWizard::OnWizEvent(wxWizardEvent& event)
+{
+    // the dialogs have wxWS_EX_BLOCK_EVENTS style on by default but we want to
+    // propagate wxEVT_WIZARD_XXX to the parent (if any), so do it manually
+    if ( !(GetExtraStyle() & wxWS_EX_BLOCK_EVENTS) )
+    {
+        // the event will be propagated anyhow
+        return;
+    }
+
+    wxWindow *parent = GetParent();
+
+    if ( !parent || !parent->GetEventHandler()->ProcessEvent(event) )
+    {
+        event.Skip();
+    }
+}

 
 // ----------------------------------------------------------------------------
 // our public interface
 
 // ----------------------------------------------------------------------------
 // our public interface