From: Vadim Zeitlin Date: Sun, 28 May 2006 14:19:18 +0000 (+0000) Subject: wizards not using sizers for the page layout now work again X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0a089246e73fe5eed585feeaf08ddba073bc9df4 wizards not using sizers for the page layout now work again git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h index fdd07ddea9..52940b2a82 100644 --- a/include/wx/generic/wizard.h +++ b/include/wx/generic/wizard.h @@ -70,7 +70,8 @@ public: virtual void DoCreateControls(); protected: - void FinishLayout(); + // for compatibility only, doesn't do anything any more + void FinishLayout() { } private: // was the dialog really created? @@ -88,8 +89,6 @@ private: void AddBackNextPair(wxBoxSizer *buttonRow); void AddButtonRow(wxBoxSizer *mainColumn); - wxSize GetManualPageSize() const; - // the page size requested by user wxSize m_sizePage; @@ -105,8 +104,6 @@ private: *m_btnNext; // the "Next>" or "Finish" button wxStaticBitmap *m_statbmp; // the control for the bitmap - // Whether user called SetBorder() - bool m_calledSetBorder; // Border around page area sizer requested using SetBorder() int m_border; @@ -116,6 +113,9 @@ private: // Whether was modal (modeless has to be destroyed on finish or cancel) bool m_wasModal; + // True if pages are laid out using the sizer + bool m_usingSizer; + // Page area sizer will be inserted here with padding wxBoxSizer *m_sizerBmpAndPage; diff --git a/samples/wizard/wizard.cpp b/samples/wizard/wizard.cpp index a77af4a31d..01917769a8 100644 --- a/samples/wizard/wizard.cpp +++ b/samples/wizard/wizard.cpp @@ -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 ( RunWizard(m_page1) ) - { - // Success - } - - Destroy(); - } - else + if ( useSizer ) { - 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 = 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)) diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp index 9db99cdbfb..b9e6ecae67 100644 --- a/src/generic/wizard.cpp +++ b/src/generic/wizard.cpp @@ -72,7 +72,6 @@ private: wxSize SiblingSize(wxSizerItem *child); wxWizard *m_owner; - bool m_childSizeValid; wxSize m_childSize; }; @@ -178,13 +177,15 @@ wxWizardPage *wxWizardPageSimple::GetNext() const // ---------------------------------------------------------------------------- wxWizardSizer::wxWizardSizer(wxWizard *owner) - : m_owner(owner) + : m_owner(owner), + m_childSize(wxDefaultSize) { - m_childSizeValid = false; } wxSizerItem *wxWizardSizer::Insert(size_t index, wxSizerItem *item) { + m_owner->m_usingSizer = true; + if ( item->IsWindow() ) { // we must pretend that the window is shown as otherwise it wouldn't be @@ -214,7 +215,7 @@ void wxWizardSizer::RecalcSizes() // it should be called whenever it changes (wxWizard::ShowPage) if ( m_owner->m_page ) { - m_owner->m_page->SetSize(m_position.x, m_position.y, m_size.x, m_size.y); + m_owner->m_page->SetSize(wxRect(m_position, m_size)); } } @@ -226,15 +227,15 @@ wxSize wxWizardSizer::CalcMin() wxSize wxWizardSizer::GetMaxChildSize() { #if !defined(__WXDEBUG__) - if ( m_childSizeValid ) + if ( m_childSize.IsFullySpecified() ) return m_childSize; #endif wxSize maxOfMin; - wxSizerItemList::compatibility_iterator childNode; - for(childNode = m_children.GetFirst(); childNode; - childNode = childNode->GetNext()) + for ( wxSizerItemList::compatibility_iterator childNode = m_children.GetFirst(); + childNode; + childNode = childNode->GetNext() ) { wxSizerItem *child = childNode->GetData(); maxOfMin.IncTo(child->CalcMin()); @@ -242,7 +243,7 @@ wxSize wxWizardSizer::GetMaxChildSize() } #ifdef __WXDEBUG__ - if ( m_childSizeValid && m_childSize != maxOfMin ) + if ( m_childSize.IsFullySpecified() && m_childSize != maxOfMin ) { wxFAIL_MSG( _T("Size changed in wxWizard::GetPageAreaSizer()") _T("after RunWizard().\n") @@ -255,7 +256,6 @@ wxSize wxWizardSizer::GetMaxChildSize() if ( m_owner->m_started ) { - m_childSizeValid = true; m_childSize = maxOfMin; } @@ -264,10 +264,7 @@ wxSize wxWizardSizer::GetMaxChildSize() int wxWizardSizer::GetBorder() const { - if ( m_owner->m_calledSetBorder ) - return m_owner->m_border; - - return m_children.IsEmpty() ? 5 : 0; + return m_owner->m_border; } wxSize wxWizardSizer::SiblingSize(wxSizerItem *child) @@ -306,10 +303,10 @@ void wxWizard::Init() m_statbmp = NULL; m_sizerBmpAndPage = NULL; m_sizerPage = NULL; - m_calledSetBorder = false; - m_border = 0; + m_border = 5; m_started = false; m_wasModal = false; + m_usingSizer = false; } bool wxWizard::Create(wxWindow *parent, @@ -360,7 +357,7 @@ void wxWizard::AddBitmapRow(wxBoxSizer *mainColumn) } #endif - // Added to m_sizerBmpAndPage in FinishLayout + // Added to m_sizerBmpAndPage later m_sizerPage = new wxWizardSizer(this); } @@ -511,46 +508,18 @@ void wxWizard::DoCreateControls() AddButtonRow(mainColumn); - // wxWindow::SetSizer should be followed by wxWindow::Fit, but - // this is done in FinishLayout anyway so why duplicate it SetSizer(windowSizer); } void wxWizard::SetPageSize(const wxSize& size) { - wxCHECK_RET(!m_started,wxT("wxWizard::SetPageSize after RunWizard")); + wxCHECK_RET(!m_started, wxT("wxWizard::SetPageSize after RunWizard")); m_sizePage = size; } -void wxWizard::FinishLayout() -{ - bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); - - // Set to enable wxWizardSizer::GetMaxChildSize - m_started = true; - - m_sizerBmpAndPage->Add( - m_sizerPage, - 1, // Horizontal stretching - wxEXPAND | wxALL, // Vertically stretchable - m_sizerPage->GetBorder() - ); - - if (!isPda) - { - GetSizer()->SetSizeHints(this); - if ( m_posWizard == wxDefaultPosition ) - CentreOnScreen(); - } - - // now that our layout is computed correctly, hide the pages artificially - // shown in wxWizardSizer::Insert() back again - m_sizerPage->HidePages(); -} - void wxWizard::FitToPage(const wxWizardPage *page) { - wxCHECK_RET(!m_started,wxT("wxWizard::FitToPage after RunWizard")); + wxCHECK_RET(!m_started, wxT("wxWizard::FitToPage after RunWizard")); while ( page ) { @@ -566,26 +535,35 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) { wxASSERT_MSG( page != m_page, wxT("this is useless") ); + wxSizerFlags flags(1); + flags.Border(wxALL, m_border).Expand(); + + if ( !m_started ) + { + if ( m_usingSizer ) + { + m_sizerBmpAndPage->Add(m_sizerPage, flags); + + // now that our layout is computed correctly, hide the pages + // artificially shown in wxWizardSizer::Insert() back again + m_sizerPage->HidePages(); + } + } + + // we'll use this to decide whether we have to change the label of this // button or not (initially the label is "Next") bool btnLabelWasNext = true; - // Modified 10-20-2001 Robert Cavanaugh. - // Fixed bug for displaying a new bitmap - // in each *consecutive* page - - // flag to indicate if this page uses a new bitmap - bool bmpIsDefault = true; - - // use these labels to determine if we need to change the bitmap - // for this page - wxBitmap bmpPrev, bmpCur; + // remember the old bitmap (if any) to compare with the new one later + wxBitmap bmpPrev; // check for previous page if ( m_page ) { // send the event to the old page - wxWizardEvent event(wxEVT_WIZARD_PAGE_CHANGING, GetId(), goingForward, m_page); + wxWizardEvent event(wxEVT_WIZARD_PAGE_CHANGING, GetId(), + goingForward, m_page); if ( m_page->GetEventHandler()->ProcessEvent(event) && !event.IsAllowed() ) { @@ -597,11 +575,10 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) btnLabelWasNext = HasNextPage(m_page); - // Get the bitmap of the previous page (if it exists) - if ( m_page->GetBitmap().Ok() ) - { - bmpPrev = m_page->GetBitmap(); - } + bmpPrev = m_page->GetBitmap(); + + if ( !m_usingSizer ) + m_sizerBmpAndPage->Detach(m_page); } // set the new page @@ -611,7 +588,7 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) if ( !m_page ) { // terminate successfully - if(IsModal()) + if ( IsModal() ) { EndModal(wxID_OK); } @@ -632,32 +609,33 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) // position and show the new page (void)m_page->TransferDataToWindow(); - // wxWizardSizer::RecalcSizes wants to be called when m_page changes - m_sizerPage->RecalcSizes(); - - // check if bitmap needs to be updated - // update default flag as well - if ( m_page->GetBitmap().Ok() ) + if ( m_usingSizer ) { - bmpCur = m_page->GetBitmap(); - bmpIsDefault = false; + // wxWizardSizer::RecalcSizes wants to be called when m_page changes + m_sizerPage->RecalcSizes(); + } + else // pages are not managed by the sizer + { + m_sizerBmpAndPage->Add(m_page, flags); + m_sizerBmpAndPage->SetItemMinSize(m_page, GetPageSize()); } #if wxUSE_STATBMP - // change the bitmap if: - // 1) a default bitmap was selected in constructor - // 2) this page was constructed with a bitmap - // 3) this bitmap is not the previous bitmap - if ( m_statbmp && (bmpCur != bmpPrev) ) + // update the bitmap if:it changed + if ( m_statbmp ) { - wxBitmap bmp; - if ( bmpIsDefault ) + wxBitmap bmp = m_page->GetBitmap(); + if ( !bmp.Ok() ) bmp = m_bitmap; - else - bmp = m_page->GetBitmap(); - m_statbmp->SetBitmap(bmp); + + if ( !bmpPrev.Ok() ) + bmpPrev = m_bitmap; + + if ( bmp != bmpPrev ) + m_statbmp->SetBitmap(bmp); } -#endif +#endif // wxUSE_STATBMP + // and update the buttons state m_btnPrev->Enable(HasPrevPage(m_page)); @@ -665,15 +643,13 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) bool hasNext = HasNextPage(m_page); if ( btnLabelWasNext != hasNext ) { - // need to update - if (btnLabelWasNext) - m_btnNext->SetLabel(_("&Finish")); - else - m_btnNext->SetLabel(_("&Next >")); + m_btnNext->SetLabel(hasNext ? _("&Next >") : _("&Finish")); } - m_btnNext->SetDefault(); // nothing to do: the label was already correct + m_btnNext->SetDefault(); + + // send the change event to the new page now wxWizardEvent event(wxEVT_WIZARD_PAGE_CHANGED, GetId(), goingForward, m_page); (void)m_page->GetEventHandler()->ProcessEvent(event); @@ -682,6 +658,21 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) m_page->Show(); m_page->SetFocus(); + if ( !m_usingSizer ) + m_sizerBmpAndPage->Layout(); + + if ( !m_started ) + { + m_started = true; + + if ( wxSystemSettings::GetScreenType() > wxSYS_SCREEN_PDA ) + { + GetSizer()->SetSizeHints(this); + if ( m_posWizard == wxDefaultPosition ) + CentreOnScreen(); + } + } + return true; } @@ -689,10 +680,6 @@ bool wxWizard::RunWizard(wxWizardPage *firstPage) { wxCHECK_MSG( firstPage, false, wxT("can't run empty wizard") ); - // This cannot be done sooner, because user can change layout options - // up to this moment - FinishLayout(); - // can't return false here because there is no old page (void)ShowPage(firstPage, true /* forward */); @@ -707,48 +694,53 @@ wxWizardPage *wxWizard::GetCurrentPage() const } wxSize wxWizard::GetPageSize() const -{ - wxSize pageSize(GetManualPageSize()); - pageSize.IncTo(m_sizerPage->GetMaxChildSize()); - return pageSize; -} - -wxSizer *wxWizard::GetPageAreaSizer() const -{ - return m_sizerPage; -} - -void wxWizard::SetBorder(int border) -{ - wxCHECK_RET(!m_started,wxT("wxWizard::SetBorder after RunWizard")); - - m_calledSetBorder = true; - m_border = border; -} - -wxSize wxWizard::GetManualPageSize() const { // default width and height of the page - int DEFAULT_PAGE_WIDTH = 270; - int DEFAULT_PAGE_HEIGHT = 270; - bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); - if (isPda) + int DEFAULT_PAGE_WIDTH, + DEFAULT_PAGE_HEIGHT; + if ( wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA ) { // Make the default page size small enough to fit on screen DEFAULT_PAGE_WIDTH = wxSystemSettings::GetMetric(wxSYS_SCREEN_X) / 2; DEFAULT_PAGE_HEIGHT = wxSystemSettings::GetMetric(wxSYS_SCREEN_Y) / 2; } + else // !PDA + { + DEFAULT_PAGE_WIDTH = + DEFAULT_PAGE_HEIGHT = 270; + } - wxSize totalPageSize(DEFAULT_PAGE_WIDTH,DEFAULT_PAGE_HEIGHT); + // start with default minimal size + wxSize pageSize(DEFAULT_PAGE_WIDTH, DEFAULT_PAGE_HEIGHT); - totalPageSize.IncTo(m_sizePage); + // make the page at least as big as specified by user + pageSize.IncTo(m_sizePage); if ( m_statbmp ) { - totalPageSize.IncTo(wxSize(0, m_bitmap.GetHeight())); + // make the page at least as tall as the bitmap + pageSize.IncTo(wxSize(0, m_bitmap.GetHeight())); } - return totalPageSize; + if ( m_usingSizer ) + { + // make it big enough to contain all pages added to the sizer + pageSize.IncTo(m_sizerPage->GetMaxChildSize()); + } + + return pageSize; +} + +wxSizer *wxWizard::GetPageAreaSizer() const +{ + return m_sizerPage; +} + +void wxWizard::SetBorder(int border) +{ + wxCHECK_RET(!m_started, wxT("wxWizard::SetBorder after RunWizard")); + + m_border = border; } void wxWizard::OnCancel(wxCommandEvent& WXUNUSED(eventUnused)) @@ -805,7 +797,7 @@ void wxWizard::OnBackOrNext(wxCommandEvent& event) wxASSERT_MSG( page, wxT("\"