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

wxSizer::Add/Insert now returns pointer to wxSizerItem added and wxSizerItem contains access to its area [Patch #1042571 with minimal tweaks]

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-11-09 18:33:00 +00:00
parent 48023e151f
commit 56eee37fc8
8 changed files with 256 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/sizer.cpp
View File

@@ -89,6 +89,7 @@ void wxSizerItem::Init()
m_sizer = NULL;
m_show = true;
m_userData = NULL;
m_zoneRect = wxRect( 0, 0, 0, 0 );
}
void wxSizerItem::Init(const wxSizerFlags& flags)
@@ -108,6 +109,7 @@ wxSizerItem::wxSizerItem( int width, int height, int proportion, int flag, int b
, m_proportion( proportion )
, m_border( border )
, m_flag( flag )
, m_zoneRect( 0, 0, 0, 0 )
, m_show( true )
, m_userData( userData )
{
@@ -120,6 +122,7 @@ wxSizerItem::wxSizerItem( wxWindow *window, int proportion, int flag, int border
, m_proportion( proportion )
, m_border( border )
, m_flag( flag )
, m_zoneRect( 0, 0, 0, 0 )
, m_show( true )
, m_userData( userData )
{
@@ -139,6 +142,7 @@ wxSizerItem::wxSizerItem( wxSizer *sizer, int proportion, int flag, int border,
, m_proportion( proportion )
, m_border( border )
, m_flag( flag )
, m_zoneRect( 0, 0, 0, 0 )
, m_show( true )
, m_ratio( 0.0 )
, m_userData( userData )
@@ -287,6 +291,7 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
if (IsSizer())
m_sizer->SetDimension( pos.x, pos.y, size.x, size.y );
m_zoneRect = wxRect(pos, size);
if (IsWindow())
m_window->SetSize( pos.x, pos.y, size.x, size.y, wxSIZE_ALLOW_MINUS_ONE );
@@ -357,12 +362,14 @@ wxSizer::~wxSizer()
WX_CLEAR_LIST(wxSizerItemList, m_children);
}
void wxSizer::Insert( size_t index, wxSizerItem *item )
wxSizerItem* wxSizer::Insert( size_t index, wxSizerItem *item )
{
m_children.Insert( index, item );
if( item->GetWindow() )
item->GetWindow()->SetContainingSizer( this );
return item;
}
bool wxSizer::Remove( wxWindow *window )
@@ -1582,7 +1589,7 @@ static void GetStaticBoxBorders( wxStaticBox *box,
#else
#ifdef __WXGTK__
if ( box->GetLabel().IsEmpty() )
if ( box->GetLabel().empty() )
*borderTop = 5;
else
#endif // __WXGTK__