remove also wxT(); it's confusing, too; do load wxstd.mo catalog after calling wxLoca...

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

diff --git a/samples/wizard/wizard.cpp b/samples/wizard/wizard.cpp
index a77af4a31d0e00259026508c9337085a2cb27ace..d253471f7d5ad5a2ff7f32386809f7710091dc86 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

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


@@ -77,6 +86,8 @@ 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);
 


@@ -92,8 +103,9 @@ private:
 class MyWizard : public wxWizard
 {
 public:
 class MyWizard : public wxWizard
 {
 public:

-    MyWizard(wxFrame *frame);
-    void RunIt(bool modal);
+    MyWizard(wxFrame *frame, bool useSizer = true);
+
+    wxWizardPage *GetFirstPage() const { return m_page1; }

 
 private:
     wxWizardPageSimple *m_page1;
 
 private:
     wxWizardPageSimple *m_page1;


@@ -134,8 +146,7 @@ public:
             wxALL,
             5 // Border
         );
             wxALL,
             5 // Border
         );

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

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


@@ -192,8 +203,7 @@ public:
             5 // Border
         );
 
             5 // Border
         );
 

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

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


@@ -294,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


@@ -327,7 +344,8 @@ 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)


@@ -347,6 +365,9 @@ 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()
 {

+    if ( !wxApp::OnInit() )
+        return false;
+

     MyFrame *frame = new MyFrame(_T("wxWizard Sample"));
 
     // and show it (the frames, unlike simple controls, are not shown when
     MyFrame *frame = new MyFrame(_T("wxWizard Sample"));
 
     // and show it (the frames, unlike simple controls, are not shown when


@@ -361,11 +382,21 @@ bool MyApp::OnInit()
 // MyWizard
 // ----------------------------------------------------------------------------
 
 // MyWizard
 // ----------------------------------------------------------------------------
 

-MyWizard::MyWizard(wxFrame *frame)
-         :wxWizard(frame,wxID_ANY,_T("Absolutely Useless Wizard"),
+MyWizard::MyWizard(wxFrame *frame, bool useSizer)
+        : wxWizard(frame,wxID_ANY,_T("Absolutely Useless Wizard"),

                    wxBitmap(wiztest_xpm),wxDefaultPosition,
                    wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {
                    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);
 
     // a wizard page may be either an object of predefined class
     m_page1 = new wxWizardPageSimple(this);
 


@@ -390,26 +421,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)
-{
-    if ( modal )
+    if ( useSizer )

     {
     {

-        if ( RunWizard(m_page1) )
-        {
-            // Success
-        }
-
-        Destroy();
-    }
-    else
-    {
-        FinishLayout();
-        ShowPage(m_page1);
-        Show(true);
+        // allow the wizard to size itself around the pages
+        GetPageAreaSizer()->Add(m_page1);

     }
 }
 
     }
 }
 


@@ -423,16 +438,22 @@ MyFrame::MyFrame(const wxString& title)
 {
     wxMenu *menuFile = new wxMenu;
     menuFile->Append(Wizard_RunModal, _T("&Run wizard modal...\tCtrl-R"));
 {
     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_RunNoSizer, _T("Run wizard &without sizer..."));
+    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"));
 

+    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;
     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();
     menuBar->Append(menuFile, _T("&File"));
     wxMenu *helpMenu = new wxMenu;
     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();
     menuBar->Append(menuFile, _T("&File"));

+    menuBar->Append(menuOptions, _T("&Options"));

     menuBar->Append(helpMenu, _T("&Help"));
 
     // ... and attach this menu bar to the frame
     menuBar->Append(helpMenu, _T("&Help"));
 
     // ... and attach this menu bar to the frame


@@ -457,11 +478,25 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
                  _T("About wxWizard sample"), wxOK | wxICON_INFORMATION, this);
 }
 
                  _T("About wxWizard sample"), wxOK | wxICON_INFORMATION, this);
 }
 

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

 {
 {

-    MyWizard *wizard = new MyWizard(this);
+    MyWizard wizard(this);
+
+    wizard.RunWizard(wizard.GetFirstPage());
+}
+
+void MyFrame::OnRunWizardNoSizer(wxCommandEvent& WXUNUSED(event))
+{
+    MyWizard wizard(this, false);

 
 

-    wizard->RunIt( event.GetId() == Wizard_RunModal );
+    wizard.RunWizard(wizard.GetFirstPage());
+}
+
+void MyFrame::OnRunWizardModeless(wxCommandEvent& WXUNUSED(event))
+{
+    MyWizard *wizard = new MyWizard(this);
+    wizard->ShowPage(wizard->GetFirstPage());
+    wizard->Show(true);

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