Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wizards not using sizers for the page layout now work again

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-05-28 14:19:18 +00:00
parent 2faa0a64e1
commit 0a089246e7
3 changed files with 152 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
samples/wizard/wizard.cpp
View File

@@ -51,6 +51,7 @@ enum
{
Wizard_Quit = wxID_EXIT,
Wizard_RunModal = wxID_HIGHEST,
Wizard_RunNoSizer,
Wizard_RunModeless,
Wizard_About = wxID_ABOUT
};
@@ -77,6 +78,8 @@ public:
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);
@@ -92,8 +95,9 @@ private:
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;
@@ -327,7 +331,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_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)
@@ -361,8 +366,8 @@ bool MyApp::OnInit()
// 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)
{
@@ -390,26 +395,10 @@ MyWizard::MyWizard(wxFrame *frame)
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,7 +412,8 @@ MyFrame::MyFrame(const wxString& title)
{
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"));
@@ -457,11 +447,25 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
_T("About wxWizard sample"), wxOK | wxICON_INFORMATION, this);
}
void MyFrame::OnRunWizard(wxCommandEvent& event)
void MyFrame::OnRunWizard(wxCommandEvent& WXUNUSED(event))
{
MyWizard wizard(this);
wizard.RunWizard(wizard.GetFirstPage());
}
void MyFrame::OnRunWizardNoSizer(wxCommandEvent& WXUNUSED(event))
{
MyWizard wizard(this, false);
wizard.RunWizard(wizard.GetFirstPage());
}
void MyFrame::OnRunWizardModeless(wxCommandEvent& WXUNUSED(event))
{
MyWizard *wizard = new MyWizard(this);
wizard->RunIt( event.GetId() == Wizard_RunModal );
wizard->ShowPage(wizard->GetFirstPage());
wizard->Show(true);
}
void MyFrame::OnWizardFinished(wxWizardEvent& WXUNUSED(event))