// event tables and such
// ----------------------------------------------------------------------------
-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_FINISHED)
-DEFINE_EVENT_TYPE(wxEVT_WIZARD_HELP)
+wxDEFINE_EVENT( wxEVT_WIZARD_PAGE_CHANGED, wxWizardEvent );
+wxDEFINE_EVENT( wxEVT_WIZARD_PAGE_CHANGING, wxWizardEvent );
+wxDEFINE_EVENT( wxEVT_WIZARD_CANCEL, wxWizardEvent );
+wxDEFINE_EVENT( wxEVT_WIZARD_FINISHED, wxWizardEvent );
+wxDEFINE_EVENT( wxEVT_WIZARD_HELP, wxWizardEvent );
+wxDEFINE_EVENT( wxEVT_WIZARD_PAGE_SHOWN, wxWizardEvent );
BEGIN_EVENT_TABLE(wxWizard, wxDialog)
EVT_BUTTON(wxID_CANCEL, wxWizard::OnCancel)
wxSize wxWizardSizer::GetMaxChildSize()
{
-#if !defined(__WXDEBUG__)
- if ( m_childSize.IsFullySpecified() )
- return m_childSize;
-#endif
-
wxSize maxOfMin;
for ( wxSizerItemList::compatibility_iterator childNode = m_children.GetFirst();
maxOfMin.IncTo(SiblingSize(child));
}
- // No longer applicable since we may change sizes when size adaptation is done
-#if 0
-#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__
-#endif
-
if ( m_owner->m_started )
{
m_childSize = maxOfMin;
void wxWizard::Init()
{
m_posWizard = wxDefaultPosition;
- m_page = (wxWizardPage *)NULL;
+ m_page = NULL;
m_btnPrev = m_btnNext = NULL;
m_statbmp = NULL;
m_sizerBmpAndPage = NULL;
mainColumn->Add(
m_sizerBmpAndPage,
1, // Vertically stretchable
- wxEXPAND // Horizonal stretching, no border
+ wxEXPAND // Horizontal stretching, no border
);
mainColumn->Add(0,5,
0, // No vertical stretching
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;
-#else
- static const int BACKNEXT_MARGIN = 0;
-#endif
+ wxT("You must create the buttons before calling ")
+ wxT("wxWizard::AddBackNextPair") );
wxBoxSizer *backNextPair = new wxBoxSizer(wxHORIZONTAL);
buttonRow->Add(
);
backNextPair->Add(m_btnPrev);
- backNextPair->Add(BACKNEXT_MARGIN,0,
+ backNextPair->Add(10, 0,
0, // No horizontal stretching
wxEXPAND // No border, (mostly useless) vertical stretching
);
wxButton *btnHelp=0;
#ifdef __WXMAC__
if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON)
- btnHelp=new wxButton(this, wxID_HELP, _("&Help"), wxDefaultPosition, wxDefaultSize, buttonStyle);
+ btnHelp=new wxButton(this, wxID_HELP, wxEmptyString, wxDefaultPosition, wxDefaultSize, buttonStyle);
#endif
m_btnNext = new wxButton(this, wxID_FORWARD, _("&Next >"));
}
- // 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;
m_page->Hide();
- btnLabelWasNext = HasNextPage(m_page);
-
bmpPrev = m_page->GetBitmap();
if ( !m_usingSizer )
m_sizerBmpAndPage->Detach(m_page);
}
- // set the new page
- m_page = page;
-
// is this the end?
- if ( !m_page )
+ if ( !page )
{
// terminate successfully
if ( IsModal() )
// and notify the user code (this is especially useful for modeless
// wizards)
- wxWizardEvent event(wxEVT_WIZARD_FINISHED, GetId(), false, 0);
+ wxWizardEvent event(wxEVT_WIZARD_FINISHED, GetId(), false, m_page);
(void)GetEventHandler()->ProcessEvent(event);
+ m_page = NULL;
+
return true;
}
+ // notice that we change m_page only here so that wxEVT_WIZARD_FINISHED
+ // event above could still use the correct (i.e. old) value of m_page
+ m_page = page;
+
// position and show the new page
(void)m_page->TransferDataToWindow();
// and update the buttons state
m_btnPrev->Enable(HasPrevPage(m_page));
- bool hasNext = HasNextPage(m_page);
- if ( btnLabelWasNext != hasNext )
- {
- if ( hasNext )
- m_btnNext->SetLabel(_("&Next >"));
- else
- m_btnNext->SetLabel(_("&Finish"));
- }
- // nothing to do: the label was already correct
+ const bool hasNext = HasNextPage(m_page);
+ const wxString label = hasNext ? _("&Next >") : _("&Finish");
+ if ( label != m_btnNext->GetLabel() )
+ m_btnNext->SetLabel(label);
m_btnNext->SetDefault();
DoWizardLayout();
}
- if (GetBitmapPlacement())
+ if (GetBitmapPlacement() && m_statbmp)
{
ResizeBitmap(bmp);
-
+
if ( !bmp.IsSameAs(bmpPrev) )
m_statbmp->SetBitmap(bmp);
-
+
if (m_usingSizer)
m_sizerPage->RecalcSizes();
}
+ wxWizardEvent pageShownEvent(wxEVT_WIZARD_PAGE_SHOWN, GetId(),
+ goingForward, m_page);
+ m_page->GetEventHandler()->ProcessEvent(pageShownEvent);
+
return true;
}
(event.GetEventObject() == m_btnPrev),
wxT("unknown button") );
- wxCHECK_RET( m_page, _T("should have a valid current page") );
+ wxCHECK_RET( m_page, wxT("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
// Create a scrolled window and reparent
wxScrolledWindow* scrolledWindow = new wxScrolledWindow(page, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxVSCROLL|wxHSCROLL|wxBORDER_NONE);
wxSizer* oldSizer = page->GetSizer();
-
+
wxSizer* newSizer = new wxBoxSizer(wxVERTICAL);
newSizer->Add(scrolledWindow,1, wxEXPAND, 0);
-
+
page->SetSizer(newSizer, false /* don't delete the old sizer */);
-
+
scrolledWindow->SetSizer(oldSizer);
-
+
wxStandardDialogLayoutAdapter::DoReparentControls(page, scrolledWindow);
-
+
pages.Append(page);
windows.Append(scrolledWindow);
}
wxStandardDialogLayoutAdapter::DoFitWithScrolling(this, windows);
+ // Size event doesn't get sent soon enough on wxGTK
+ DoLayout();
+
SetLayoutAdaptationDone(true);
return true;
if (bmp.Ok())
{
wxSize pageSize = m_sizerPage->GetSize();
+ if (pageSize == wxSize(0,0))
+ pageSize = GetPageSize();
int bitmapWidth = wxMax(bmp.GetWidth(), GetMinimumBitmapWidth());
int bitmapHeight = pageSize.y;
- if (bmp.GetHeight() != bitmapHeight)
+ if (!m_statbmp->GetBitmap().Ok() || m_statbmp->GetBitmap().GetHeight() != bitmapHeight)
{
wxBitmap bitmap(bitmapWidth, bitmapHeight);
{
if (GetBitmapPlacement() & wxWIZARD_HALIGN_LEFT)
x = 0;
else if (GetBitmapPlacement() & wxWIZARD_HALIGN_RIGHT)
- x = bitmapWidth - GetBitmap().GetWidth();
+ x = bitmapWidth - bmp.GetWidth();
else
- x = (bitmapWidth - GetBitmap().GetWidth())/2;
+ x = (bitmapWidth - bmp.GetWidth())/2;
if (GetBitmapPlacement() & wxWIZARD_VALIGN_TOP)
y = 0;
else if (GetBitmapPlacement() & wxWIZARD_VALIGN_BOTTOM)
- y = bitmapHeight - GetBitmap().GetHeight();
+ y = bitmapHeight - bmp.GetHeight();
else
- y = (bitmapHeight - GetBitmap().GetHeight())/2;
+ y = (bitmapHeight - bmp.GetHeight())/2;
dc.DrawBitmap(bmp, x, y, true);
dc.SelectObject(wxNullBitmap);
projects / wxWidgets.git / blobdiff