fixing infinite recursion for rotated text, introduced in cleanup r57915

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

diff --git a/samples/wizard/wizard.cpp b/samples/wizard/wizard.cpp
index 50e1a1ce22e68d37d3cb5db1fa983dee21eecbea..d253471f7d5ad5a2ff7f32386809f7710091dc86 100644 (file)
--- a/samples/wizard/wizard.cpp
+++ b/samples/wizard/wizard.cpp
@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wizard.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wizard.cpp

-// Purpose:     wxWindows sample demonstrating wxWizard control
+// Purpose:     wxWidgets sample demonstrating wxWizard control

 // Author:      Vadim Zeitlin
 // Author:      Vadim Zeitlin

-// Modified by:
+// Modified by: Robert Vazan (sizers)

 // Created:     15.08.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
 // Created:     15.08.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin


@@ -17,11 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "wizard.cpp"
-    #pragma interface "wizard.cpp"
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -29,18 +24,27 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// for all others, include the necessary headers

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/wx.h"
+    #include "wx/frame.h"
+    #include "wx/stattext.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/checkbox.h"
+    #include "wx/checklst.h"
+    #include "wx/msgdlg.h"
+    #include "wx/radiobox.h"
+    #include "wx/menu.h"
+    #include "wx/sizer.h"

 #endif
 
 #endif
 

+#include "wx/textctrl.h"

 #include "wx/wizard.h"
 
 #include "wx/wizard.h"
 

-#ifndef __WXMSW__
-    #include "wiztest.xpm"
-    #include "wiztest2.xpm"
-#endif
+#include "wiztest.xpm"
+#include "wiztest2.xpm"
+
+#include "../sample.xpm"

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


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

-    Wizard_Quit = 100,
-    Wizard_Run,
-    Wizard_About = 1000
+    Wizard_About = wxID_ABOUT,
+    Wizard_Quit = wxID_EXIT,
+    Wizard_RunModal = wxID_HIGHEST,
+
+    Wizard_RunNoSizer,
+    Wizard_RunModeless,
+
+    Wizard_LargeWizard,
+    Wizard_ExpandBitmap

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


@@ -76,44 +86,80 @@ 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 OnWizardCancel(wxWizardEvent& event);

+    void OnWizardFinished(wxWizardEvent& event);

 
 private:
 
 private:

-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

+// ----------------------------------------------------------------------------
+// our wizard
+// ----------------------------------------------------------------------------
+
+class MyWizard : public wxWizard
+{
+public:
+    MyWizard(wxFrame *frame, bool useSizer = true);
+
+    wxWizardPage *GetFirstPage() const { return m_page1; }
+
+private:
+    wxWizardPageSimple *m_page1;
+};
+

 // ----------------------------------------------------------------------------
 // some pages for our wizard
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // some pages for our wizard
 // ----------------------------------------------------------------------------
 

-// this shows how to simply control the validity of the user input by just
+// This shows how to simply control the validity of the user input by just

 // overriding TransferDataFromWindow() - of course, in a real program, the
 // check wouldn't be so trivial and the data will be probably saved somewhere
 // overriding TransferDataFromWindow() - of course, in a real program, the
 // check wouldn't be so trivial and the data will be probably saved somewhere

-// too
+// too.

 //
 //

-// it also shows how to use a different bitmap for one of the pages
+// It also shows how to use a different bitmap for one of the pages.

 class wxValidationPage : public wxWizardPageSimple
 {
 public:
     wxValidationPage(wxWizard *parent) : wxWizardPageSimple(parent)
     {
 class wxValidationPage : public wxWizardPageSimple
 {
 public:
     wxValidationPage(wxWizard *parent) : wxWizardPageSimple(parent)
     {

-        m_bitmap = wxBITMAP(wiztest2);
+        m_bitmap = wxBitmap(wiztest2_xpm);
+
+        m_checkbox = new wxCheckBox(this, wxID_ANY, _T("&Check me"));
+
+        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")),
+            0,
+            wxALL,
+            5
+        );

 
 

-        m_checkbox = new wxCheckBox(this, -1, "&Check me");
+        mainSizer->Add(
+            m_checkbox,
+            0, // No stretching
+            wxALL,
+            5 // Border
+        );
+        SetSizerAndFit(mainSizer);

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

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

                          wxICON_WARNING | wxOK, this);
 
                          wxICON_WARNING | wxOK, this);
 

-            return FALSE;
+            return false;

         }
 
         }
 

-        return TRUE;
+        return true;

     }
 
 private:
     }
 
 private:


@@ -138,22 +184,32 @@ 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] = "forward";
-        choices[1] = "backward";
-        choices[2] = "both";
-        choices[3] = "neither";
+        choices[0] = _T("forward");
+        choices[1] = _T("backward");
+        choices[2] = _T("both");
+        choices[3] = _T("neither");

 
 

