Deprecate old style wxPanel ctor taking separate coordinates.

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

diff --git a/samples/wizard/wizard.cpp b/samples/wizard/wizard.cpp
index 6446873f84e802605a554a74559b5e3f0aa854a5..94c95c08201052f7f30b4ec8bd1e45ff70a6a63d 100644 (file)
--- a/samples/wizard/wizard.cpp
+++ b/samples/wizard/wizard.cpp
@@ -26,6 +26,7 @@
 
 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
 
 // 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"
     #include "wx/stattext.h"
     #include "wx/log.h"
     #include "wx/app.h"


@@ -37,11 +38,14 @@
     #include "wx/sizer.h"
 #endif
 
     #include "wx/sizer.h"
 #endif
 

+#include "wx/textctrl.h"

 #include "wx/wizard.h"
 
 #include "wiztest.xpm"
 #include "wiztest2.xpm"
 
 #include "wx/wizard.h"
 
 #include "wiztest.xpm"
 #include "wiztest2.xpm"
 

+#include "../sample.xpm"
+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -49,10 +53,15 @@
 // ids for menu items
 enum
 {
 // ids for menu items
 enum
 {

+    Wizard_About = wxID_ABOUT,

     Wizard_Quit = wxID_EXIT,
     Wizard_RunModal = wxID_HIGHEST,
     Wizard_Quit = wxID_EXIT,
     Wizard_RunModal = wxID_HIGHEST,

+
+    Wizard_RunNoSizer,

     Wizard_RunModeless,
     Wizard_RunModeless,

-    Wizard_About = wxID_ABOUT
+
+    Wizard_LargeWizard,
+    Wizard_ExpandBitmap

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -67,7 +76,6 @@ public:
     virtual bool OnInit();
 };
 
     virtual bool OnInit();
 };
 

