From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 13 Oct 2010 22:10:39 +0000 (+0000)
Subject: Pass last page in wxEVT_WIZARD_FINISHED event.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/71d6cd60ee7ccdb5a1275eebbc19107a8c865a9b

Pass last page in wxEVT_WIZARD_FINISHED event.

Delay resetting the wizard page to NULL when it terminates to allow
wxEVT_WIZARD_FINISHED event to carry the correct pointer to the last page.

Closes #12537.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index fb34ae6511..1b40923001 100644
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -563,11 +563,8 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
             m_sizerBmpAndPage->Detach(m_page);
     }
 
-    // set the new page
-    m_page = page;
-
     // is this the end?
-    if ( !m_page )
+    if ( !page )
     {
         // terminate successfully
         if ( IsModal() )
@@ -582,12 +579,18 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
 
         // and notify the user code (this is especially useful for modeless
         // wizards)
-        wxWizardEvent event(wxEVT_WIZARD_FINISHED, GetId(), false, 0);
+        wxWizardEvent event(wxEVT_WIZARD_FINISHED, GetId(), false, m_page);
         (void)GetEventHandler()->ProcessEvent(event);
 
+        m_page = NULL;
+
         return true;
     }
 
+    // notice that we change m_page only here so that wxEVT_WIZARD_FINISHED
+    // event above could still use the correct (i.e. old) value of m_page
+    m_page = page;
+
     // position and show the new page
     (void)m_page->TransferDataToWindow();