X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7f3bf33a5988cdc9a549e1864589de3eb9313bd8..654c223bc7c5457e407ff7d127a8129c821b07e4:/src/generic/wizard.cpp?ds=sidebyside diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp index 03b398e03f..664a282443 100644 --- a/src/generic/wizard.cpp +++ b/src/generic/wizard.cpp @@ -81,11 +81,11 @@ private: // event tables and such // ---------------------------------------------------------------------------- -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_FINISHED) -DEFINE_EVENT_TYPE(wxEVT_WIZARD_HELP) +wxDEFINE_EVENT( wxEVT_WIZARD_PAGE_CHANGED, wxWizardEvent ) +wxDEFINE_EVENT( wxEVT_WIZARD_PAGE_CHANGING, wxWizardEvent ) +wxDEFINE_EVENT( wxEVT_WIZARD_CANCEL, wxWizardEvent ) +wxDEFINE_EVENT( wxEVT_WIZARD_FINISHED, wxWizardEvent ) +wxDEFINE_EVENT( wxEVT_WIZARD_HELP, wxWizardEvent ) BEGIN_EVENT_TABLE(wxWizard, wxDialog) EVT_BUTTON(wxID_CANCEL, wxWizard::OnCancel) @@ -289,7 +289,7 @@ wxSize wxWizardSizer::SiblingSize(wxSizerItem *child) void wxWizard::Init() { m_posWizard = wxDefaultPosition; - m_page = (wxWizardPage *)NULL; + m_page = NULL; m_btnPrev = m_btnNext = NULL; m_statbmp = NULL; m_sizerBmpAndPage = NULL;