A few tweaks and cleanups

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

diff --git a/samples/wizard/wizard.cpp b/samples/wizard/wizard.cpp
index 52cd4939835307572f23190d7aeb99fc076d9e9b..50e1a1ce22e68d37d3cb5db1fa983dee21eecbea 100644 (file)
--- a/samples/wizard/wizard.cpp
+++ b/samples/wizard/wizard.cpp
@@ -39,6 +39,7 @@
 
 #ifndef __WXMSW__
     #include "wiztest.xpm"
 
 #ifndef __WXMSW__
     #include "wiztest.xpm"

+    #include "wiztest2.xpm"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -53,18 +54,6 @@ enum
     Wizard_About = 1000
 };
 
     Wizard_About = 1000
 };
 

-// ----------------------------------------------------------------------------
-// ressources
-// ----------------------------------------------------------------------------
-
-#ifdef __WXMSW__
-    #define BMP_WIZARD_1 wxBitmap("wiztest.bmp", wxBITMAP_TYPE_BMP)
-    #define BMP_WIZARD_2 wxBitmap("wiztest2.bmp", wxBITMAP_TYPE_BMP)
-#else
-    #define BMP_WIZARD_1 wxBitmap(wizimage)
-    #define BMP_WIZARD_2 wxBitmap(wizimage)
-#endif
-

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -109,7 +98,7 @@ class wxValidationPage : public wxWizardPageSimple
 public:
     wxValidationPage(wxWizard *parent) : wxWizardPageSimple(parent)
     {
 public:
     wxValidationPage(wxWizard *parent) : wxWizardPageSimple(parent)
     {

-        m_bitmap = BMP_WIZARD_2;
+        m_bitmap = wxBITMAP(wiztest2);

 
         m_checkbox = new wxCheckBox(this, -1, "&Check me");
     }
 
         m_checkbox = new wxCheckBox(this, -1, "&Check me");
     }


@@ -313,18 +302,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",
+                    wxBITMAP(wiztest));

 
     // 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 +329,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 +341,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."));

 }
 }