-class MyWizard;

 class MyFrame : public wxFrame
 {
 public:
 class MyFrame : public wxFrame
 {
 public:


@@ -78,17 +86,14 @@ public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
     void OnRunWizard(wxCommandEvent& event);
     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);
 
     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()
 private:
     // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()

-
-    MyWizard* m_wizard;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -98,16 +103,12 @@ private:
 class MyWizard : public wxWizard
 {
 public:
 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;
 
 private:
     wxWizardPageSimple *m_page1;

-    bool                m_isModal;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -127,13 +128,13 @@ public:
     {
         m_bitmap = wxBitmap(wiztest2_xpm);
 
     {
         m_bitmap = wxBitmap(wiztest2_xpm);
 

-        m_checkbox = new wxCheckBox(this, wxID_ANY, _T("&Check me"));
+        m_checkbox = new wxCheckBox(this, wxID_ANY, wxT("&Check me"));

 
         wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
         mainSizer->Add(
             new wxStaticText(this, wxID_ANY,
 
         wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
         mainSizer->Add(
             new wxStaticText(this, wxID_ANY,

-                             _T("You need to check the checkbox\n")
-                             _T("below before going to the next page\n")),
+                             wxT("You need to check the checkbox\n")
+                             wxT("below before going to the next page\n")),

             0,
             wxALL,
             5
             0,
             wxALL,
             5


@@ -145,15 +146,14 @@ public:
             wxALL,
             5 // Border
         );
             wxALL,
             5 // Border
         );

-        SetSizer(mainSizer);
-        mainSizer->Fit(this);
+        SetSizerAndFit(mainSizer);

     }
 
     virtual bool TransferDataFromWindow()
     {
         if ( !m_checkbox->GetValue() )
         {
     }
 
     virtual bool TransferDataFromWindow()
     {
         if ( !m_checkbox->GetValue() )
         {

-            wxMessageBox(_T("Check the checkbox first!"), _T("No way"),
+            wxMessageBox(wxT("Check the checkbox first!"), wxT("No way"),

                          wxICON_WARNING | wxOK, this);
 
             return false;
                          wxICON_WARNING | wxOK, this);
 
             return false;


@@ -184,12 +184,12 @@ public:
         //        static wxString choices[] = { "forward", "backward", "both", "neither" };
         // The above syntax can cause an internal compiler error with gcc.
         wxString choices[4];
         //        static wxString choices[] = { "forward", "backward", "both", "neither" };
         // The above syntax can cause an internal compiler error with gcc.
         wxString choices[4];

-        choices[0] = _T("forward");
-        choices[1] = _T("backward");
-        choices[2] = _T("both");
-        choices[3] = _T("neither");
+        choices[0] = wxT("forward");
+        choices[1] = wxT("backward");
+        choices[2] = wxT("both");
+        choices[3] = wxT("neither");

 
 

-        m_radio = new wxRadioBox(this, wxID_ANY, _T("Allow to proceed:"),
+        m_radio = new wxRadioBox(this, wxID_ANY, wxT("Allow to proceed:"),

                                  wxDefaultPosition, wxDefaultSize,
                                  WXSIZEOF(choices), choices,
                                  1, wxRA_SPECIFY_COLS);
                                  wxDefaultPosition, wxDefaultSize,
                                  WXSIZEOF(choices), choices,
                                  1, wxRA_SPECIFY_COLS);


@@ -203,14 +203,13 @@ public:
             5 // Border
         );
 
             5 // Border
         );
 

-        SetSizer(mainSizer);
-        mainSizer->Fit(this);
+        SetSizerAndFit(mainSizer);

     }
 
     // wizard event handlers
     void OnWizardCancel(wxWizardEvent& event)
     {
     }
 
     // wizard event handlers
     void OnWizardCancel(wxWizardEvent& event)
     {

-        if ( wxMessageBox(_T("Do you really want to cancel?"), _T("Question"),
+        if ( wxMessageBox(wxT("Do you really want to cancel?"), wxT("Question"),

                           wxICON_QUESTION | wxYES_NO, this) != wxYES )
         {
             // not confirmed
                           wxICON_QUESTION | wxYES_NO, this) != wxYES )
         {
             // not confirmed


@@ -231,7 +230,7 @@ public:
         if ( !event.GetDirection() && sel == Backward )
             return;
 
         if ( !event.GetDirection() && sel == Backward )
             return;
 

-        wxMessageBox(_T("You can't go there"), _T("Not allowed"),
+        wxMessageBox(wxT("You can't go there"), wxT("Not allowed"),

                      wxICON_WARNING | wxOK, this);
 
         event.Veto();
                      wxICON_WARNING | wxOK, this);
 
         event.Veto();


@@ -258,14 +257,14 @@ public:
         wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
 
         mainSizer->Add(
         wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
 
         mainSizer->Add(

-            new wxStaticText(this, wxID_ANY, _T("Try checking the box below and\n")
-                                       _T("then going back and clearing it")),
+            new wxStaticText(this, wxID_ANY, wxT("Try checking the box below and\n")
+                                       wxT("then going back and clearing it")),

             0, // No vertical stretching
             wxALL,
             5 // Border width
         );
 
             0, // No vertical stretching
             wxALL,
             5 // Border width
         );
 

-        m_checkbox = new wxCheckBox(this, wxID_ANY, _T("&Skip the next page"));
+        m_checkbox = new wxCheckBox(this, wxID_ANY, wxT("&Skip the next page"));

         mainSizer->Add(
             m_checkbox,
             0, // No vertical stretching
         mainSizer->Add(
             m_checkbox,
             0, // No vertical stretching


@@ -275,14 +274,27 @@ public:
 
 #if wxUSE_CHECKLISTBOX
         static const wxChar *aszChoices[] =
 
 #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);
+        {
+            wxT("Zeroth"),
+            wxT("First"),
+            wxT("Second"),
+            wxT("Third"),
+            wxT("Fourth"),
+            wxT("Fifth"),
+            wxT("Sixth"),
+            wxT("Seventh"),
+            wxT("Eighth"),
+            wxT("Nineth")
+        };
+
+        m_checklistbox = new wxCheckListBox
+                             (
+                                this,
+                                wxID_ANY,
+                                wxDefaultPosition,
+                                wxSize(100,100),
+                                wxArrayString(WXSIZEOF(aszChoices), aszChoices)
+                             );

 
         mainSizer->Add(
             m_checklistbox,
 
         mainSizer->Add(
             m_checklistbox,


@@ -292,8 +304,15 @@ public:
         );
 #endif // wxUSE_CHECKLISTBOX
 
         );
 #endif // wxUSE_CHECKLISTBOX
 

-        SetSizer(mainSizer);
-        mainSizer->Fit(this);
+        wxSize textSize = wxSize(150, 200);
+        if (((wxFrame*) wxTheApp->GetTopWindow())->GetMenuBar()->IsChecked(Wizard_LargeWizard))
+            textSize = wxSize(150, wxGetClientDisplayRect().GetHeight() - 200);
+
+
+        wxTextCtrl* textCtrl = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, textSize, wxTE_MULTILINE);
+        mainSizer->Add(textCtrl, 0, wxALL|wxEXPAND, 5);
+
+        SetSizerAndFit(mainSizer);

     }
 
     // implement wxWizardPage functions
     }
 
     // implement wxWizardPage functions


@@ -325,12 +344,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_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_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)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxRadioboxPage, wxWizardPageSimple)


@@ -347,7 +365,10 @@ IMPLEMENT_APP(MyApp)
 // `Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {
 // `Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {

-    MyFrame *frame = new MyFrame(_T("wxWizard Sample"));
+    if ( !wxApp::OnInit() )
+        return false;
+
+    MyFrame *frame = new MyFrame(wxT("wxWizard Sample"));

 
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)
 
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)


@@ -360,21 +381,31 @@ bool MyApp::OnInit()
 // ----------------------------------------------------------------------------
 // MyWizard
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // MyWizard
 // ----------------------------------------------------------------------------

-    
-MyWizard::MyWizard(wxFrame *frame)
-         :wxWizard(frame,wxID_ANY,_T("Absolutely Useless Wizard"),
-                   wxBitmap(wiztest_xpm),wxDefaultPosition,
-                   wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+
+MyWizard::MyWizard(wxFrame *frame, bool useSizer)

 {
 {

-    m_isModal = false;
+    SetExtraStyle(wxWIZARD_EX_HELPBUTTON);
+
+    Create(frame,wxID_ANY,wxT("Absolutely Useless Wizard"),
+                   wxBitmap(wiztest_xpm),wxDefaultPosition,
+                   wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);
+    SetIcon(wxICON(sample));
+
+    // Allow the bitmap to be expanded to fit the page height
+    if (frame->GetMenuBar()->IsChecked(Wizard_ExpandBitmap))
+        SetBitmapPlacement(wxWIZARD_VALIGN_CENTRE);
+
+    // Enable scrolling adaptation
+    if (frame->GetMenuBar()->IsChecked(Wizard_LargeWizard))
+        SetLayoutAdaptationMode(wxDIALOG_ADAPTATION_MODE_ENABLED);

 
     // a wizard page may be either an object of predefined class
     m_page1 = new wxWizardPageSimple(this);
 
     /* wxStaticText *text = */ new wxStaticText(m_page1, wxID_ANY,
 
     // a wizard page may be either an object of predefined class
     m_page1 = new wxWizardPageSimple(this);
 
     /* wxStaticText *text = */ new wxStaticText(m_page1, wxID_ANY,

-             _T("This wizard doesn't help you\nto do anything at all.\n")
-             _T("\n")
-             _T("The next pages will present you\nwith more useless controls."),
+             wxT("This wizard doesn't help you\nto do anything at all.\n")
+             wxT("\n")
+             wxT("The next pages will present you\nwith more useless controls."),

              wxPoint(5,5)
         );
 
              wxPoint(5,5)
         );
 


@@ -392,27 +423,10 @@ MyWizard::MyWizard(wxFrame *frame)
     m_page1->SetNext(page2);
     page3->SetPrev(page2);
 
     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,21 +438,25 @@ MyFrame::MyFrame(const wxString& title)
         :wxFrame((wxFrame *)NULL, wxID_ANY, title,
                   wxDefaultPosition, wxSize(250, 150))  // small frame
 {
         :wxFrame((wxFrame *)NULL, wxID_ANY, title,
                   wxDefaultPosition, wxSize(250, 150))  // small frame
 {

-    m_wizard = NULL;
-    

     wxMenu *menuFile = new wxMenu;
     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_RunModal, wxT("&Run wizard modal...\tCtrl-R"));
+    menuFile->Append(Wizard_RunNoSizer, wxT("Run wizard &without sizer..."));
+    menuFile->Append(Wizard_RunModeless, wxT("Run wizard &modeless..."));

     menuFile->AppendSeparator();
     menuFile->AppendSeparator();

-    menuFile->Append(Wizard_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
+    menuFile->Append(Wizard_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));
+
+    wxMenu *menuOptions = new wxMenu;
+    menuOptions->AppendCheckItem(Wizard_LargeWizard, wxT("&Scroll Wizard Pages"));
+    menuOptions->AppendCheckItem(Wizard_ExpandBitmap, wxT("Si&ze Bitmap To Page"));

 
     wxMenu *helpMenu = new wxMenu;
 
     wxMenu *helpMenu = new wxMenu;

-    helpMenu->Append(Wizard_About, _T("&About...\tF1"), _T("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();
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar();

-    menuBar->Append(menuFile, _T("&File"));
-    menuBar->Append(helpMenu, _T("&Help"));
+    menuBar->Append(menuFile, wxT("&File"));
+    menuBar->Append(menuOptions, wxT("&Options"));
+    menuBar->Append(helpMenu, wxT("&Help"));

 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);


@@ -457,41 +475,38 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {

-    wxMessageBox(_T("Demo of wxWizard class\n")
-                 _T("(c) 1999, 2000 Vadim Zeitlin"),
-                 _T("About wxWizard sample"), wxOK | wxICON_INFORMATION, this);
+    wxMessageBox(wxT("Demo of wxWizard class\n")
+                 wxT("(c) 1999, 2000 Vadim Zeitlin"),
+                 wxT("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"));

 }
 }