X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a0a48a3f0d4c0478177c4668ba8d4aab9ba9b426..1fd1922a49351a377bc6ef8f7e00f150112ee096:/src/generic/wizard.cpp?ds=sidebyside diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp index fba5373b09..c57773d6ce 100644 --- a/src/generic/wizard.cpp +++ b/src/generic/wizard.cpp @@ -21,7 +21,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation ".h" + #pragma implementation "wizardg.h" #endif // For compilers that support precompilation, includes "wx.h". @@ -57,10 +57,18 @@ WX_DEFINE_ARRAY(wxPanel *, wxArrayPages); DEFINE_EVENT_TYPE(wxEVT_WIZARD_PAGE_CHANGED) DEFINE_EVENT_TYPE(wxEVT_WIZARD_PAGE_CHANGING) DEFINE_EVENT_TYPE(wxEVT_WIZARD_CANCEL) +DEFINE_EVENT_TYPE(wxEVT_WIZARD_HELP) BEGIN_EVENT_TABLE(wxWizard, wxDialog) EVT_BUTTON(wxID_CANCEL, wxWizard::OnCancel) - EVT_BUTTON(-1, wxWizard::OnBackOrNext) + EVT_BUTTON(wxID_BACKWARD, wxWizard::OnBackOrNext) + 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_HELP(-1, wxWizard::OnWizEvent) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxWizard, wxDialog) @@ -76,23 +84,41 @@ IMPLEMENT_DYNAMIC_CLASS(wxWizardEvent, wxNotifyEvent) // wxWizardPage // ---------------------------------------------------------------------------- +void wxWizardPage::Init() +{ + m_bitmap = wxNullBitmap; +} + wxWizardPage::wxWizardPage(wxWizard *parent, const wxBitmap& bitmap, const wxChar *resource) - : wxPanel(parent) { + Create(parent, bitmap, resource); +} + +bool wxWizardPage::Create(wxWizard *parent, + const wxBitmap& bitmap, + const wxChar *resource) +{ + 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 } - m_PageBitmap = bitmap; + m_bitmap = bitmap; // initially the page is hidden, it's shown only when it becomes current Hide(); + + return TRUE; } // ---------------------------------------------------------------------------- @@ -128,6 +154,7 @@ bool wxWizard::Create(wxWindow *parent, { 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; @@ -253,6 +280,32 @@ void wxWizard::SetPageSize(const wxSize& size) 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()!") ); + + 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; + + 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") ); @@ -261,9 +314,18 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) // button or not (initially the label is "Next") bool btnLabelWasNext = TRUE; - // and this tells us whether we already had the default bitmap before - int bmpWasDefault; + // 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; + + // check for previous page if ( m_page ) { // send the event to the old page @@ -278,15 +340,15 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) m_page->Hide(); btnLabelWasNext = m_page->GetNext() != (wxWizardPage *)NULL; - bmpWasDefault = !m_page->GetBitmap().Ok(); - } - else // no previous page - { - // always set the bitmap - bmpWasDefault = -1; + + // Get the bitmap of the previous page (if it exists) + if ( m_page->GetBitmap().Ok() ) + { + bmpPrev = m_page->GetBitmap(); + } } - // set the new one + // set the new page m_page = page; // is this the end? @@ -294,22 +356,26 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) { // terminate successfully EndModal(wxID_OK); - return TRUE; } - // send the event to the new page now - wxWizardEvent event(wxEVT_WIZARD_PAGE_CHANGED, GetId(), goingForward); - (void)m_page->GetEventHandler()->ProcessEvent(event); - // position and show the new page (void)m_page->TransferDataToWindow(); m_page->SetSize(m_x, m_y, m_width, m_height); - m_page->Show(); - // change the bitmap if necessary (and if we have it at all) - int bmpIsDefault = !m_page->GetBitmap().Ok(); - if ( m_statbmp && (bmpIsDefault != bmpWasDefault) ) + // check if bitmap needs to be updated + // update default flag as well + if ( m_page->GetBitmap().Ok() ) + { + bmpCur = m_page->GetBitmap(); + bmpIsDefault = FALSE; + } + + // 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) ) { wxBitmap bmp; if ( bmpIsDefault ) @@ -333,6 +399,14 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) } // nothing to do: the label was already correct + // send the change event to the new page now + wxWizardEvent event(wxEVT_WIZARD_PAGE_CHANGED, GetId(), goingForward); + (void)m_page->GetEventHandler()->ProcessEvent(event); + + // and finally show it + m_page->Show(); + m_page->SetFocus(); + return TRUE; } @@ -410,6 +484,38 @@ void wxWizard::OnBackOrNext(wxCommandEvent& event) (void)ShowPage(page, forward); } +void wxWizard::OnHelp(wxCommandEvent& WXUNUSED(event)) +{ + // this function probably can never be called when we don't have an active + // page, but a small extra check won't hurt + if(m_page != NULL) + { + // Create and send the help event to the specific page handler + // event data contains the active page so that context-sensitive + // help is possible + wxWizardEvent eventHelp(wxEVT_WIZARD_HELP, GetId(), TRUE, m_page); + (void)m_page->GetEventHandler()->ProcessEvent(eventHelp); + } +} + +void wxWizard::OnWizEvent(wxWizardEvent& event) +{ + // the dialogs have wxWS_EX_BLOCK_EVENTS style on by default but we want to + // propagate wxEVT_WIZARD_XXX to the parent (if any), so do it manually + if ( !(GetExtraStyle() & wxWS_EX_BLOCK_EVENTS) ) + { + // the event will be propagated anyhow + return; + } + + wxWindow *parent = GetParent(); + + if ( !parent || !parent->GetEventHandler()->ProcessEvent(event) ) + { + event.Skip(); + } +} + // ---------------------------------------------------------------------------- // our public interface // ---------------------------------------------------------------------------- @@ -429,10 +535,13 @@ wxWizard *wxWizardBase::Create(wxWindow *parent, // wxWizardEvent // ---------------------------------------------------------------------------- -wxWizardEvent::wxWizardEvent(wxEventType type, int id, bool direction) +wxWizardEvent::wxWizardEvent(wxEventType type, int id, bool direction, wxWizardPage* page) : wxNotifyEvent(type, id) { + // Modified 10-20-2001 Robert Cavanaugh + // add the active page to the event data m_direction = direction; + m_page = page; } #endif // wxUSE_WIZARDDLG