-        m_radio = new wxRadioBox(this, -1, "Allow to proceed:",
-                                 wxPoint(5, 5), wxDefaultSize,
+        m_radio = new wxRadioBox(this, wxID_ANY, _T("Allow to proceed:"),
+                                 wxDefaultPosition, wxDefaultSize,

                                  WXSIZEOF(choices), choices,
                                  1, wxRA_SPECIFY_COLS);
         m_radio->SetSelection(Both);
                                  WXSIZEOF(choices), choices,
                                  1, wxRA_SPECIFY_COLS);
         m_radio->SetSelection(Both);

+
+        wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
+        mainSizer->Add(
+            m_radio,
+            0, // No stretching
+            wxALL,
+            5 // Border
+        );
+
+        SetSizerAndFit(mainSizer);

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

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

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


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

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

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


@@ -186,7 +242,7 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-// this shows how to dynamically (i.e. during run-time) arrange the page order
+// This shows how to dynamically (i.e. during run-time) arrange the page order.

 class wxCheckboxPage : public wxWizardPage
 {
 public:
 class wxCheckboxPage : public wxWizardPage
 {
 public:


@@ -198,11 +254,65 @@ public:
         m_prev = prev;
         m_next = next;
 
         m_prev = prev;
         m_next = next;
 

-        (void)new wxStaticText(this, -1, "Try checking the box below and\n"
-                                         "then going back and clearing it");
+        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")),
+            0, // No vertical stretching
+            wxALL,
+            5 // Border width
+        );
+
+        m_checkbox = new wxCheckBox(this, wxID_ANY, _T("&Skip the next page"));
+        mainSizer->Add(
+            m_checkbox,
+            0, // No vertical stretching
+            wxALL,
+            5 // Border width
+        );
+
+#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")
+        };
+
+        m_checklistbox = new wxCheckListBox
+                             (
+                                this,
+                                wxID_ANY,
+                                wxDefaultPosition,
+                                wxSize(100,100),
+                                wxArrayString(WXSIZEOF(aszChoices), aszChoices)
+                             );
+
+        mainSizer->Add(
+            m_checklistbox,
+            0, // No vertical stretching
+            wxALL,
+            5 // Border width
+        );
+#endif // wxUSE_CHECKLISTBOX
+
+        wxSize textSize = wxSize(150, 200);
+        if (((wxFrame*) wxTheApp->GetTopWindow())->GetMenuBar()->IsChecked(Wizard_LargeWizard))
+            textSize = wxSize(150, wxGetClientDisplayRect().GetHeight() - 200);
+

 
 

-        m_checkbox = new wxCheckBox(this, -1, "&Skip the next page",
-                                    wxPoint(5, 30));
+        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


@@ -217,6 +327,9 @@ private:
                  *m_next;
 
     wxCheckBox *m_checkbox;
                  *m_next;
 
     wxCheckBox *m_checkbox;

+#if wxUSE_CHECKLISTBOX
+    wxCheckListBox *m_checklistbox;
+#endif

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -228,16 +341,19 @@ private:
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)

-    EVT_MENU(Wizard_Quit,  MyFrame::OnQuit)
-    EVT_MENU(Wizard_About, MyFrame::OnAbout)
-    EVT_MENU(Wizard_Run,   MyFrame::OnRunWizard)
-
-    EVT_WIZARD_CANCEL(-1, MyFrame::OnWizardCancel)
+    EVT_MENU(Wizard_Quit,         MyFrame::OnQuit)
+    EVT_MENU(Wizard_About,        MyFrame::OnAbout)
+    EVT_MENU(Wizard_RunModal,     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)

 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxRadioboxPage, wxWizardPageSimple)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxRadioboxPage, wxWizardPageSimple)

-    EVT_WIZARD_PAGE_CHANGING(-1, wxRadioboxPage::OnWizardPageChanging)
-    EVT_WIZARD_CANCEL(-1, wxRadioboxPage::OnWizardCancel)
+    EVT_WIZARD_PAGE_CHANGING(wxID_ANY, wxRadioboxPage::OnWizardPageChanging)
+    EVT_WIZARD_CANCEL(wxID_ANY, wxRadioboxPage::OnWizardCancel)

 END_EVENT_TABLE()
 
 IMPLEMENT_APP(MyApp)
 END_EVENT_TABLE()
 
 IMPLEMENT_APP(MyApp)


