disable warning about data truncation (810) for icc (this is a useful warning and...

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

diff --git a/samples/wizard/wizard.cpp b/samples/wizard/wizard.cpp
index 8e10fe09212af2fcf0263d714a526b0da2c691e3..7a96e19214d60be29dfb520ea8fab92513872a4d 100644 (file)
--- a/samples/wizard/wizard.cpp
+++ b/samples/wizard/wizard.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wizard.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wizard.cpp

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

 // Author:      Vadim Zeitlin
 // Modified by: Robert Vazan (sizers)
 // Created:     15.08.99
 // Author:      Vadim Zeitlin
 // Modified by: Robert Vazan (sizers)
 // Created:     15.08.99


@@ -30,6 +30,7 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/checkbox.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/msgdlg.h"
     #include "wx/radiobox.h"
     #include "wx/menu.h"


@@ -38,10 +39,8 @@
 
 #include "wx/wizard.h"
 
 
 #include "wx/wizard.h"
 

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

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


@@ -50,9 +49,10 @@
 // ids for menu items
 enum
 {
 // ids for menu items
 enum
 {

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

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


@@ -81,32 +81,46 @@ public:
     void OnWizardFinished(wxWizardEvent& event);
 
 private:
     void OnWizardFinished(wxWizardEvent& event);
 
 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);
+    void RunIt(bool modal);
+
+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"));

 
 

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

         wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
         mainSizer->Add(
         wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
         mainSizer->Add(

-            new wxStaticText(this, -1,
+            new wxStaticText(this, wxID_ANY,

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


@@ -131,10 +145,10 @@ public:
             wxMessageBox(_T("Check the checkbox first!"), _T("No way"),
                          wxICON_WARNING | wxOK, this);
 
             wxMessageBox(_T("Check the checkbox first!"), _T("No way"),
                          wxICON_WARNING | wxOK, this);
 

-            return FALSE;
+            return false;

         }
 
         }
 

-        return TRUE;
+        return true;

     }
 
 private:
     }
 
 private:


@@ -164,12 +178,12 @@ public:
         choices[2] = _T("both");
         choices[3] = _T("neither");
 
         choices[2] = _T("both");
         choices[3] = _T("neither");
 

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

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

-        
+

         wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
         mainSizer->Add(
             m_radio,
         wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
         mainSizer->Add(
             m_radio,


@@ -177,6 +191,7 @@ public:
             wxALL,
             5 // Border
         );
             wxALL,
             5 // Border
         );

+

         SetSizer(mainSizer);
         mainSizer->Fit(this);
     }
         SetSizer(mainSizer);
         mainSizer->Fit(this);
     }


@@ -217,7 +232,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:


@@ -228,25 +243,44 @@ public:
     {
         m_prev = prev;
         m_next = next;
     {
         m_prev = prev;
         m_next = next;

-        
+

         wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
 
         mainSizer->Add(
         wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
 
         mainSizer->Add(

-            new wxStaticText(this, -1, _T("Try checking the box below and\n")
+            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
         );
 
                                        _T("then going back and clearing it")),
             0, // No vertical stretching
             wxALL,
             5 // Border width
         );
 

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

         mainSizer->Add(
             m_checkbox,
             0, // No vertical stretching
             wxALL,
             5 // Border width
         );
         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") };
+        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);
+
+        mainSizer->Add(
+            m_checklistbox,
+            0, // No vertical stretching
+            wxALL,
+            5 // Border width
+        );
+#endif // wxUSE_CHECKLISTBOX
+

         SetSizer(mainSizer);
         mainSizer->Fit(this);
     }
         SetSizer(mainSizer);
         mainSizer->Fit(this);
     }


@@ -263,6 +297,9 @@ private:
                  *m_next;
 
     wxCheckBox *m_checkbox;
                  *m_next;
 
     wxCheckBox *m_checkbox;

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

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


