X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6aa89a22b8e47000c98bff05c6f545f331f1c353..9a7b7798282622e445efc3318b6c85ff0bed9af8:/src/generic/wizard.cpp diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp index 6187785c05..c3d603509e 100644 --- a/src/generic/wizard.cpp +++ b/src/generic/wizard.cpp @@ -1,11 +1,12 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: generic/wizard.cpp +// Name: src/generic/wizard.cpp // Purpose: generic implementation of wxWizard class // Author: Vadim Zeitlin // Modified by: Robert Cavanaugh // 1) Added capability for wxWizardPage to accept resources // 2) Added "Help" button handler stub // 3) Fixed ShowPage() bug on displaying bitmaps +// Robert Vazan (sizers) // Created: 15.08.99 // RCS-ID: $Id$ // Copyright: (c) 1999 Vadim Zeitlin @@ -20,10 +21,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "wizardg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -38,12 +35,46 @@ #include "wx/intl.h" #include "wx/statbmp.h" #include "wx/button.h" + #include "wx/settings.h" + #include "wx/sizer.h" #endif //WX_PRECOMP #include "wx/statline.h" #include "wx/wizard.h" +// ---------------------------------------------------------------------------- +// wxWizardSizer +// ---------------------------------------------------------------------------- + +class wxWizardSizer : public wxSizer +{ +public: + wxWizardSizer(wxWizard *owner); + + virtual wxSizerItem *Insert(size_t index, wxSizerItem *item); + + virtual void RecalcSizes(); + virtual wxSize CalcMin(); + + // get the max size of all wizard pages + wxSize GetMaxChildSize(); + + // return the border which can be either set using wxWizard::SetBorder() or + // have default value + int GetBorder() const; + + // hide the pages which we temporarily "show" when they're added to this + // sizer (see Insert()) + void HidePages(); + +private: + wxSize SiblingSize(wxSizerItem *child); + + wxWizard *m_owner; + wxSize m_childSize; +}; + // ---------------------------------------------------------------------------- // event tables and such // ---------------------------------------------------------------------------- @@ -60,14 +91,22 @@ BEGIN_EVENT_TABLE(wxWizard, wxDialog) EVT_BUTTON(wxID_FORWARD, wxWizard::OnBackOrNext) EVT_BUTTON(wxID_HELP, wxWizard::OnHelp) - EVT_WIZARD_PAGE_CHANGED(-1, wxWizard::OnWizEvent) - EVT_WIZARD_PAGE_CHANGING(-1, wxWizard::OnWizEvent) - EVT_WIZARD_CANCEL(-1, wxWizard::OnWizEvent) - EVT_WIZARD_FINISHED(-1, wxWizard::OnWizEvent) - EVT_WIZARD_HELP(-1, wxWizard::OnWizEvent) + EVT_WIZARD_PAGE_CHANGED(wxID_ANY, wxWizard::OnWizEvent) + EVT_WIZARD_PAGE_CHANGING(wxID_ANY, wxWizard::OnWizEvent) + EVT_WIZARD_CANCEL(wxID_ANY, wxWizard::OnWizEvent) + EVT_WIZARD_FINISHED(wxID_ANY, wxWizard::OnWizEvent) + EVT_WIZARD_HELP(wxID_ANY, wxWizard::OnWizEvent) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxWizard, wxDialog) + +/* + TODO PROPERTIES : + wxWizard + extstyle + title +*/ + IMPLEMENT_ABSTRACT_CLASS(wxWizardPage, wxPanel) IMPLEMENT_DYNAMIC_CLASS(wxWizardPageSimple, wxWizardPage) IMPLEMENT_DYNAMIC_CLASS(wxWizardEvent, wxNotifyEvent) @@ -86,35 +125,23 @@ void wxWizardPage::Init() } wxWizardPage::wxWizardPage(wxWizard *parent, - const wxBitmap& bitmap, - const wxChar *resource) + const wxBitmap& bitmap) { - Create(parent, bitmap, resource); + Create(parent, bitmap); } bool wxWizardPage::Create(wxWizard *parent, - const wxBitmap& bitmap, - const wxChar *resource) + const wxBitmap& bitmap) { - if ( !wxPanel::Create(parent, -1) ) - return FALSE; - - if ( resource != NULL ) - { -#if wxUSE_WX_RESOURCES - if ( !LoadFromResource(this, resource) ) - { - wxFAIL_MSG(wxT("wxWizardPage LoadFromResource failed!!!!")); - } -#endif // wxUSE_RESOURCES - } + if ( !wxPanel::Create(parent, wxID_ANY) ) + return false; m_bitmap = bitmap; // initially the page is hidden, it's shown only when it becomes current Hide(); - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -130,6 +157,126 @@ wxWizardPage *wxWizardPageSimple::GetNext() const { return m_next; } + +// ---------------------------------------------------------------------------- +// wxWizardSizer +// ---------------------------------------------------------------------------- + +wxWizardSizer::wxWizardSizer(wxWizard *owner) + : m_owner(owner), + m_childSize(wxDefaultSize) +{ +} + +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 + // taken into account for the layout -- but avoid really showing it, so + // just set the internal flag instead of calling wxWindow::Show() + item->GetWindow()->wxWindowBase::Show(); + } + + return wxSizer::Insert(index, item); +} + +void wxWizardSizer::HidePages() +{ + for ( wxSizerItemList::compatibility_iterator node = GetChildren().GetFirst(); + node; + node = node->GetNext() ) + { + wxSizerItem * const item = node->GetData(); + if ( item->IsWindow() ) + item->GetWindow()->wxWindowBase::Show(false); + } +} + +void wxWizardSizer::RecalcSizes() +{ + // Effect of this function depends on m_owner->m_page and + // it should be called whenever it changes (wxWizard::ShowPage) + if ( m_owner->m_page ) + { + m_owner->m_page->SetSize(wxRect(m_position, m_size)); + } +} + +wxSize wxWizardSizer::CalcMin() +{ + return m_owner->GetPageSize(); +} + +wxSize wxWizardSizer::GetMaxChildSize() +{ +#if !defined(__WXDEBUG__) + if ( m_childSize.IsFullySpecified() ) + return m_childSize; +#endif + + wxSize maxOfMin; + + for ( wxSizerItemList::compatibility_iterator childNode = m_children.GetFirst(); + childNode; + childNode = childNode->GetNext() ) + { + wxSizerItem *child = childNode->GetData(); + maxOfMin.IncTo(child->CalcMin()); + maxOfMin.IncTo(SiblingSize(child)); + } + +#ifdef __WXDEBUG__ + if ( m_childSize.IsFullySpecified() && m_childSize != maxOfMin ) + { + wxFAIL_MSG( _T("Size changed in wxWizard::GetPageAreaSizer()") + _T("after RunWizard().\n") + _T("Did you forget to call GetSizer()->Fit(this) ") + _T("for some page?")) ; + + return m_childSize; + } +#endif // __WXDEBUG__ + + if ( m_owner->m_started ) + { + m_childSize = maxOfMin; + } + + return maxOfMin; +} + +int wxWizardSizer::GetBorder() const +{ + return m_owner->m_border; +} + +wxSize wxWizardSizer::SiblingSize(wxSizerItem *child) +{ + wxSize maxSibling; + + if ( child->IsWindow() ) + { + wxWizardPage *page = wxDynamicCast(child->GetWindow(), wxWizardPage); + if ( page ) + { + for ( wxWizardPage *sibling = page->GetNext(); + sibling; + sibling = sibling->GetNext() ) + { + if ( sibling->GetSizer() ) + { + maxSibling.IncTo(sibling->GetSizer()->CalcMin()); + } + } + } + } + + return maxSibling; +} + // ---------------------------------------------------------------------------- // generic wxWizard implementation // ---------------------------------------------------------------------------- @@ -140,51 +287,98 @@ void wxWizard::Init() m_page = (wxWizardPage *)NULL; m_btnPrev = m_btnNext = NULL; m_statbmp = NULL; + m_sizerBmpAndPage = NULL; + m_sizerPage = NULL; + m_border = 5; + m_started = false; + m_wasModal = false; + m_usingSizer = false; } bool wxWizard::Create(wxWindow *parent, - int id, - const wxString& title, - const wxBitmap& bitmap, - const wxPoint& pos) + int id, + const wxString& title, + const wxBitmap& bitmap, + const wxPoint& pos, + long style) { + bool result = wxDialog::Create(parent,id,title,pos,wxDefaultSize,style); + m_posWizard = pos; m_bitmap = bitmap ; - // just create the dialog itself here, the controls will be created in - // DoCreateControls() called later when we know our final size - m_page = (wxWizardPage *)NULL; - m_btnPrev = m_btnNext = NULL; - m_statbmp = NULL; + DoCreateControls(); - return wxDialog::Create(parent, id, title, pos); + return result; } -void wxWizard::DoCreateControls() +wxWizard::~wxWizard() { - // do nothing if the controls were already created - if ( WasCreated() ) - return; - - // constants defining the dialog layout - // ------------------------------------ - - // these constants define the position of the upper left corner of the - // bitmap or the page in the wizard - static const int X_MARGIN = 10; - static const int Y_MARGIN = 10; + // normally we don't have to delete this sizer as it's deleted by the + // associated window but if we never used it or didn't set it as the window + // sizer yet, do delete it manually + if ( !m_usingSizer || !m_started ) + delete m_sizerPage; +} - // margin between the bitmap and the panel - static const int BITMAP_X_MARGIN = 15; +void wxWizard::AddBitmapRow(wxBoxSizer *mainColumn) +{ + m_sizerBmpAndPage = new wxBoxSizer(wxHORIZONTAL); + mainColumn->Add( + m_sizerBmpAndPage, + 1, // Vertically stretchable + wxEXPAND // Horizonal stretching, no border + ); + mainColumn->Add(0,5, + 0, // No vertical stretching + wxEXPAND // No border, (mostly useless) horizontal stretching + ); + +#if wxUSE_STATBMP + if ( m_bitmap.Ok() ) + { + m_statbmp = new wxStaticBitmap(this, wxID_ANY, m_bitmap); + m_sizerBmpAndPage->Add( + m_statbmp, + 0, // No horizontal stretching + wxALL, // Border all around, top alignment + 5 // Border width + ); + m_sizerBmpAndPage->Add( + 5,0, + 0, // No horizontal stretching + wxEXPAND // No border, (mostly useless) vertical stretching + ); + } +#endif - // margin between the bitmap and the static line - static const int BITMAP_Y_MARGIN = 15; + // Added to m_sizerBmpAndPage later + m_sizerPage = new wxWizardSizer(this); +} - // margin between the static line and the buttons - static const int SEPARATOR_LINE_MARGIN = 15; +void wxWizard::AddStaticLine(wxBoxSizer *mainColumn) +{ +#if wxUSE_STATLINE + mainColumn->Add( + new wxStaticLine(this, wxID_ANY), + 0, // Vertically unstretchable + wxEXPAND | wxALL, // Border all around, horizontally stretchable + 5 // Border width + ); + mainColumn->Add(0,5, + 0, // No vertical stretching + wxEXPAND // No border, (mostly useless) horizontal stretching + ); +#else + (void)mainColumn; +#endif // wxUSE_STATLINE +} - // margin between "Next >" and "Cancel" buttons - static const int BUTTON_MARGIN = 10; +void wxWizard::AddBackNextPair(wxBoxSizer *buttonRow) +{ + wxASSERT_MSG( m_btnNext && m_btnPrev, + _T("You must create the buttons before calling ") + _T("wxWizard::AddBackNextPair") ); // margin between Back and Next buttons #ifdef __WXMAC__ @@ -193,164 +387,193 @@ void wxWizard::DoCreateControls() static const int BACKNEXT_MARGIN = 0; #endif - // default width and height of the page - static const int DEFAULT_PAGE_WIDTH = 270; - static const int DEFAULT_PAGE_HEIGHT = 290; - - // create controls - // --------------- - - wxSize sizeBtn = wxButton::GetDefaultSize(); - - // the global dialog layout is: a row of buttons at the bottom (aligned to - // the right), the static line above them, the bitmap (if any) on the left - // of the upper part of the dialog and the panel in the remaining space - m_x = X_MARGIN; - m_y = Y_MARGIN; + wxBoxSizer *backNextPair = new wxBoxSizer(wxHORIZONTAL); + buttonRow->Add( + backNextPair, + 0, // No horizontal stretching + wxALL, // Border all around + 5 // Border width + ); + + backNextPair->Add(m_btnPrev); + backNextPair->Add(BACKNEXT_MARGIN,0, + 0, // No horizontal stretching + wxEXPAND // No border, (mostly useless) vertical stretching + ); + backNextPair->Add(m_btnNext); +} - int defaultHeight; - if ( m_bitmap.Ok() ) - { - m_statbmp = new wxStaticBitmap(this, -1, m_bitmap, wxPoint(m_x, m_y)); +void wxWizard::AddButtonRow(wxBoxSizer *mainColumn) +{ + // the order in which the buttons are created determines the TAB order - at least under MSWindows... + // although the 'back' button appears before the 'next' button, a more userfriendly tab order is + // to activate the 'next' button first (create the next button before the back button). + // The reason is: The user will repeatedly enter information in the wizard pages and then wants to + // press 'next'. If a user uses mostly the keyboard, he would have to skip the 'back' button + // everytime. This is annoying. There is a second reason: RETURN acts as TAB. If the 'next' + // button comes first in the TAB order, the user can enter information very fast using the RETURN + // key to TAB to the next entry field and page. This would not be possible, if the 'back' button + // was created before the 'next' button. + + bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); + int buttonStyle = isPda ? wxBU_EXACTFIT : 0; + + wxBoxSizer *buttonRow = new wxBoxSizer(wxHORIZONTAL); +#ifdef __WXMAC__ + if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON) + mainColumn->Add( + buttonRow, + 0, // Vertically unstretchable + wxGROW|wxALIGN_CENTRE + ); + else +#endif + mainColumn->Add( + buttonRow, + 0, // Vertically unstretchable + wxALIGN_RIGHT // Right aligned, no border + ); + + // Desired TAB order is 'next', 'cancel', 'help', 'back'. This makes the 'back' button the last control on the page. + // Create the buttons in the right order... + wxButton *btnHelp=0; +#ifdef __WXMAC__ + if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON) + btnHelp=new wxButton(this, wxID_HELP, _("&Help"), wxDefaultPosition, wxDefaultSize, buttonStyle); +#endif - m_x += m_bitmap.GetWidth() + BITMAP_X_MARGIN; + m_btnNext = new wxButton(this, wxID_FORWARD, _("&Next >")); + wxButton *btnCancel=new wxButton(this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, buttonStyle); +#ifndef __WXMAC__ + if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON) + btnHelp=new wxButton(this, wxID_HELP, _("&Help"), wxDefaultPosition, wxDefaultSize, buttonStyle); +#endif + m_btnPrev = new wxButton(this, wxID_BACKWARD, _("< &Back"), wxDefaultPosition, wxDefaultSize, buttonStyle); - defaultHeight = m_bitmap.GetHeight(); - } - else + if (btnHelp) { - m_statbmp = (wxStaticBitmap *)NULL; - - defaultHeight = DEFAULT_PAGE_HEIGHT; + buttonRow->Add( + btnHelp, + 0, // Horizontally unstretchable + wxALL, // Border all around, top aligned + 5 // Border width + ); +#ifdef __WXMAC__ + // Put stretchable space between help button and others + buttonRow->Add(0, 0, 1, wxALIGN_CENTRE, 0); +#endif } - // use default size if none given and also make sure that the dialog is - // not less than the default size - m_height = m_sizePage.y == -1 ? defaultHeight : m_sizePage.y; - m_width = m_sizePage.x == -1 ? DEFAULT_PAGE_WIDTH : m_sizePage.x; - if ( m_height < defaultHeight ) - m_height = defaultHeight; - if ( m_width < DEFAULT_PAGE_WIDTH ) - m_width = DEFAULT_PAGE_WIDTH; - - int x = X_MARGIN; - int y = m_y + m_height + BITMAP_Y_MARGIN; - -#if wxUSE_STATLINE - (void)new wxStaticLine(this, -1, wxPoint(x, y), - wxSize(m_x + m_width - x, 2)); -#endif // wxUSE_STATLINE + AddBackNextPair(buttonRow); - x = m_x + m_width - 3*sizeBtn.x - BUTTON_MARGIN - BACKNEXT_MARGIN; - y += SEPARATOR_LINE_MARGIN; + buttonRow->Add( + btnCancel, + 0, // Horizontally unstretchable + wxALL, // Border all around, top aligned + 5 // Border width + ); +} - if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON) - { - x -= sizeBtn.x; - x -= BUTTON_MARGIN ; +void wxWizard::DoCreateControls() +{ + // do nothing if the controls were already created + if ( WasCreated() ) + return; - (void)new wxButton(this, wxID_HELP, _("&Help"), wxPoint(x, y), sizeBtn); - x += sizeBtn.x; - x += BUTTON_MARGIN ; - } + bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); - m_btnPrev = new wxButton(this, wxID_BACKWARD, _("< &Back"), wxPoint(x, y), sizeBtn); + // Horizontal stretching, and if not PDA, border all around + int mainColumnSizerFlags = isPda ? wxEXPAND : wxALL|wxEXPAND ; - x += sizeBtn.x; - x += BACKNEXT_MARGIN; + // wxWindow::SetSizer will be called at end + wxBoxSizer *windowSizer = new wxBoxSizer(wxVERTICAL); - m_btnNext = new wxButton(this, wxID_FORWARD, _("&Next >"), wxPoint(x, y), sizeBtn); + wxBoxSizer *mainColumn = new wxBoxSizer(wxVERTICAL); + windowSizer->Add( + mainColumn, + 1, // Vertical stretching + mainColumnSizerFlags, + 5 // Border width + ); - x += sizeBtn.x + BUTTON_MARGIN; - (void)new wxButton(this, wxID_CANCEL, _("&Cancel"), wxPoint(x, y), sizeBtn); + AddBitmapRow(mainColumn); - // position and size the dialog - // ---------------------------- + if (!isPda) + AddStaticLine(mainColumn); - SetClientSize(m_x + m_width + X_MARGIN, - m_y + m_height + BITMAP_Y_MARGIN + - SEPARATOR_LINE_MARGIN + sizeBtn.y + Y_MARGIN); + AddButtonRow(mainColumn); - if ( m_posWizard == wxDefaultPosition ) - { - CentreOnScreen(); - } + SetSizer(windowSizer); } void wxWizard::SetPageSize(const wxSize& size) { - // otherwise it will have no effect now as it's too late... - wxASSERT_MSG( !WasCreated(), _T("should be called before RunWizard()!") ); - + wxCHECK_RET(!m_started, wxT("wxWizard::SetPageSize after RunWizard")); m_sizePage = size; } void wxWizard::FitToPage(const wxWizardPage *page) { - // otherwise it will have no effect now as it's too late... - wxASSERT_MSG( !WasCreated(), _T("should be called before RunWizard()!") ); + wxCHECK_RET(!m_started, wxT("wxWizard::FitToPage after RunWizard")); - wxSize sizeMax; while ( page ) { wxSize size = page->GetBestSize(); - if ( size.x > sizeMax.x ) - sizeMax.x = size.x; - - if ( size.y > sizeMax.y ) - sizeMax.y = size.y; + m_sizePage.IncTo(size); page = page->GetNext(); } - - if ( sizeMax.x > m_sizePage.x ) - m_sizePage.x = sizeMax.x; - - if ( sizeMax.y > m_sizePage.y ) - m_sizePage.y = sizeMax.y; } bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) { wxASSERT_MSG( page != m_page, wxT("this is useless") ); - // 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; + wxSizerFlags flags(1); + flags.Border(wxALL, m_border).Expand(); + + if ( !m_started ) + { + if ( m_usingSizer ) + { + m_sizerBmpAndPage->Add(m_sizerPage, flags); - // Modified 10-20-2001 Robert Cavanaugh. - // Fixed bug for displaying a new bitmap - // in each *consecutive* page + // now that our layout is computed correctly, hide the pages + // artificially shown in wxWizardSizer::Insert() back again + m_sizerPage->HidePages(); + } + } - // 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; + // 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; + + // 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() ) { // vetoed by the page - return FALSE; + return false; } m_page->Hide(); 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 @@ -360,40 +583,54 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) if ( !m_page ) { // terminate successfully - EndModal(wxID_OK); - if ( !IsModal() ) - { - wxWizardEvent event(wxEVT_WIZARD_FINISHED, GetId(),FALSE, 0); - (void)GetEventHandler()->ProcessEvent(event); - } - return TRUE; + if ( IsModal() ) + { + EndModal(wxID_OK); + } + else + { + SetReturnCode(wxID_OK); + Hide(); + } + + // and notify the user code (this is especially useful for modeless + // wizards) + wxWizardEvent event(wxEVT_WIZARD_FINISHED, GetId(), false, 0); + (void)GetEventHandler()->ProcessEvent(event); + + return true; } // position and show the new page (void)m_page->TransferDataToWindow(); - m_page->SetSize(m_x, m_y, m_width, m_height); - // check if bitmap needs to be updated - // update default flag as well - if ( m_page->GetBitmap().Ok() ) + if ( m_usingSizer ) + { + // wxWizardSizer::RecalcSizes wants to be called when m_page changes + m_sizerPage->RecalcSizes(); + } + else // pages are not managed by the sizer { - bmpCur = m_page->GetBitmap(); - bmpIsDefault = FALSE; + m_sizerBmpAndPage->Add(m_page, flags); + m_sizerBmpAndPage->SetItemMinSize(m_page, GetPageSize()); } - // 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) ) +#if wxUSE_STATBMP + // 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.IsSameAs(bmpPrev) ) + m_statbmp->SetBitmap(bmp); } +#endif // wxUSE_STATBMP + // and update the buttons state m_btnPrev->Enable(HasPrevPage(m_page)); @@ -401,14 +638,16 @@ 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 + if ( hasNext ) m_btnNext->SetLabel(_("&Next >")); + else + m_btnNext->SetLabel(_("&Finish")); } // 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); @@ -417,17 +656,32 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) m_page->Show(); m_page->SetFocus(); - return TRUE; + 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; } bool wxWizard::RunWizard(wxWizardPage *firstPage) { - wxCHECK_MSG( firstPage, FALSE, wxT("can't run empty wizard") ); + wxCHECK_MSG( firstPage, false, wxT("can't run empty wizard") ); - DoCreateControls(); + // can't return false here because there is no old page + (void)ShowPage(firstPage, true /* forward */); - // can't return FALSE here because there is no old page - (void)ShowPage(firstPage, TRUE /* forward */); + m_wasModal = true; return ShowModal() == wxID_OK; } @@ -439,24 +693,73 @@ wxWizardPage *wxWizard::GetCurrentPage() const wxSize wxWizard::GetPageSize() const { - // make sure that the controls are created because otherwise m_width and - // m_height would be both still -1 - wxConstCast(this, wxWizard)->DoCreateControls(); + // default width and height of the page + 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; + } + + // start with default minimal size + wxSize pageSize(DEFAULT_PAGE_WIDTH, DEFAULT_PAGE_HEIGHT); + + // make the page at least as big as specified by user + pageSize.IncTo(m_sizePage); + + if ( m_statbmp ) + { + // make the page at least as tall as the bitmap + pageSize.IncTo(wxSize(0, m_bitmap.GetHeight())); + } + + if ( m_usingSizer ) + { + // make it big enough to contain all pages added to the sizer + pageSize.IncTo(m_sizerPage->GetMaxChildSize()); + } - return wxSize(m_width, m_height); + return pageSize; } -void wxWizard::OnCancel(wxCommandEvent& WXUNUSED(event)) +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)) { // this function probably can never be called when we don't have an active // page, but a small extra check won't hurt wxWindow *win = m_page ? (wxWindow *)m_page : (wxWindow *)this; - wxWizardEvent event(wxEVT_WIZARD_CANCEL, GetId(), FALSE, m_page); + wxWizardEvent event(wxEVT_WIZARD_CANCEL, GetId(), false, m_page); if ( !win->GetEventHandler()->ProcessEvent(event) || event.IsAllowed() ) { // no objections - close the dialog - EndModal(wxID_CANCEL); + if(IsModal()) + { + EndModal(wxID_CANCEL); + } + else + { + SetReturnCode(wxID_CANCEL); + Hide(); + } } //else: request to Cancel ignored } @@ -467,10 +770,12 @@ void wxWizard::OnBackOrNext(wxCommandEvent& event) (event.GetEventObject() == m_btnPrev), wxT("unknown button") ); + wxCHECK_RET( m_page, _T("should have a valid current page") ); + // ask the current page first: notice that we do it before calling // GetNext/Prev() because the data transfered from the controls of the page // may change the value returned by these methods - if ( m_page && !m_page->TransferDataFromWindow() ) + if ( !m_page->Validate() || !m_page->TransferDataFromWindow() ) { // the page data is incorrect, don't do anything return; @@ -490,7 +795,7 @@ void wxWizard::OnBackOrNext(wxCommandEvent& event) wxASSERT_MSG( page, wxT("\"GetEventHandler()->ProcessEvent(eventHelp); } } @@ -515,36 +820,36 @@ void wxWizard::OnWizEvent(wxWizardEvent& event) if ( !(GetExtraStyle() & wxWS_EX_BLOCK_EVENTS) ) { // the event will be propagated anyhow - return; + event.Skip(); } + else + { + wxWindow *parent = GetParent(); - wxWindow *parent = GetParent(); + if ( !parent || !parent->GetEventHandler()->ProcessEvent(event) ) + { + event.Skip(); + } + } - if ( !parent || !parent->GetEventHandler()->ProcessEvent(event) ) + if ( ( !m_wasModal ) && + event.IsAllowed() && + ( event.GetEventType() == wxEVT_WIZARD_FINISHED || + event.GetEventType() == wxEVT_WIZARD_CANCEL + ) + ) { - event.Skip(); + Destroy(); } } -// ---------------------------------------------------------------------------- -// our public interface -// ---------------------------------------------------------------------------- - -#ifdef WXWIN_COMPATIBILITY_2_2 - -/* static */ -wxWizard *wxWizardBase::Create(wxWindow *parent, - int id, - const wxString& title, - const wxBitmap& bitmap, - const wxPoint& pos, - const wxSize& WXUNUSED(size)) +void wxWizard::SetBitmap(const wxBitmap& bitmap) { - return new wxWizard(parent, id, title, bitmap, pos); + m_bitmap = bitmap; + if (m_statbmp) + m_statbmp->SetBitmap(m_bitmap); } -#endif // WXWIN_COMPATIBILITY_2_2 - // ---------------------------------------------------------------------------- // wxWizardEvent // ----------------------------------------------------------------------------