///////////////////////////////////////////////////////////////////////////////
-// Name: generic/wizard.cpp
+// Name: src/generic/wizard.cpp
// Purpose: generic implementation of wxWizard class
// Author: Vadim Zeitlin
// Modified by: Robert Cavanaugh
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "wizardg.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#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/sizer.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
// ----------------------------------------------------------------------------
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)
const wxBitmap& bitmap,
const wxChar *resource)
{
- if ( !wxPanel::Create(parent, -1) )
- return FALSE;
+ if ( !wxPanel::Create(parent, wxID_ANY) )
+ return false;
if ( resource != NULL )
{
// initially the page is hidden, it's shown only when it becomes current
Hide();
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
// wxWizardSizer
// ----------------------------------------------------------------------------
-class wxWizardSizer : public wxSizer
+wxWizardSizer::wxWizardSizer(wxWizard *owner)
+ : m_owner(owner),
+ m_childSize(wxDefaultSize)
{
-public:
- wxWizardSizer(wxWizard *owner);
-
- void RecalcSizes();
- wxSize CalcMin();
+}
- wxSize GetMaxChildSize();
- int Border() const;
-
-private:
- wxSize SiblingSize(wxSizerItem *child);
-
- wxWizard *m_owner;
- bool m_childSizeValid;
- wxSize m_childSize;
+wxSizerItem *wxWizardSizer::Insert(size_t index, wxSizerItem *item)
+{
+ m_owner->m_usingSizer = true;
- DECLARE_CLASS(wxWizardSizer);
-};
+ 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();
+ }
-IMPLEMENT_CLASS(wxWizardSizer, wxSizer)
+ return wxSizer::Insert(index, item);
+}
-wxWizardSizer::wxWizardSizer(wxWizard *owner)
- : m_owner(owner)
+void wxWizardSizer::HidePages()
{
- m_childSizeValid = false;
+ 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()
// 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));
}
}
wxSize wxWizardSizer::GetMaxChildSize()
{
#if !defined(__WXDEBUG__)
- if ( m_childSizeValid )
+ if ( m_childSize.IsFullySpecified() )
return m_childSize;
#endif
wxSize maxOfMin;
- wxSizerItemList::Node *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());
}
#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")
if ( m_owner->m_started )
{
- m_childSizeValid = true;
m_childSize = maxOfMin;
}
-
+
return maxOfMin;
}
-int wxWizardSizer::Border() const
+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)
{
wxSize maxSibling;
-
+
if ( child->IsWindow() )
{
wxWizardPage *page = wxDynamicCast(child->GetWindow(), wxWizardPage);
}
}
}
-
+
return maxSibling;
}
m_page = (wxWizardPage *)NULL;
m_btnPrev = m_btnNext = NULL;
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,
- int id,
- const wxString& title,
- const wxBitmap& bitmap,
- const wxPoint& pos,
- long style)
+ 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 ;
DoCreateControls();
-
+
return result;
}
wxEXPAND // No border, (mostly useless) horizontal stretching
);
+#if wxUSE_STATBMP
if ( m_bitmap.Ok() )
{
- m_statbmp = new wxStaticBitmap(this, -1, m_bitmap);
+ m_statbmp = new wxStaticBitmap(this, wxID_ANY, m_bitmap);
m_sizerBmpAndPage->Add(
m_statbmp,
0, // No horizontal stretching
wxEXPAND // No border, (mostly useless) vertical stretching
);
}
- else
- m_statbmp = (wxStaticBitmap *)NULL;
+#endif
- // Added to m_sizerBmpAndPage in FinishLayout
+ // Added to m_sizerBmpAndPage later
m_sizerPage = new wxWizardSizer(this);
}
{
#if wxUSE_STATLINE
mainColumn->Add(
- new wxStaticLine(this, -1),
+ new wxStaticLine(this, wxID_ANY),
0, // Vertically unstretchable
wxEXPAND | wxALL, // Border all around, horizontally stretchable
5 // Border width
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__
static const int BACKNEXT_MARGIN = 10;
wxALL, // Border all around
5 // Border width
);
-
- m_btnPrev = new wxButton(this, wxID_BACKWARD, _("< &Back"));
+
backNextPair->Add(m_btnPrev);
backNextPair->Add(BACKNEXT_MARGIN,0,
0, // No horizontal stretching
wxEXPAND // No border, (mostly useless) vertical stretching
);
- m_btnNext = new wxButton(this, wxID_FORWARD, _("&Next >"));
backNextPair->Add(m_btnNext);
}
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_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);
+
+ if (btnHelp)
+ {
buttonRow->Add(
- new wxButton(this, wxID_HELP, _("&Help")),
+ 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
+ }
AddBackNextPair(buttonRow);
-
+
buttonRow->Add(
- new wxButton(this, wxID_CANCEL, _("&Cancel")),
+ btnCancel,
0, // Horizontally unstretchable
wxALL, // Border all around, top aligned
5 // Border width
// do nothing if the controls were already created
if ( WasCreated() )
return;
-
+
+ bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+
+ // Horizontal stretching, and if not PDA, border all around
+ int mainColumnSizerFlags = isPda ? wxEXPAND : wxALL|wxEXPAND ;
+
// wxWindow::SetSizer will be called at end
wxBoxSizer *windowSizer = new wxBoxSizer(wxVERTICAL);
-
+
wxBoxSizer *mainColumn = new wxBoxSizer(wxVERTICAL);
windowSizer->Add(
mainColumn,
1, // Vertical stretching
- wxALL | wxEXPAND, // Border all around, horizontal stretching
+ mainColumnSizerFlags,
5 // Border width
);
-
+
AddBitmapRow(mainColumn);
- AddStaticLine(mainColumn);
+
+ if (!isPda)
+ AddStaticLine(mainColumn);
+
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()
-{
- m_sizerBmpAndPage->Add(
- m_sizerPage,
- 1, // Horizontal stretching
- wxEXPAND | wxALL, // Vertically stretchable
- m_sizerPage->Border()
- );
-
- GetSizer()->SetSizeHints(this);
- if ( m_posWizard == wxDefaultPosition )
- CentreOnScreen();
-}
-
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 )
{
wxSize size = page->GetBestSize();
{
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();
- // Modified 10-20-2001 Robert Cavanaugh.
- // Fixed bug for displaying a new bitmap
- // in each *consecutive* page
+ if ( !m_started )
+ {
+ if ( m_usingSizer )
+ {
+ m_sizerBmpAndPage->Add(m_sizerPage, flags);
- // flag to indicate if this page uses a new bitmap
- bool bmpIsDefault = TRUE;
+ // now that our layout is computed correctly, hide the pages
+ // artificially shown in wxWizardSizer::Insert() back again
+ m_sizerPage->HidePages();
+ }
+ }
- // 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
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();
-
- // 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());
}
- // 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 != bmpPrev )
+ m_statbmp->SetBitmap(bmp);
}
+#endif // wxUSE_STATBMP
+
// and update the buttons state
m_btnPrev->Enable(HasPrevPage(m_page));
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"));
}
// 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);
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") );
-
- // Set before FinishLayout to enable wxWizardSizer::GetMaxChildSize
- m_started = true;
-
- // 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 */);
+ wxCHECK_MSG( firstPage, false, wxT("can't run empty wizard") );
+
+ // can't return false here because there is no old page
+ (void)ShowPage(firstPage, true /* forward */);
+
+ m_wasModal = true;
return ShowModal() == wxID_OK;
}
wxSize wxWizard::GetPageSize() const
{
- wxSize pageSize(GetManualPageSize());
- pageSize.IncTo(m_sizerPage->GetMaxChildSize());
+ // 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 pageSize;
}
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
- static const int DEFAULT_PAGE_WIDTH = 270;
- static const int DEFAULT_PAGE_HEIGHT = 290;
+ wxCHECK_RET(!m_started, wxT("wxWizard::SetBorder after RunWizard"));
- wxSize totalPageSize(DEFAULT_PAGE_WIDTH,DEFAULT_PAGE_HEIGHT);
-
- totalPageSize.IncTo(m_sizePage);
-
- if(m_statbmp)
- totalPageSize.IncTo(wxSize(0,m_bitmap.GetHeight()));
-
- return totalPageSize;
+ m_border = border;
}
void wxWizard::OnCancel(wxCommandEvent& WXUNUSED(eventUnused))
// 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
}
(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->Validate() || !m_page->TransferDataFromWindow()) )
+ if ( !m_page->Validate() || !m_page->TransferDataFromWindow() )
{
// the page data is incorrect, don't do anything
return;
wxASSERT_MSG( page, wxT("\"<Back\" button should have been disabled") );
}
- // just pass to the new page (or may be not - but we don't care here)
+ // just pass to the new page (or maybe not - but we don't care here)
(void)ShowPage(page, forward);
}
// 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);
+ wxWizardEvent eventHelp(wxEVT_WIZARD_HELP, GetId(), true, m_page);
(void)m_page->GetEventHandler()->ProcessEvent(eventHelp);
}
}
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))
-{
- return new wxWizard(parent, id, title, bitmap, pos);
-}
-
-#endif // WXWIN_COMPATIBILITY_2_2
-
// ----------------------------------------------------------------------------
// wxWizardEvent
// ----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff