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
This commit is contained in:
@@ -359,15 +359,9 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
|
|||||||
return TRUE;
|
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
|
// position and show the new page
|
||||||
(void)m_page->TransferDataToWindow();
|
(void)m_page->TransferDataToWindow();
|
||||||
m_page->SetSize(m_x, m_y, m_width, m_height);
|
m_page->SetSize(m_x, m_y, m_width, m_height);
|
||||||
m_page->Show();
|
|
||||||
m_page->SetFocus();
|
|
||||||
|
|
||||||
// check if bitmap needs to be updated
|
// check if bitmap needs to be updated
|
||||||
// update default flag as well
|
// update default flag as well
|
||||||
@@ -405,6 +399,14 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
|
|||||||
}
|
}
|
||||||
// nothing to do: the label was already correct
|
// 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;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user