X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3ee583347463a8a85fbdecacdfff6ede1b059bd3..b8ddac49a37a01ca1cf89f97dc97c4945b50ddab:/src/generic/wizard.cpp diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp index c57773d6ce..aef2a89210 100644 --- a/src/generic/wizard.cpp +++ b/src/generic/wizard.cpp @@ -329,7 +329,7 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) if ( m_page ) { // send the event to the old page - wxWizardEvent event(wxEVT_WIZARD_PAGE_CHANGING, GetId(), goingForward); + wxWizardEvent event(wxEVT_WIZARD_PAGE_CHANGING, GetId(), goingForward, m_page); if ( m_page->GetEventHandler()->ProcessEvent(event) && !event.IsAllowed() ) { @@ -400,7 +400,7 @@ 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); + wxWizardEvent event(wxEVT_WIZARD_PAGE_CHANGED, GetId(), goingForward, m_page); (void)m_page->GetEventHandler()->ProcessEvent(event); // and finally show it @@ -442,7 +442,7 @@ void wxWizard::OnCancel(wxCommandEvent& WXUNUSED(event)) // page, but a small extra check won't hurt wxWindow *win = m_page ? (wxWindow *)m_page : (wxWindow *)this; - wxWizardEvent event(wxEVT_WIZARD_CANCEL, GetId()); + wxWizardEvent event(wxEVT_WIZARD_CANCEL, GetId(), FALSE, m_page); if ( !win->GetEventHandler()->ProcessEvent(event) || event.IsAllowed() ) { // no objections - close the dialog @@ -520,6 +520,8 @@ void wxWizard::OnWizEvent(wxWizardEvent& event) // our public interface // ---------------------------------------------------------------------------- +#ifdef WXWIN_COMPATIBILITY_2_2 + /* static */ wxWizard *wxWizardBase::Create(wxWindow *parent, int id, @@ -531,6 +533,8 @@ wxWizard *wxWizardBase::Create(wxWindow *parent, return new wxWizard(parent, id, title, bitmap, pos); } +#endif // WXWIN_COMPATIBILITY_2_2 + // ---------------------------------------------------------------------------- // wxWizardEvent // ----------------------------------------------------------------------------