Applied patch [ 1776951 ] wxSizer::GetContainingWindow fails for nested sizers

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2007-08-21 14:08:26 +00:00
parent 791b07a345
commit e6cfcc0df2

View File

@ -522,6 +522,9 @@ wxSizerItem* wxSizer::Insert( size_t index, wxSizerItem *item )
if ( item->GetWindow() )
item->GetWindow()->SetContainingSizer( this );
if ( item->GetSizer() )
item->GetSizer()->SetContainingWindow( m_containingWindow );
return item;
}
@ -1974,7 +1977,7 @@ void wxStdDialogButtonSizer::Realize()
Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
}
// according to HIG, in explicit apply windows the order is:
// according to HIG, in explicit apply windows the order is:
// [ Help Apply Cancel OK ]
if (m_buttonApply)
Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);