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

Merge branch 'safer-sizers'

Browse Source 
Improvements to the safety of wxSizer API.

See https://github.com/wxWidgets/wxWidgets/pull/1932

Closes #18611.
This commit is contained in:
Vadim Zeitlin
2020-07-06 17:54:46 +02:00
parent 792e4dcced 65d890f33e
commit f259f4152b
3 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/sizer.cpp
View File

@@ -869,7 +869,7 @@ bool wxSizer::Replace( wxSizer *oldsz, wxSizer *newsz, bool recursive )
bool wxSizer::Replace( size_t old, wxSizerItem *newitem )
{
wxCHECK_MSG( old < m_children.GetCount(), false, wxT("Replace index is out of range") );
wxASSERT_MSG( newitem, wxT("Replacing with NULL item") );
wxCHECK_MSG( newitem, false, wxT("Replacing with NULL item") );
wxSizerItemList::compatibility_iterator node = m_children.Item( old );
@@ -878,11 +878,14 @@ bool wxSizer::Replace( size_t old, wxSizerItem *newitem )
wxSizerItem *item = node->GetData();
node->SetData(newitem);
if (item->IsWindow() && item->GetWindow())
item->GetWindow()->SetContainingSizer(NULL);
if (wxWindow* const w = item->GetWindow())
w->SetContainingSizer(NULL);
delete item;
if (wxWindow* const w = newitem->GetWindow())
w->SetContainingSizer(this);
return true;
}