X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/36afbc42f89854985c77caed2922be038c4d0d01..26e422a9adf74e0744a83f2647de4714f13786d3:/samples/wizard/wizard.cpp diff --git a/samples/wizard/wizard.cpp b/samples/wizard/wizard.cpp index 6446873f84..22de882986 100644 --- a/samples/wizard/wizard.cpp +++ b/samples/wizard/wizard.cpp @@ -26,6 +26,7 @@ // for all others, include the necessary headers #ifndef WX_PRECOMP + #include "wx/frame.h" #include "wx/stattext.h" #include "wx/log.h" #include "wx/app.h" @@ -51,6 +52,7 @@ enum { Wizard_Quit = wxID_EXIT, Wizard_RunModal = wxID_HIGHEST, + Wizard_RunNoSizer, Wizard_RunModeless, Wizard_About = wxID_ABOUT }; @@ -67,7 +69,6 @@ public: virtual bool OnInit(); }; -class MyWizard; class MyFrame : public wxFrame { public: @@ -78,17 +79,14 @@ public: void OnQuit(wxCommandEvent& event); void OnAbout(wxCommandEvent& event); void OnRunWizard(wxCommandEvent& event); + void OnRunWizardNoSizer(wxCommandEvent& event); + void OnRunWizardModeless(wxCommandEvent& event); void OnWizardCancel(wxWizardEvent& event); void OnWizardFinished(wxWizardEvent& event); - // Only required for modeless wizards, to implement destruction; - // if using modal wizards, you can rely on the default behaviour. - void OnCancel(wxCommandEvent& event); private: // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() - - MyWizard* m_wizard; }; // ---------------------------------------------------------------------------- @@ -98,16 +96,12 @@ private: class MyWizard : public wxWizard { public: - MyWizard(wxFrame *frame); - - void RunIt(bool modal); + MyWizard(wxFrame *frame, bool useSizer = true); - // Is the wizard being invoked modally? - bool GetModalWizard() const { return m_isModal; } + wxWizardPage *GetFirstPage() const { return m_page1; } private: wxWizardPageSimple *m_page1; - bool m_isModal; }; // ---------------------------------------------------------------------------- @@ -275,14 +269,27 @@ public: #if wxUSE_CHECKLISTBOX static const wxChar *aszChoices[] = - { _T("Zeroth"), _T("First"), _T("Second"), _T("Third"), _T("Fourth"), _T("Fifth"), _T("Sixth"), _T("Seventh"), _T("Eighth"), _T("Nineth") }; - wxString *astrChoices = new wxString[WXSIZEOF(aszChoices)]; - unsigned int ui; - for ( ui = 0; ui < WXSIZEOF(aszChoices); ui++ ) - astrChoices[ui] = aszChoices[ui]; - - m_checklistbox = new wxCheckListBox(this, wxID_ANY, wxDefaultPosition, wxSize(100,100), - WXSIZEOF(aszChoices), astrChoices); + { + _T("Zeroth"), + _T("First"), + _T("Second"), + _T("Third"), + _T("Fourth"), + _T("Fifth"), + _T("Sixth"), + _T("Seventh"), + _T("Eighth"), + _T("Nineth") + }; + + m_checklistbox = new wxCheckListBox + ( + this, + wxID_ANY, + wxDefaultPosition, + wxSize(100,100), + wxArrayString(WXSIZEOF(aszChoices), aszChoices) + ); mainSizer->Add( m_checklistbox, @@ -325,12 +332,11 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Wizard_Quit, MyFrame::OnQuit) EVT_MENU(Wizard_About, MyFrame::OnAbout) EVT_MENU(Wizard_RunModal, MyFrame::OnRunWizard) - EVT_MENU(Wizard_RunModeless, MyFrame::OnRunWizard) + EVT_MENU(Wizard_RunNoSizer, MyFrame::OnRunWizardNoSizer) + EVT_MENU(Wizard_RunModeless, MyFrame::OnRunWizardModeless) EVT_WIZARD_CANCEL(wxID_ANY, MyFrame::OnWizardCancel) EVT_WIZARD_FINISHED(wxID_ANY, MyFrame::OnWizardFinished) - - EVT_BUTTON(wxID_CANCEL, MyFrame::OnCancel) END_EVENT_TABLE() BEGIN_EVENT_TABLE(wxRadioboxPage, wxWizardPageSimple) @@ -360,14 +366,12 @@ bool MyApp::OnInit() // ---------------------------------------------------------------------------- // MyWizard // ---------------------------------------------------------------------------- - -MyWizard::MyWizard(wxFrame *frame) - :wxWizard(frame,wxID_ANY,_T("Absolutely Useless Wizard"), + +MyWizard::MyWizard(wxFrame *frame, bool useSizer) + : wxWizard(frame,wxID_ANY,_T("Absolutely Useless Wizard"), wxBitmap(wiztest_xpm),wxDefaultPosition, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { - m_isModal = false; - // a wizard page may be either an object of predefined class m_page1 = new wxWizardPageSimple(this); @@ -392,27 +396,10 @@ MyWizard::MyWizard(wxFrame *frame) m_page1->SetNext(page2); page3->SetPrev(page2); - // allow the wizard to size itself around the pages - GetPageAreaSizer()->Add(m_page1); -} - -void MyWizard::RunIt(bool modal) -{ - m_isModal = modal; - if ( modal ) - { - if ( RunWizard(m_page1) ) - { - // Success - } - - Destroy(); - } - else + if ( useSizer ) { - FinishLayout(); - ShowPage(m_page1); - Show(true); + // allow the wizard to size itself around the pages + GetPageAreaSizer()->Add(m_page1); } } @@ -424,11 +411,10 @@ MyFrame::MyFrame(const wxString& title) :wxFrame((wxFrame *)NULL, wxID_ANY, title, wxDefaultPosition, wxSize(250, 150)) // small frame { - m_wizard = NULL; - wxMenu *menuFile = new wxMenu; menuFile->Append(Wizard_RunModal, _T("&Run wizard modal...\tCtrl-R")); - menuFile->Append(Wizard_RunModeless, _T("&Run wizard modeless...")); + menuFile->Append(Wizard_RunNoSizer, _T("Run wizard &without sizer...")); + menuFile->Append(Wizard_RunModeless, _T("Run wizard &modeless...")); menuFile->AppendSeparator(); menuFile->Append(Wizard_Quit, _T("E&xit\tAlt-X"), _T("Quit this program")); @@ -462,36 +448,33 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) _T("About wxWizard sample"), wxOK | wxICON_INFORMATION, this); } -void MyFrame::OnRunWizard(wxCommandEvent& event) +void MyFrame::OnRunWizard(wxCommandEvent& WXUNUSED(event)) { - m_wizard = new MyWizard(this); + MyWizard wizard(this); - m_wizard->RunIt( event.GetId() == Wizard_RunModal ); + wizard.RunWizard(wizard.GetFirstPage()); } -void MyFrame::OnWizardFinished(wxWizardEvent& WXUNUSED(event)) +void MyFrame::OnRunWizardNoSizer(wxCommandEvent& WXUNUSED(event)) { - if (!m_wizard->GetModalWizard()) - m_wizard->Destroy(); - m_wizard = NULL; + MyWizard wizard(this, false); - wxMessageBox(wxT("The wizard finished successfully."), wxT("Wizard notification")); + wizard.RunWizard(wizard.GetFirstPage()); } -void MyFrame::OnWizardCancel(wxWizardEvent& WXUNUSED(event)) +void MyFrame::OnRunWizardModeless(wxCommandEvent& WXUNUSED(event)) { - wxMessageBox(wxT("The wizard was cancelled."), wxT("Wizard notification")); + MyWizard *wizard = new MyWizard(this); + wizard->ShowPage(wizard->GetFirstPage()); + wizard->Show(true); } -void MyFrame::OnCancel(wxCommandEvent& WXUNUSED(event)) +void MyFrame::OnWizardFinished(wxWizardEvent& WXUNUSED(event)) { - // Destroy a modeless wizard here - we can't destroy it in OnWizardCancel - // since the wxWizard object is still in use when that event is sent. - - if (!m_wizard->GetModalWizard()) - m_wizard->Destroy(); - else - m_wizard->EndModal(wxID_CANCEL); - - m_wizard = NULL; + wxMessageBox(wxT("The wizard finished successfully."), wxT("Wizard notification")); +} + +void MyFrame::OnWizardCancel(wxWizardEvent& WXUNUSED(event)) +{ + wxMessageBox(wxT("The wizard was cancelled."), wxT("Wizard notification")); }