X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77436c4cbac2269e564dc4fcf4494a58feca0af4..51dc95a4c8ccb00741be48f6353749ada3e9f39a:/src/generic/wizard.cpp diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp index c3a9ab8cdd..eed6e10755 100644 --- a/src/generic/wizard.cpp +++ b/src/generic/wizard.cpp @@ -2,7 +2,10 @@ // Name: generic/wizard.cpp // Purpose: generic implementation of wxWizard class // Author: Vadim Zeitlin -// Modified by: +// 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 // Created: 15.08.99 // RCS-ID: $Id$ // Copyright: (c) 1999 Vadim Zeitlin @@ -54,10 +57,13 @@ 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) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxWizard, wxDialog) @@ -73,9 +79,23 @@ IMPLEMENT_DYNAMIC_CLASS(wxWizardEvent, wxNotifyEvent) // wxWizardPage // ---------------------------------------------------------------------------- -wxWizardPage::wxWizardPage(wxWizard *parent, const wxBitmap& bitmap) - : wxPanel(parent), m_bitmap(bitmap) +wxWizardPage::wxWizardPage(wxWizard *parent, + const wxBitmap& bitmap, + const wxChar *resource) + : wxPanel(parent) { + if ( resource != NULL ) + { +#if wxUSE_RESOURCES + if ( !LoadFromResource(this, resource) ) + { + wxFAIL_MSG(wxT("wxWizardPage LoadFromResource failed!!!!")); + } +#endif // wxUSE_RESOURCES + } + + m_bitmap = bitmap; + // initially the page is hidden, it's shown only when it becomes current Hide(); } @@ -113,6 +133,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; @@ -204,7 +225,7 @@ void wxWizard::DoCreateControls() x -= sizeBtn.x; x -= BUTTON_MARGIN ; - (void*) new wxButton(this, wxID_HELP, _("&Help"), wxPoint(x, y), sizeBtn); + (void)new wxButton(this, wxID_HELP, _("&Help"), wxPoint(x, y), sizeBtn); x += sizeBtn.x; x += BUTTON_MARGIN ; } @@ -246,9 +267,19 @@ 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 PreviousBitmap = wxNullBitmap; + wxBitmap ThisBitmap = wxNullBitmap; + + // check for previous page if ( m_page ) { // send the event to the old page @@ -263,15 +294,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 + + // Get the bitmap of the previous page (if it exists) + if(m_page->GetBitmap().Ok()) { - // always set the bitmap - bmpWasDefault = -1; + PreviousBitmap = m_page->GetBitmap(); + } } - // set the new one + // set the new page m_page = page; // is this the end? @@ -279,11 +310,10 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) { // terminate successfully EndModal(wxID_OK); - return TRUE; } - // send the event to the new page now + // send the change event to the new page now wxWizardEvent event(wxEVT_WIZARD_PAGE_CHANGED, GetId(), goingForward); (void)m_page->GetEventHandler()->ProcessEvent(event); @@ -292,9 +322,19 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) 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()) + { + ThisBitmap = 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 && (ThisBitmap != PreviousBitmap) ) { wxBitmap bmp; if ( bmpIsDefault ) @@ -395,6 +435,21 @@ 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); + } +} + + // ---------------------------------------------------------------------------- // our public interface // ---------------------------------------------------------------------------- @@ -414,10 +469,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