@@ -249,14 +365,67 @@ 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("wxWizard Sample");
+    if ( !wxApp::OnInit() )
+        return false;
+
+    MyFrame *frame = new MyFrame(_T("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)

-    frame->Show(TRUE);
+    frame->Show(true);

 
     // we're done
 
     // we're done

-    return TRUE;
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// MyWizard
+// ----------------------------------------------------------------------------
+
+MyWizard::MyWizard(wxFrame *frame, bool useSizer)
+        : wxWizard(frame,wxID_ANY,_T("Absolutely Useless Wizard"),
+                   wxBitmap(wiztest_xpm),wxDefaultPosition,
+                   wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+{
+    SetIcon(wxIcon(sample_xpm));
+
+    // 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,
+             _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."),
+             wxPoint(5,5)
+        );
+
+    // ... or a derived class
+    wxRadioboxPage *page3 = new wxRadioboxPage(this);
+    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);
+
+    // this page is not a wxWizardPageSimple, so we use SetNext/Prev to insert
+    // it into the chain of pages
+    wxCheckboxPage *page2 = new wxCheckboxPage(this, m_page1, page3);
+    m_page1->SetNext(page2);
+    page3->SetPrev(page2);
+
+    if ( useSizer )
+    {
+        // allow the wizard to size itself around the pages
+        GetPageAreaSizer()->Add(m_page1);
+    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -264,82 +433,78 @@ bool MyApp::OnInit()
 // ----------------------------------------------------------------------------
 
 MyFrame::MyFrame(const wxString& title)
 // ----------------------------------------------------------------------------
 
 MyFrame::MyFrame(const wxString& title)

-       : wxFrame((wxFrame *)NULL, -1, title,
+        :wxFrame((wxFrame *)NULL, wxID_ANY, title,

                   wxDefaultPosition, wxSize(250, 150))  // small frame
 {
     wxMenu *menuFile = new wxMenu;
                   wxDefaultPosition, wxSize(250, 150))  // small frame
 {
     wxMenu *menuFile = new wxMenu;

-    menuFile->Append(Wizard_Run, "&Run wizard...\tCtrl-R");
+    menuFile->Append(Wizard_RunModal, _T("&Run wizard modal...\tCtrl-R"));
+    menuFile->Append(Wizard_RunNoSizer, _T("Run wizard &without sizer..."));
+    menuFile->Append(Wizard_RunModeless, _T("Run wizard &modeless..."));

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

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

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

-    helpMenu->Append(Wizard_About, "&About...\tF1", "Show about dialog");
+    helpMenu->Append(Wizard_About, _T("&About...\tF1"), _T("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, "&File");
-    menuBar->Append(helpMenu, "&Help");
+    menuBar->Append(menuFile, _T("&File"));
+    menuBar->Append(menuOptions, _T("&Options"));
+    menuBar->Append(helpMenu, _T("&Help"));

 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
     // also create status bar which we use in OnWizardCancel
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
     // also create status bar which we use in OnWizardCancel

+#if wxUSE_STATUSBAR

     CreateStatusBar();
     CreateStatusBar();

+#endif // wxUSE_STATUSBAR

 }
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-    // TRUE is to force the frame to close
-    Close(TRUE);
+    // true is to force the frame to close
+    Close(true);

 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {

-    wxMessageBox("Demo of wxWizard class\n"
-                 "© 1999, 2000 Vadim Zeitlin",
-                 "About wxWizard sample", wxOK | wxICON_INFORMATION, this);
+    wxMessageBox(_T("Demo of wxWizard class\n")
+                 _T("(c) 1999, 2000 Vadim Zeitlin"),
+                 _T("About wxWizard sample"), wxOK | wxICON_INFORMATION, this);

 }
 
 void MyFrame::OnRunWizard(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void MyFrame::OnRunWizard(wxCommandEvent& WXUNUSED(event))
 {

-    wxWizard *wizard = new wxWizard(this, -1,
-                    "Absolutely Useless Wizard",
-                    wxBITMAP(wiztest));
+    MyWizard wizard(this);

 
 

-    // a wizard page may be either an object of predefined class
-    wxWizardPageSimple *page1 = new wxWizardPageSimple(wizard);
-    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);
-    wxValidationPage *page4 = new wxValidationPage(wizard);
+    wizard.RunWizard(wizard.GetFirstPage());
+}

 
 

-    // set the page order using a convenience function - could also use
-    // SetNext/Prev directly as below
-    wxWizardPageSimple::Chain(page3, page4);
+void MyFrame::OnRunWizardNoSizer(wxCommandEvent& WXUNUSED(event))
+{
+    MyWizard wizard(this, false);

 
 

-    // this page is not a wxWizardPageSimple, so we use SetNext/Prev to insert
-    // it into the chain of pages
-    wxCheckboxPage *page2 = new wxCheckboxPage(wizard, page1, page3);
-    page1->SetNext(page2);
-    page3->SetPrev(page2);
+    wizard.RunWizard(wizard.GetFirstPage());
+}

 
 

-    wizard->SetPageSize(size);
-    if ( wizard->RunWizard(page1) )
-    {
-        wxMessageBox("The wizard successfully completed", "That's all",
-                     wxICON_INFORMATION | wxOK);
-    }
+void MyFrame::OnRunWizardModeless(wxCommandEvent& WXUNUSED(event))
+{
+    MyWizard *wizard = new MyWizard(this);
+    wizard->ShowPage(wizard->GetFirstPage());
+    wizard->Show(true);
+}

 
 

-    wizard->Destroy();
+void MyFrame::OnWizardFinished(wxWizardEvent& WXUNUSED(event))
+{
+    wxMessageBox(wxT("The wizard finished successfully."), wxT("Wizard notification"));

 }
 
 void MyFrame::OnWizardCancel(wxWizardEvent& WXUNUSED(event))
 {
 }
 
 void MyFrame::OnWizardCancel(wxWizardEvent& WXUNUSED(event))
 {

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

 }
 }