moved MGL initialization to earlier stage (crashes otherwise...) and implemented...

[wxWidgets.git] / samples / wizard / wizard.cpp

diff --git a/samples/wizard/wizard.cpp b/samples/wizard/wizard.cpp
index 52cd4939835307572f23190d7aeb99fc076d9e9b..6e54020f4008505688ecd320d141538d15d91159 100644 (file)
--- a/samples/wizard/wizard.cpp
+++ b/samples/wizard/wizard.cpp
@@ -313,18 +313,18 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnRunWizard(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnRunWizard(wxCommandEvent& WXUNUSED(event))
 {

-    wxWizard *wizard = wxWizard::Create(this, -1,
-                                        "Absolutely Useless Wizard",
-                                        BMP_WIZARD_1);
-
+    wxWizard *wizard = new wxWizard(this, -1,
+                                       "Absolutely Useless Wizard",
+                                       BMP_WIZARD_1);
+    

     // a wizard page may be either an object of predefined class
     wxWizardPageSimple *page1 = new wxWizardPageSimple(wizard);
     // a wizard page may be either an object of predefined class
     wxWizardPageSimple *page1 = new wxWizardPageSimple(wizard);

-    (void)new wxStaticText(page1, -1,
-                           "This wizard doesn't help you to do anything at "
-                           "all.\n"
-                           "\n"
-                           "The next pages will present you with more useless "
-                           "controls.");
+    wxStaticText *text = new wxStaticText(page1, -1,
+             "This wizard doesn't help you to do anything at all.\n"
+             "\n"
+             "The next pages will present you with more useless controls."
+        );
+    wxSize size = text->GetBestSize();

 
     // ... or a derived class
     wxRadioboxPage *page3 = new wxRadioboxPage(wizard);
 
     // ... or a derived class
     wxRadioboxPage *page3 = new wxRadioboxPage(wizard);


@@ -340,6 +340,7 @@ void MyFrame::OnRunWizard(wxCommandEvent& WXUNUSED(event))
     page1->SetNext(page2);
     page3->SetPrev(page2);
 
     page1->SetNext(page2);
     page3->SetPrev(page2);
 

+    wizard->SetPageSize(size);

     if ( wizard->RunWizard(page1) )
     {
         wxMessageBox("The wizard successfully completed", "That's all",
     if ( wizard->RunWizard(page1) )
     {
         wxMessageBox("The wizard successfully completed", "That's all",


@@ -351,5 +352,5 @@ void MyFrame::OnRunWizard(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnWizardCancel(wxWizardEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnWizardCancel(wxWizardEvent& WXUNUSED(event))
 {

-    wxLogStatus(this, "The wizard was cancelled.");
+    wxLogStatus(this, wxT("The wizard was cancelled."));

 }
 }