X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a0a48a3f0d4c0478177c4668ba8d4aab9ba9b426..185d0094f891202d7de486ad5a295a8fe88b84a7:/src/generic/wizard.cpp

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index fba5373b09..8e88e0aa98 100644
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -57,10 +57,13 @@ WX_DEFINE_ARRAY(wxPanel *, wxArrayPages);
 DEFINE_EVENT_TYPE(wxEVT_WIZARD_PAGE_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_WIZARD_PAGE_CHANGING)
 DEFINE_EVENT_TYPE(wxEVT_WIZARD_CANCEL)
+DEFINE_EVENT_TYPE(wxEVT_WIZARD_HELP)
 
 BEGIN_EVENT_TABLE(wxWizard, wxDialog)
     EVT_BUTTON(wxID_CANCEL, wxWizard::OnCancel)
-    EVT_BUTTON(-1, wxWizard::OnBackOrNext)
+    EVT_BUTTON(wxID_BACKWARD, wxWizard::OnBackOrNext)
+    EVT_BUTTON(wxID_FORWARD, wxWizard::OnBackOrNext)
+    EVT_BUTTON(wxID_HELP, wxWizard::OnHelp)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxWizard, wxDialog)
@@ -83,10 +86,12 @@ wxWizardPage::wxWizardPage(wxWizard *parent,
 {
     if ( resource != NULL )
     {
+#if wxUSE_RESOURCES
         if ( !LoadFromResource(this, resource) )
         {
             wxFAIL_MSG(wxT("wxWizardPage LoadFromResource failed!!!!"));
         }
+#endif // wxUSE_RESOURCES
     }
 
     m_PageBitmap = bitmap;
@@ -261,9 +266,19 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     // button or not (initially the label is "Next")
     bool btnLabelWasNext = TRUE;
 
-    // and this tells us whether we already had the default bitmap before
-    int bmpWasDefault;
+    // Modified 10-20-2001 Robert Cavanaugh.
+    // Fixed bug for displaying a new bitmap
+    // in each *consecutive* page
 
+    // flag to indicate if this page uses a new bitmap
+    bool bmpIsDefault = TRUE;
+
+    // use these labels to determine if we need to change the bitmap
+    // for this page
+    wxBitmap   PreviousBitmap = wxNullBitmap;
+    wxBitmap   ThisBitmap = wxNullBitmap;
+
+    // check for previous page
     if ( m_page )
     {
         // send the event to the old page
@@ -278,15 +293,15 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
         m_page->Hide();
 
         btnLabelWasNext = m_page->GetNext() != (wxWizardPage *)NULL;
-        bmpWasDefault = !m_page->GetBitmap().Ok();
-    }
-    else // no previous page
+
+        // Get the bitmap of the previous page (if it exists)
+        if(m_page->GetBitmap().Ok())
     {
-        // always set the bitmap
-        bmpWasDefault = -1;
+            PreviousBitmap = m_page->GetBitmap();
+        }
     }
 
-    // set the new one
+    // set the new page
     m_page = page;
 
     // is this the end?
@@ -294,11 +309,10 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     {
         // terminate successfully
         EndModal(wxID_OK);
-
         return TRUE;
     }
 
-    // send the event to the new page now
+    // send the change event to the new page now
     wxWizardEvent event(wxEVT_WIZARD_PAGE_CHANGED, GetId(), goingForward);
     (void)m_page->GetEventHandler()->ProcessEvent(event);
 
@@ -307,9 +321,19 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     m_page->SetSize(m_x, m_y, m_width, m_height);
     m_page->Show();
 
-    // change the bitmap if necessary (and if we have it at all)
-    int bmpIsDefault = !m_page->GetBitmap().Ok();
-    if ( m_statbmp && (bmpIsDefault != bmpWasDefault) )
+    // check if bitmap needs to be updated
+    // update default flag as well
+    if(m_page->GetBitmap().Ok())
+    {
+        ThisBitmap = m_page->GetBitmap();
+        bmpIsDefault = FALSE;
+    }
+
+    // change the bitmap if:
+    // 1) a default bitmap was selected in constructor
+    // 2) this page was constructed with a bitmap
+    // 3) this bitmap is not the previous bitmap
+    if( m_statbmp && (ThisBitmap != PreviousBitmap) )
     {
         wxBitmap bmp;
         if ( bmpIsDefault )
@@ -410,6 +434,21 @@ void wxWizard::OnBackOrNext(wxCommandEvent& event)
     (void)ShowPage(page, forward);
 }
 
+void wxWizard::OnHelp(wxCommandEvent& WXUNUSED(event))
+{
+    // this function probably can never be called when we don't have an active
+    // page, but a small extra check won't hurt
+    if(m_page != NULL)
+    {
+        // Create and send the help event to the specific page handler
+        // event data contains the active page so that context-sensitive
+        // help is possible
+        wxWizardEvent eventHelp(wxEVT_WIZARD_HELP, GetId(), TRUE, m_page);
+        (void)m_page->GetEventHandler()->ProcessEvent(eventHelp);
+    }
+}
+
+
 // ----------------------------------------------------------------------------
 // our public interface
 // ----------------------------------------------------------------------------
@@ -429,10 +468,13 @@ wxWizard *wxWizardBase::Create(wxWindow *parent,
 // wxWizardEvent
 // ----------------------------------------------------------------------------
 
-wxWizardEvent::wxWizardEvent(wxEventType type, int id, bool direction)
+wxWizardEvent::wxWizardEvent(wxEventType type, int id, bool direction, wxWizardPage* page)
              : wxNotifyEvent(type, id)
 {
+    // Modified 10-20-2001 Robert Cavanaugh
+    // add the active page to the event data
     m_direction = direction;
+    m_page = page;
 }
 
 #endif // wxUSE_WIZARDDLG