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

Added userData to wxSizerItems and other things to make sizers more

Browse Source 
usable/overrideable from wxPython.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 1999-09-20 03:12:49 +00:00
parent 76f78a96ce
commit 0c0d686fe5
2 changed files with 129 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
include/wx/sizer.h
View File

@ -1,9 +1,9 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: sizer.h // Name: sizer.h
// Purpose: provide wxSizer class for layounting // Purpose: provide wxSizer class for layouting
// Author: Robert Roebling and Robin Dunn // Author: Robert Roebling and Robin Dunn
// Modified by: // Modified by:
// Created: // Created:
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Robin Dunn, Dirk Holtwick and Robert Roebling // Copyright: (c) Robin Dunn, Dirk Holtwick and Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
@ -39,27 +39,30 @@ class wxStaticBoxSizer;
class WXDLLEXPORT wxSizerItem: public wxObject class WXDLLEXPORT wxSizerItem: public wxObject
{ {
DECLARE_CLASS(wxSizerItem);
public: public:
// spacer // spacer
wxSizerItem( int width, int height, int option, int flag, int border ); wxSizerItem( int width, int height, int option, int flag, int border, wxObject* userData);
// window // window
wxSizerItem( wxWindow *window, int option, int flag, int border ); wxSizerItem( wxWindow *window, int option, int flag, int border, wxObject* userData );
// subsizer // subsizer
wxSizerItem( wxSizer *sizer, int option, int flag, int border ); wxSizerItem( wxSizer *sizer, int option, int flag, int border, wxObject* userData );
~wxSizerItem();
virtual wxSize GetSize(); virtual wxSize GetSize();
virtual wxSize CalcMin(); virtual wxSize CalcMin();
virtual void SetDimension( wxPoint pos, wxSize size ); virtual void SetDimension( wxPoint pos, wxSize size );
bool IsWindow(); bool IsWindow();
bool IsSizer(); bool IsSizer();
bool IsSpacer(); bool IsSpacer();
wxWindow *GetWindow() const wxWindow *GetWindow() const
{ return m_window; } { return m_window; }
wxSizer *GetSizer() const wxSizer *GetSizer() const
{ return m_sizer; } { return m_sizer; }
int GetOption() const int GetOption() const
{ return m_option; } { return m_option; }
@ -67,7 +70,9 @@ public:
{ return m_flag; } { return m_flag; }
int GetBorder() const int GetBorder() const
{ return m_border; } { return m_border; }
wxObject* GetUserData()
{ return m_userData; }
protected: protected:
wxWindow *m_window; wxWindow *m_window;
wxSizer *m_sizer; wxSizer *m_sizer;
@ -76,6 +81,7 @@ protected:
int m_option; int m_option;
int m_border; int m_border;
int m_flag; int m_flag;
wxObject *m_userData;
}; };
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -84,24 +90,25 @@ protected:
class WXDLLEXPORT wxSizer: public wxObject class WXDLLEXPORT wxSizer: public wxObject
{ {
DECLARE_CLASS(wxSizer);
public: public:
wxSizer(); wxSizer();
~wxSizer(); ~wxSizer();
virtual void Add( wxWindow *window, int option = 0, int flag = 0, int border = 0 ); virtual void Add( wxWindow *window, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
virtual void Add( wxSizer *sizer, int option = 0, int flag = 0, int border = 0 ); virtual void Add( wxSizer *sizer, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
virtual void Add( int width, int height, int option = 0, int flag = 0, int border = 0 ); virtual void Add( int width, int height, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
virtual void Prepend( wxWindow *window, int option = 0, int flag = 0, int border = 0 ); virtual void Prepend( wxWindow *window, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
virtual void Prepend( wxSizer *sizer, int option = 0, int flag = 0, int border = 0 ); virtual void Prepend( wxSizer *sizer, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
virtual void Prepend( int width, int height, int option = 0, int flag = 0, int border = 0 ); virtual void Prepend( int width, int height, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
virtual bool Remove( wxWindow *window ); virtual bool Remove( wxWindow *window );
virtual bool Remove( wxSizer *sizer ); virtual bool Remove( wxSizer *sizer );
virtual bool Remove( int pos ); virtual bool Remove( int pos );
void SetDimension( int x, int y, int width, int height ); void SetDimension( int x, int y, int width, int height );
wxSize GetSize() wxSize GetSize()
{ return m_size; } { return m_size; }
wxPoint GetPosition() wxPoint GetPosition()
@ -111,17 +118,20 @@ public:
virtual void RecalcSizes() = 0; virtual void RecalcSizes() = 0;
virtual wxSize CalcMin() = 0; virtual wxSize CalcMin() = 0;
virtual void Layout(); virtual void Layout();
void Fit( wxWindow *window ); void Fit( wxWindow *window );
void SetSizeHints( wxWindow *window ); void SetSizeHints( wxWindow *window );
wxList& GetChildren()
{ return m_children; }
protected: protected:
wxSize m_size; wxSize m_size;
wxPoint m_position; wxPoint m_position;
wxList m_children; wxList m_children;
wxSize GetMinWindowSize( wxWindow *window ); wxSize GetMinWindowSize( wxWindow *window );
}; };
@ -131,15 +141,16 @@ protected:
class WXDLLEXPORT wxBoxSizer: public wxSizer class WXDLLEXPORT wxBoxSizer: public wxSizer
{ {
DECLARE_CLASS(wxBoxSizer);
public: public:
wxBoxSizer( int orient ); wxBoxSizer( int orient );
void RecalcSizes(); void RecalcSizes();
wxSize CalcMin(); wxSize CalcMin();
int GetOrientation() int GetOrientation()
{ return m_orient; } { return m_orient; }
protected: protected:
int m_orient; int m_orient;
int m_stretchable; int m_stretchable;
@ -148,22 +159,23 @@ protected:
int m_fixedWidth; int m_fixedWidth;
int m_fixedHeight; int m_fixedHeight;
}; };
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxStaticBoxSizer // wxStaticBoxSizer
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
class WXDLLEXPORT wxStaticBoxSizer: public wxBoxSizer class WXDLLEXPORT wxStaticBoxSizer: public wxBoxSizer
{ {
DECLARE_CLASS(wxStaticBoxSizer);
public: public:
wxStaticBoxSizer( wxStaticBox *box, int orient ); wxStaticBoxSizer( wxStaticBox *box, int orient );
void RecalcSizes(); void RecalcSizes();
wxSize CalcMin(); wxSize CalcMin();
wxStaticBox *GetStaticBox() wxStaticBox *GetStaticBox()
{ return m_staticBox; } { return m_staticBox; }
protected: protected:
wxStaticBox *m_staticBox; wxStaticBox *m_staticBox;
}; };

153
src/common/sizer.cpp
View File

@ -3,7 +3,7 @@
// Purpose: provide new wxSizer class for layout // Purpose: provide new wxSizer class for layout
// Author: Robert Roebling and Robin Dunn // Author: Robert Roebling and Robin Dunn
// Modified by: // Modified by:
// Created: // Created:
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Robin Dunn, Dirk Holtwick and Robert Roebling // Copyright: (c) Robin Dunn, Dirk Holtwick and Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
@ -24,56 +24,75 @@
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/statbox.h" #include "wx/statbox.h"
//---------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxSizerItem, wxObject);
IMPLEMENT_ABSTRACT_CLASS(wxSizer, wxObject);
IMPLEMENT_ABSTRACT_CLASS(wxBoxSizer, wxSizer);
IMPLEMENT_ABSTRACT_CLASS(wxStaticBoxSizer, wxBoxSizer);
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxSizerItem // wxSizerItem
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
wxSizerItem::wxSizerItem( int width, int height, int option, int flag, int border ) wxSizerItem::wxSizerItem( int width, int height, int option, int flag, int border, wxObject* userData )
{ {
m_window = (wxWindow *) NULL; m_window = (wxWindow *) NULL;
m_sizer = (wxSizer *) NULL; m_sizer = (wxSizer *) NULL;
m_option = option; m_option = option;
m_border = border; m_border = border;
m_flag = flag; m_flag = flag;
m_userData = userData;
// minimal size is the initial size // minimal size is the initial size
m_minSize.x = width; m_minSize.x = width;
m_minSize.y = height; m_minSize.y = height;
// size is set directly // size is set directly
m_size = m_minSize; m_size = m_minSize;
} }
wxSizerItem::wxSizerItem( wxWindow *window, int option, int flag, int border ) wxSizerItem::wxSizerItem( wxWindow *window, int option, int flag, int border, wxObject* userData )
{ {
m_window = window; m_window = window;
m_sizer = (wxSizer *) NULL; m_sizer = (wxSizer *) NULL;
m_option = option; m_option = option;
m_border = border; m_border = border;
m_flag = flag; m_flag = flag;
m_userData = userData;
// minimal size is the initial size // minimal size is the initial size
m_minSize = window->GetSize(); m_minSize = window->GetSize();
// size is calculated later // size is calculated later
// m_size = ... // m_size = ...
} }
wxSizerItem::wxSizerItem( wxSizer *sizer, int option, int flag, int border ) wxSizerItem::wxSizerItem( wxSizer *sizer, int option, int flag, int border, wxObject* userData )
{ {
m_window = (wxWindow *) NULL; m_window = (wxWindow *) NULL;
m_sizer = sizer; m_sizer = sizer;
m_option = option; m_option = option;
m_border = border; m_border = border;
m_flag = flag; m_flag = flag;
m_userData = userData;
// minimal size is calculated later // minimal size is calculated later
// m_minSize = ... // m_minSize = ...
// size is calculated later // size is calculated later
// m_size = ... // m_size = ...
} }
wxSizerItem::~wxSizerItem()
{
if (m_userData)
delete m_userData;
if (m_sizer)
delete m_sizer;
}
wxSize wxSizerItem::GetSize() wxSize wxSizerItem::GetSize()
{ {
wxSize ret; wxSize ret;
@ -83,7 +102,7 @@ wxSize wxSizerItem::GetSize()
if (IsWindow()) if (IsWindow())
ret = m_window->GetSize(); ret = m_window->GetSize();
else ret = m_size; else ret = m_size;
if (m_flag & wxWEST) if (m_flag & wxWEST)
ret.x += m_border; ret.x += m_border;
if (m_flag & wxEAST) if (m_flag & wxEAST)
@ -92,7 +111,7 @@ wxSize wxSizerItem::GetSize()
ret.y += m_border; ret.y += m_border;
if (m_flag & wxSOUTH) if (m_flag & wxSOUTH)
ret.y += m_border; ret.y += m_border;
return ret; return ret;
} }
@ -101,17 +120,17 @@ wxSize wxSizerItem::CalcMin()
wxSize ret; wxSize ret;
if (IsSizer()) if (IsSizer())
ret = m_sizer->CalcMin(); ret = m_sizer->CalcMin();
/* /*
The minimum size of a window should be the The minimum size of a window should be the
initial size, as saved in m_minSize, not the initial size, as saved in m_minSize, not the
current size. current size.
else else
if (IsWindow()) if (IsWindow())
ret = m_window->GetSize(); ret = m_window->GetSize();
*/ */
else ret = m_minSize; else ret = m_minSize;
if (m_flag & wxWEST) if (m_flag & wxWEST)
ret.x += m_border; ret.x += m_border;
if (m_flag & wxEAST) if (m_flag & wxEAST)
@ -120,7 +139,7 @@ wxSize wxSizerItem::CalcMin()
ret.y += m_border; ret.y += m_border;
if (m_flag & wxSOUTH) if (m_flag & wxSOUTH)
ret.y += m_border; ret.y += m_border;
return ret; return ret;
} }
@ -144,10 +163,10 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
{ {
size.y -= m_border; size.y -= m_border;
} }
if (IsSizer()) if (IsSizer())
m_sizer->SetDimension( pos.x, pos.y, size.x, size.y ); m_sizer->SetDimension( pos.x, pos.y, size.x, size.y );
if (IsWindow()) if (IsWindow())
m_window->SetSize( pos.x, pos.y, size.x, size.y ); m_window->SetSize( pos.x, pos.y, size.x, size.y );
@ -181,41 +200,41 @@ wxSizer::wxSizer()
wxSizer::~wxSizer() wxSizer::~wxSizer()
{ {
} }
void wxSizer::Add( wxWindow *window, int option, int flag, int border ) void wxSizer::Add( wxWindow *window, int option, int flag, int border, wxObject* userData )
{ {
m_children.Append( new wxSizerItem( window, option, flag, border ) ); m_children.Append( new wxSizerItem( window, option, flag, border, userData ) );
} }
void wxSizer::Add( wxSizer *sizer, int option, int flag, int border ) void wxSizer::Add( wxSizer *sizer, int option, int flag, int border, wxObject* userData )
{ {
m_children.Append( new wxSizerItem( sizer, option, flag, border ) ); m_children.Append( new wxSizerItem( sizer, option, flag, border, userData ) );
} }
void wxSizer::Add( int width, int height, int option, int flag, int border ) void wxSizer::Add( int width, int height, int option, int flag, int border, wxObject* userData )
{ {
m_children.Append( new wxSizerItem( width, height, option, flag, border ) ); m_children.Append( new wxSizerItem( width, height, option, flag, border, userData ) );
} }
void wxSizer::Prepend( wxWindow *window, int option, int flag, int border ) void wxSizer::Prepend( wxWindow *window, int option, int flag, int border, wxObject* userData )
{ {
m_children.Insert( new wxSizerItem( window, option, flag, border ) ); m_children.Insert( new wxSizerItem( window, option, flag, border, userData ) );
} }
void wxSizer::Prepend( wxSizer *sizer, int option, int flag, int border ) void wxSizer::Prepend( wxSizer *sizer, int option, int flag, int border, wxObject* userData )
{ {
m_children.Insert( new wxSizerItem( sizer, option, flag, border ) ); m_children.Insert( new wxSizerItem( sizer, option, flag, border, userData ) );
} }
void wxSizer::Prepend( int width, int height, int option, int flag, int border ) void wxSizer::Prepend( int width, int height, int option, int flag, int border, wxObject* userData )
{ {
m_children.Insert( new wxSizerItem( width, height, option, flag, border ) ); m_children.Insert( new wxSizerItem( width, height, option, flag, border, userData ) );
} }
bool wxSizer::Remove( wxWindow *window ) bool wxSizer::Remove( wxWindow *window )
{ {
wxASSERT( window ); wxASSERT( window );
wxNode *node = m_children.First(); wxNode *node = m_children.First();
while (node) while (node)
{ {
@ -227,14 +246,14 @@ bool wxSizer::Remove( wxWindow *window )
} }
node = node->Next(); node = node->Next();
} }
return FALSE; return FALSE;
} }
bool wxSizer::Remove( wxSizer *sizer ) bool wxSizer::Remove( wxSizer *sizer )
{ {
wxASSERT( sizer ); wxASSERT( sizer );
wxNode *node = m_children.First(); wxNode *node = m_children.First();
while (node) while (node)
{ {
@ -246,7 +265,7 @@ bool wxSizer::Remove( wxSizer *sizer )
} }
node = node->Next(); node = node->Next();
} }
return FALSE; return FALSE;
} }
@ -254,12 +273,12 @@ bool wxSizer::Remove( int pos )
{ {
wxNode *node = m_children.Nth( pos ); wxNode *node = m_children.Nth( pos );
if (!node) return FALSE; if (!node) return FALSE;
m_children.DeleteNode( node ); m_children.DeleteNode( node );
return TRUE; return TRUE;
} }
void wxSizer::Fit( wxWindow *window ) void wxSizer::Fit( wxWindow *window )
{ {
window->SetSize( GetMinWindowSize( window ) ); window->SetSize( GetMinWindowSize( window ) );
@ -283,7 +302,7 @@ wxSize wxSizer::GetMinWindowSize( wxWindow *window )
wxSize size( window->GetSize() ); wxSize size( window->GetSize() );
wxSize client_size( window->GetClientSize() ); wxSize client_size( window->GetClientSize() );
return wxSize( minSize.x+size.x-client_size.x, return wxSize( minSize.x+size.x-client_size.x,
minSize.y+size.y-client_size.y ); minSize.y+size.y-client_size.y );
} }
void wxSizer::SetDimension( int x, int y, int width, int height ) void wxSizer::SetDimension( int x, int y, int width, int height )
@ -309,7 +328,7 @@ void wxBoxSizer::RecalcSizes()
{ {
if (m_children.GetCount() == 0) if (m_children.GetCount() == 0)
return; return;
int delta = 0; int delta = 0;
int extra = 0; int extra = 0;
if (m_stretchable) if (m_stretchable)
@ -325,9 +344,9 @@ void wxBoxSizer::RecalcSizes()
extra = (m_size.y - m_fixedHeight) % m_stretchable; extra = (m_size.y - m_fixedHeight) % m_stretchable;
} }
} }
wxPoint pt( m_position ); wxPoint pt( m_position );
wxNode *node = m_children.GetFirst(); wxNode *node = m_children.GetFirst();
while (node) while (node)
{ {
@ -336,9 +355,9 @@ void wxBoxSizer::RecalcSizes()
int weight = 1; int weight = 1;
if (item->GetOption()) if (item->GetOption())
weight = item->GetOption(); weight = item->GetOption();
wxSize size( item->CalcMin() ); wxSize size( item->CalcMin() );
if (m_orient == wxVERTICAL) if (m_orient == wxVERTICAL)
{ {
long height = size.y; long height = size.y;
@ -347,19 +366,19 @@ void wxBoxSizer::RecalcSizes()
height = (delta * weight) + extra; height = (delta * weight) + extra;
extra = 0; // only the first item will get the remainder as extra size extra = 0; // only the first item will get the remainder as extra size
} }
wxPoint child_pos( pt ); wxPoint child_pos( pt );
wxSize child_size( wxSize( size.x, height) ); wxSize child_size( wxSize( size.x, height) );
if (item->GetFlag() & wxALIGN_RIGHT) if (item->GetFlag() & wxALIGN_RIGHT)
child_pos.x += m_size.x - size.x; child_pos.x += m_size.x - size.x;
else if (item->GetFlag() & wxCENTER) else if (item->GetFlag() & wxCENTER)
child_pos.x += (m_size.x - size.x) / 2; child_pos.x += (m_size.x - size.x) / 2;
else if (item->GetFlag() & wxEXPAND) else if (item->GetFlag() & wxEXPAND)
child_size.x = m_size.x; child_size.x = m_size.x;
item->SetDimension( child_pos, child_size ); item->SetDimension( child_pos, child_size );
pt.y += height; pt.y += height;
} }
else else
@ -370,19 +389,19 @@ void wxBoxSizer::RecalcSizes()
width = (delta * weight) + extra; width = (delta * weight) + extra;
extra = 0; // only the first item will get the remainder as extra size extra = 0; // only the first item will get the remainder as extra size
} }
wxPoint child_pos( pt ); wxPoint child_pos( pt );
wxSize child_size( wxSize(width, size.y) ); wxSize child_size( wxSize(width, size.y) );
if (item->GetFlag() & wxALIGN_BOTTOM) if (item->GetFlag() & wxALIGN_BOTTOM)
child_pos.y += m_size.y - size.y; child_pos.y += m_size.y - size.y;
else if (item->GetFlag() & wxCENTER) else if (item->GetFlag() & wxCENTER)
child_pos.y += (m_size.y - size.y) / 2; child_pos.y += (m_size.y - size.y) / 2;
else if (item->GetFlag() & wxEXPAND) else if (item->GetFlag() & wxEXPAND)
child_size.y = m_size.y; child_size.y = m_size.y;
item->SetDimension( child_pos, child_size ); item->SetDimension( child_pos, child_size );
pt.x += width; pt.x += width;
} }
@ -394,24 +413,24 @@ wxSize wxBoxSizer::CalcMin()
{ {
if (m_children.GetCount() == 0) if (m_children.GetCount() == 0)
return wxSize(2,2); return wxSize(2,2);
m_stretchable = 0; m_stretchable = 0;
m_minWidth = 0; m_minWidth = 0;
m_minHeight = 0; m_minHeight = 0;
m_fixedWidth = 0; m_fixedWidth = 0;
m_fixedHeight = 0; m_fixedHeight = 0;
wxNode *node = m_children.GetFirst(); wxNode *node = m_children.GetFirst();
while (node) while (node)
{ {
wxSizerItem *item = (wxSizerItem*) node->Data(); wxSizerItem *item = (wxSizerItem*) node->Data();
int weight = 1; int weight = 1;
if (item->GetOption()) if (item->GetOption())
weight = item->GetOption(); weight = item->GetOption();
wxSize size( item->CalcMin() ); wxSize size( item->CalcMin() );
if (m_orient == wxHORIZONTAL) if (m_orient == wxHORIZONTAL)
{ {
m_minWidth += (size.x * weight); m_minWidth += (size.x * weight);
@ -422,7 +441,7 @@ wxSize wxBoxSizer::CalcMin()
m_minHeight += (size.y * weight); m_minHeight += (size.y * weight);
m_minWidth = wxMax( m_minWidth, size.x ); m_minWidth = wxMax( m_minWidth, size.x );
} }
if (item->GetOption()) if (item->GetOption())
{ {
m_stretchable += weight; m_stretchable += weight;
@ -440,10 +459,10 @@ wxSize wxBoxSizer::CalcMin()
m_fixedHeight = wxMax( m_fixedHeight, size.y ); m_fixedHeight = wxMax( m_fixedHeight, size.y );
} }
} }
node = node->Next(); node = node->Next();
} }
return wxSize( m_minWidth, m_minHeight ); return wxSize( m_minWidth, m_minHeight );
} }
@ -455,10 +474,10 @@ wxStaticBoxSizer::wxStaticBoxSizer( wxStaticBox *box, int orient )
: wxBoxSizer( orient ) : wxBoxSizer( orient )
{ {
wxASSERT_MSG( box, _T("wxStaticBoxSizer needs a static box") ); wxASSERT_MSG( box, _T("wxStaticBoxSizer needs a static box") );
m_staticBox = box; m_staticBox = box;
} }
void wxStaticBoxSizer::RecalcSizes() void wxStaticBoxSizer::RecalcSizes()
{ {
// this will have to be done platform by platform // this will have to be done platform by platform
@ -469,16 +488,16 @@ void wxStaticBoxSizer::RecalcSizes()
int other_border = 5; int other_border = 5;
m_staticBox->SetSize( m_position.x, m_position.y, m_size.x, m_size.y ); m_staticBox->SetSize( m_position.x, m_position.y, m_size.x, m_size.y );
wxPoint old_pos( m_position ); wxPoint old_pos( m_position );
m_position.x += other_border; m_position.x += other_border;
m_position.y += top_border; m_position.y += top_border;
wxSize old_size( m_size ); wxSize old_size( m_size );
m_size.x -= 2*other_border; m_size.x -= 2*other_border;
m_size.y -= top_border + other_border; m_size.y -= top_border + other_border;
wxBoxSizer::RecalcSizes(); wxBoxSizer::RecalcSizes();
m_position = old_pos; m_position = old_pos;
m_size = old_size; m_size = old_size;
} }
@ -491,10 +510,10 @@ wxSize wxStaticBoxSizer::CalcMin()
int top_border = 15; int top_border = 15;
if (m_staticBox->GetLabel().IsEmpty()) top_border = 5; if (m_staticBox->GetLabel().IsEmpty()) top_border = 5;
int other_border = 5; int other_border = 5;
wxSize ret( wxBoxSizer::CalcMin() ); wxSize ret( wxBoxSizer::CalcMin() );
ret.x += 2*top_border; ret.x += 2*top_border;
ret.y += other_border + top_border; ret.y += other_border + top_border;
return ret; return ret;
} }