X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/60be2f47e18fcd87e9b5ca015587650288b859f3..2463329cd36c305f4007445049a89439fb7e62a9:/src/common/sizer.cpp diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index 236704d783..32e2912914 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -269,6 +269,21 @@ void wxSizer::Prepend( int width, int height, int option, int flag, int border, m_children.Insert( new wxSizerItem( width, height, option, flag, border, userData ) ); } +void wxSizer::Insert( int before, wxWindow *window, int option, int flag, int border, wxObject* userData ) +{ + m_children.Insert( before, new wxSizerItem( window, option, flag, border, userData ) ); +} + +void wxSizer::Insert( int before, wxSizer *sizer, int option, int flag, int border, wxObject* userData ) +{ + m_children.Insert( before, new wxSizerItem( sizer, option, flag, border, userData ) ); +} + +void wxSizer::Insert( int before, int width, int height, int option, int flag, int border, wxObject* userData ) +{ + m_children.Insert( before, new wxSizerItem( width, height, option, flag, border, userData ) ); +} + bool wxSizer::Remove( wxWindow *window ) { wxASSERT( window ); @@ -454,7 +469,7 @@ void wxBoxSizer::RecalcSizes() wxSize wxBoxSizer::CalcMin() { if (m_children.GetCount() == 0) - return wxSize(2,2); + return wxSize(10,10); m_stretchable = 0; m_minWidth = 0; @@ -555,7 +570,7 @@ wxSize wxStaticBoxSizer::CalcMin() int other_border = 5; wxSize ret( wxBoxSizer::CalcMin() ); - ret.x += 2*top_border; + ret.x += 2*other_border; ret.y += other_border + top_border; return ret;