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

added wxSizerItem::AssignXXX() methods replacing the old SetXXX() but freeing the current item contents (modified patch 1687785)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-30 19:57:23 +00:00
parent f4854380c1
commit 4dd10327d2
2 changed files with 85 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/common/sizer.cpp
View File

@@ -103,12 +103,10 @@ wxSizerItem::wxSizerItem()
m_proportion = 0;
m_border = 0;
m_flag = 0;
m_kind = Item_None;
}
// window item
void wxSizerItem::SetWindow(wxWindow *window)
void wxSizerItem::DoSetWindow(wxWindow *window)
{
wxCHECK_RET( window, _T("NULL window in wxSizerItem::SetWindow()") );
@@ -130,16 +128,17 @@ wxSizerItem::wxSizerItem(wxWindow *window,
int flag,
int border,
wxObject* userData)
: m_proportion(proportion),
: m_kind(Item_None),
m_proportion(proportion),
m_border(border),
m_flag(flag),
m_userData(userData)
{
SetWindow(window);
DoSetWindow(window);
}
// sizer item
void wxSizerItem::SetSizer(wxSizer *sizer)
void wxSizerItem::DoSetSizer(wxSizer *sizer)
{
m_kind = Item_Sizer;
m_sizer = sizer;
@@ -150,19 +149,21 @@ wxSizerItem::wxSizerItem(wxSizer *sizer,
int flag,
int border,
wxObject* userData)
: m_proportion(proportion),
: m_kind(Item_None),
m_sizer(NULL),
m_proportion(proportion),
m_border(border),
m_flag(flag),
m_ratio(0.0),
m_userData(userData)
{
SetSizer(sizer);
DoSetSizer(sizer);
// m_minSize is set later
}
// spacer item
void wxSizerItem::SetSpacer(const wxSize& size)
void wxSizerItem::DoSetSpacer(const wxSize& size)
{
m_kind = Item_Spacer;
m_spacer = new wxSizerSpacer(size);
@@ -176,19 +177,25 @@ wxSizerItem::wxSizerItem(int width,
int flag,
int border,
wxObject* userData)
: m_minSize(width, height), // minimal size is the initial size
: m_kind(Item_None),
m_sizer(NULL),
m_minSize(width, height), // minimal size is the initial size
m_proportion(proportion),
m_border(border),
m_flag(flag),
m_userData(userData)
{
SetSpacer(width, height);
DoSetSpacer(wxSize(width, height));
}
wxSizerItem::~wxSizerItem()
{
delete m_userData;
Free();
}
void wxSizerItem::Free()
{
switch ( m_kind )
{
case Item_None:
@@ -210,6 +217,8 @@ wxSizerItem::~wxSizerItem()
default:
wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") );
}
m_kind = Item_None;
}
wxSize wxSizerItem::GetSpacer() const