allow overriding the default button labels in wxWizard

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

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index cd9c3152d040bef4799716d38e2f450ed28a9ca6..d7c6332f29e94dff1e89770777db82c792559ecd 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -359,15 +359,9 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
         return TRUE;
     }
 
-    // send the change event to the new page now
-    wxWizardEvent event(wxEVT_WIZARD_PAGE_CHANGED, GetId(), goingForward);
-    (void)m_page->GetEventHandler()->ProcessEvent(event);
-
     // position and show the new page
     (void)m_page->TransferDataToWindow();
     m_page->SetSize(m_x, m_y, m_width, m_height);
-    m_page->Show();
-    m_page->SetFocus();
 
     // check if bitmap needs to be updated
     // update default flag as well
@@ -405,6 +399,14 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     }
     // nothing to do: the label was already correct
 
+    // send the change event to the new page now
+    wxWizardEvent event(wxEVT_WIZARD_PAGE_CHANGED, GetId(), goingForward);
+    (void)m_page->GetEventHandler()->ProcessEvent(event);
+
+    // and finally show it
+    m_page->Show();
+    m_page->SetFocus();
+
     return TRUE;
 }