Better alphabetized the event handler macros

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

diff --git a/samples/wizard/wizard.cpp b/samples/wizard/wizard.cpp
index b5f798734bbe9411e4b0f5c176d6e74c86fb4baa..11645c16d06ccf78f2fb12930e8b496f4d800bd7 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
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #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,10 +24,16 @@
     #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/stattext.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/checkbox.h"
+    #include "wx/msgdlg.h"
+    #include "wx/radiobox.h"
+    #include "wx/menu.h"
+    #include "wx/sizer.h"

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


@@ -77,9 +78,10 @@ public:
     void OnAbout(wxCommandEvent& event);
     void OnRunWizard(wxCommandEvent& event);
     void OnWizardCancel(wxWizardEvent& event);
     void OnAbout(wxCommandEvent& event);
     void OnRunWizard(wxCommandEvent& 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()
 };
 


@@ -100,7 +102,26 @@ public:
     {
         m_bitmap = wxBITMAP(wiztest2);
 
     {
         m_bitmap = wxBITMAP(wiztest2);
 

-        m_checkbox = new wxCheckBox(this, -1, _T("&Check me"));
+        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
+        );
+
+        mainSizer->Add(
+            m_checkbox,
+            0, // No stretching
+            wxALL,
+            5 // Border
+        );
+        SetSizer(mainSizer);
+        mainSizer->Fit(this);

     }
 
     virtual bool TransferDataFromWindow()
     }
 
     virtual bool TransferDataFromWindow()


@@ -110,10 +131,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:


@@ -143,11 +164,21 @@ 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:"),
-                                 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
+        );
+        SetSizer(mainSizer);
+        mainSizer->Fit(this);

     }
 
     // wizard event handlers
     }
 
     // wizard event handlers


@@ -197,12 +228,27 @@ public:
     {
         m_prev = prev;
         m_next = next;
     {
         m_prev = prev;
         m_next = next;

+        
+        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
+        );

 
 

-        (void)new wxStaticText(this, -1, _T("Try checking the box below and\n")
-                                         _T("then going back and clearing it"));
-
-        m_checkbox = new wxCheckBox(this, -1, _T("&Skip the next page"),
-                                    wxPoint(5, 30));
+        m_checkbox = new wxCheckBox(this, wxID_ANY, _T("&Skip the next page"));
+        mainSizer->Add(
+            m_checkbox,
+            0, // No vertical stretching
+            wxALL,
+            5 // Border width
+        );
+        
+        SetSizer(mainSizer);
+        mainSizer->Fit(this);

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


@@ -232,12 +278,13 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Wizard_About, MyFrame::OnAbout)
     EVT_MENU(Wizard_Run,   MyFrame::OnRunWizard)
 
     EVT_MENU(Wizard_About, MyFrame::OnAbout)
     EVT_MENU(Wizard_Run,   MyFrame::OnRunWizard)
 

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


@@ -253,10 +300,10 @@ 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;

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


@@ -264,7 +311,7 @@ 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;


@@ -284,34 +331,39 @@ 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);
 }
 
 void MyFrame::OnRunWizard(wxCommandEvent& WXUNUSED(event))
 {
                  _T("About wxWizard sample"), wxOK | wxICON_INFORMATION, this);
 }
 
 void MyFrame::OnRunWizard(wxCommandEvent& WXUNUSED(event))
 {

-    wxWizard *wizard = new wxWizard(this, -1,
+    wxWizard *wizard = new wxWizard(this, wxID_ANY,

                     _T("Absolutely Useless Wizard"),
                     _T("Absolutely Useless Wizard"),

-                    wxBITMAP(wiztest));
+                    wxBITMAP(wiztest),
+                    wxDefaultPosition,
+                    wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);

 
     // 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);

-    wxStaticText *text = new wxStaticText(page1, -1,
-             _T("This wizard doesn't help you to do anything at all.\n")
+    wxStaticText *text = new wxStaticText(page1, wxID_ANY,
+             _T("This wizard doesn't help you\nto do anything at all.\n")

              _T("\n")
              _T("\n")

-             _T("The next pages will present you with more useless controls.")
+             _T("The next pages will present you\nwith more useless controls."),
+             wxPoint(5,5)

         );
     wxSize size = text->GetBestSize();
 
         );
     wxSize size = text->GetBestSize();
 


@@ -330,6 +382,8 @@ void MyFrame::OnRunWizard(wxCommandEvent& WXUNUSED(event))
     page3->SetPrev(page2);
 
     wizard->SetPageSize(size);
     page3->SetPrev(page2);
 
     wizard->SetPageSize(size);

+    wizard->GetPageAreaSizer()->Add(page1);
+    

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


@@ -339,6 +393,11 @@ void MyFrame::OnRunWizard(wxCommandEvent& WXUNUSED(event))
     wizard->Destroy();
 }
 
     wizard->Destroy();
 }
 

+void MyFrame::OnWizardFinished(wxWizardEvent& WXUNUSED(event))
+{
+    wxLogStatus(this, wxT("The wizard finished successfully."));
+}
+

 void MyFrame::OnWizardCancel(wxWizardEvent& WXUNUSED(event))
 {
     wxLogStatus(this, wxT("The wizard was cancelled."));
 void MyFrame::OnWizardCancel(wxWizardEvent& WXUNUSED(event))
 {
     wxLogStatus(this, wxT("The wizard was cancelled."));