Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no real changes; just reformatting

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-21 12:30:47 +00:00
parent 4104d2b331
commit aedd6d6aca
1 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/generic/wizard.cpp
View File

@@ -46,6 +46,29 @@
#include "wx/wizard.h" #include "wx/wizard.h"
// ----------------------------------------------------------------------------
// wxWizardSizer
// ----------------------------------------------------------------------------
class wxWizardSizer : public wxSizer
{
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;
};
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// event tables and such // event tables and such
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -139,29 +162,6 @@ wxWizardPage *wxWizardPageSimple::GetNext() const
// wxWizardSizer // wxWizardSizer
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class wxWizardSizer : public wxSizer
{
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;
DECLARE_CLASS(wxWizardSizer);
};
IMPLEMENT_CLASS(wxWizardSizer, wxSizer)
wxWizardSizer::wxWizardSizer(wxWizard *owner) wxWizardSizer::wxWizardSizer(wxWizard *owner)
: m_owner(owner) : m_owner(owner)
{ {
@@ -264,6 +264,7 @@ void wxWizard::Init()
m_page = (wxWizardPage *)NULL; m_page = (wxWizardPage *)NULL;
m_btnPrev = m_btnNext = NULL; m_btnPrev = m_btnNext = NULL;
m_statbmp = NULL; m_statbmp = NULL;
m_sizerBmpAndPage = NULL;
m_sizerPage = NULL; m_sizerPage = NULL;
m_calledSetBorder = false; m_calledSetBorder = false;
m_border = 0; m_border = 0;
@@ -315,8 +316,6 @@ void wxWizard::AddBitmapRow(wxBoxSizer *mainColumn)
wxEXPAND // No border, (mostly useless) vertical stretching wxEXPAND // No border, (mostly useless) vertical stretching
); );
} }
else
m_statbmp = (wxStaticBitmap *)NULL;
// Added to m_sizerBmpAndPage in FinishLayout // Added to m_sizerBmpAndPage in FinishLayout
m_sizerPage = new wxWizardSizer(this); m_sizerPage = new wxWizardSizer(this);
@@ -602,6 +601,7 @@ wxSizer *wxWizard::GetPageAreaSizer() const
void wxWizard::SetBorder(int border) void wxWizard::SetBorder(int border)
{ {
wxCHECK_RET(!m_started,wxT("wxWizard::SetBorder after RunWizard")); wxCHECK_RET(!m_started,wxT("wxWizard::SetBorder after RunWizard"));
m_calledSetBorder = true; m_calledSetBorder = true;
m_border = border; m_border = border;
} }
@@ -616,8 +616,10 @@ wxSize wxWizard::GetManualPageSize() const
totalPageSize.IncTo(m_sizePage); totalPageSize.IncTo(m_sizePage);
if(m_statbmp) if ( m_statbmp )
totalPageSize.IncTo(wxSize(0,m_bitmap.GetHeight())); {
totalPageSize.IncTo(wxSize(0, m_bitmap.GetHeight()));
}
return totalPageSize; return totalPageSize;
} }