added wxSizer::Get/SetContainingWindow()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1650,12 +1650,21 @@ void wxWindowBase::SetSizer(wxSizer *sizer, bool deleteOld)
|
||||
if ( sizer == m_windowSizer)
|
||||
return;
|
||||
|
||||
if ( deleteOld )
|
||||
delete m_windowSizer;
|
||||
if ( m_windowSizer )
|
||||
{
|
||||
m_windowSizer->SetContainingWindow(NULL);
|
||||
|
||||
if ( deleteOld )
|
||||
delete m_windowSizer;
|
||||
}
|
||||
|
||||
m_windowSizer = sizer;
|
||||
if ( m_windowSizer )
|
||||
{
|
||||
m_windowSizer->SetContainingWindow((wxWindow *)this);
|
||||
}
|
||||
|
||||
SetAutoLayout( sizer != NULL );
|
||||
SetAutoLayout(m_windowSizer != NULL);
|
||||
}
|
||||
|
||||
void wxWindowBase::SetSizerAndFit(wxSizer *sizer, bool deleteOld)
|
||||
|
Reference in New Issue
Block a user