X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92b929f0e18c5d17498ea0821eaaf5b2b8aeed04..789e9abb4527c87ff4503f252c925d247b2480a1:/samples/wizard/wizard.cpp diff --git a/samples/wizard/wizard.cpp b/samples/wizard/wizard.cpp index 1d9427753d..215f686f85 100644 --- a/samples/wizard/wizard.cpp +++ b/samples/wizard/wizard.cpp @@ -389,7 +389,7 @@ MyWizard::MyWizard(wxFrame *frame, bool useSizer) Create(frame,wxID_ANY,wxT("Absolutely Useless Wizard"), wxBitmap(wiztest_xpm),wxDefaultPosition, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER); - SetIcon(wxIcon(sample_xpm)); + SetIcon(wxICON(sample)); // Allow the bitmap to be expanded to fit the page height if (frame->GetMenuBar()->IsChecked(Wizard_ExpandBitmap)) @@ -414,8 +414,10 @@ MyWizard::MyWizard(wxFrame *frame, bool useSizer) wxValidationPage *page4 = new wxValidationPage(this); // set the page order using a convenience function - could also use - // SetNext/Prev directly as below - wxWizardPageSimple::Chain(page3, page4); + // SetNext/Prev directly as below, but Chain() is shorter, avoids the risk + // of an error and can itself be chained, e.g. you could write + // page3.Chain(page4).Chain(page5) and so on. + page3->Chain(page4); // this page is not a wxWizardPageSimple, so we use SetNext/Prev to insert // it into the chain of pages @@ -450,7 +452,7 @@ MyFrame::MyFrame(const wxString& title) menuOptions->AppendCheckItem(Wizard_ExpandBitmap, wxT("Si&ze Bitmap To Page")); wxMenu *helpMenu = new wxMenu; - helpMenu->Append(Wizard_About, wxT("&About...\tF1"), wxT("Show about dialog")); + helpMenu->Append(Wizard_About, wxT("&About\tF1"), wxT("Show about dialog")); // now append the freshly created menu to the menu bar... wxMenuBar *menuBar = new wxMenuBar();