@@ -274,17 +311,18 @@ 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_MENU(Wizard_Quit,         MyFrame::OnQuit)
+    EVT_MENU(Wizard_About,        MyFrame::OnAbout)
+    EVT_MENU(Wizard_RunModal,     MyFrame::OnRunWizard)
+    EVT_MENU(Wizard_RunModeless,  MyFrame::OnRunWizard)

 
 

-    EVT_WIZARD_CANCEL(-1, MyFrame::OnWizardCancel)
-    EVT_WIZARD_FINISHED(-1, MyFrame::OnWizardFinished)
+    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)


@@ -300,10 +338,66 @@ bool MyApp::OnInit()
 
     // 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)
+         :wxWizard(frame,wxID_ANY,_T("Absolutely Useless Wizard"),
+                   wxBitmap(wiztest_xpm),wxDefaultPosition,
+                   wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+{
+    // 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);
+
+    // allow the wizard to size itself around the pages
+    GetPageAreaSizer()->Add(m_page1);
+}
+
+void MyWizard::RunIt(bool modal)
+{
+    if ( modal )
+    {
+        if ( RunWizard(m_page1) )
+        {
+            // Success
+        }
+
+        Destroy();
+    }
+    else
+    {
+        FinishLayout();
+        ShowPage(m_page1);
+        Show(true);
+    }

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


@@ -311,11 +405,12 @@ 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, _T("&Run wizard...\tCtrl-R"));
+    menuFile->Append(Wizard_RunModal, _T("&Run wizard modal...\tCtrl-R"));
+    menuFile->Append(Wizard_RunModeless, _T("&Run wizard modeless..."));

     menuFile->AppendSeparator();
     menuFile->Append(Wizard_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
 
     menuFile->AppendSeparator();
     menuFile->Append(Wizard_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
 


@@ -331,72 +426,37 @@ MyFrame::MyFrame(const wxString& title)
     SetMenuBar(menuBar);
 
     // also create status bar which we use in OnWizardCancel
     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))
 {
     wxMessageBox(_T("Demo of wxWizard class\n")
 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxMessageBox(_T("Demo of wxWizard class\n")

-                 _T("© 1999, 2000 Vadim Zeitlin"),
+                 _T("(c) 1999, 2000 Vadim Zeitlin"),

                  _T("About wxWizard sample"), wxOK | wxICON_INFORMATION, this);
 }
 
                  _T("About wxWizard sample"), wxOK | wxICON_INFORMATION, this);
 }
 

-void MyFrame::OnRunWizard(wxCommandEvent& WXUNUSED(event))
+void MyFrame::OnRunWizard(wxCommandEvent& event)

 {
 {

-    wxWizard *wizard = new wxWizard(this, -1,
-                    _T("Absolutely Useless Wizard"),
-                    wxBITMAP(wiztest),
-                    wxDefaultPosition,
-                    wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);
-
-    // a wizard page may be either an object of predefined class
-    wxWizardPageSimple *page1 = new wxWizardPageSimple(wizard);
-    wxStaticText *text = new wxStaticText(page1, -1,
-             _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)
-        );
-    wxSize size = text->GetBestSize();
-
-    // ... or a derived class
-    wxRadioboxPage *page3 = new wxRadioboxPage(wizard);
-    wxValidationPage *page4 = new wxValidationPage(wizard);
-
-    // 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(wizard, page1, page3);
-    page1->SetNext(page2);
-    page3->SetPrev(page2);
-
-    wizard->SetPageSize(size);
-    wizard->GetPageAreaSizer()->Add(page1);
-    
-    if ( wizard->RunWizard(page1) )
-    {
-        wxMessageBox(_T("The wizard successfully completed"), _T("That's all"),
-                     wxICON_INFORMATION | wxOK);
-    }
+    MyWizard *wizard = new MyWizard(this);

 
 

-    wizard->Destroy();
+    wizard->RunIt( event.GetId() == Wizard_RunModal );

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

-    wxLogStatus(this, wxT("The wizard finished successfully."));
+    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"));

 }
 }