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

Remove unnecessary casts to wxWindow when using wxTopLevelWindows

Browse Source 
This list uses wxWindowBase for its elements, so downcasts are
unnecessary and actually harmful as the downcast performed in the dtor
results in undefined behaviour because the object is not a wxWindow any
more by then (thanks to UBSAN for detecting this).
This commit is contained in:
Vadim Zeitlin
2021-09-01 21:23:23 +02:00
parent 4878e1e72c
commit ebe4796f6c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/wincmn.cpp
View File

@@ -389,7 +389,7 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
// does not as the user should be able to resize the window) // does not as the user should be able to resize the window)
// //
// note that we can't use IsTopLevel() from ctor // note that we can't use IsTopLevel() from ctor
if ( size != wxDefaultSize && !wxTopLevelWindows.Find((wxWindow *)this) ) if ( size != wxDefaultSize && !wxTopLevelWindows.Find(this) )
SetMinSize(size); SetMinSize(size);
SetName(name); SetName(name);
@@ -458,7 +458,7 @@ wxWindowBase::~wxWindowBase()
// Just in case we've loaded a top-level window via LoadNativeDialog but // Just in case we've loaded a top-level window via LoadNativeDialog but
// we weren't a dialog class // we weren't a dialog class
wxTopLevelWindows.DeleteObject((wxWindow*)this); wxTopLevelWindows.DeleteObject(this);
// Any additional event handlers should be popped before the window is // Any additional event handlers should be popped before the window is
// deleted as otherwise the last handler will be left with a dangling // deleted as otherwise the last handler will be left with a dangling
@@ -1383,7 +1383,7 @@ bool wxWindowBase::Reparent(wxWindowBase *newParent)
} }
else else
{ {
wxTopLevelWindows.DeleteObject((wxWindow *)this); wxTopLevelWindows.DeleteObject(this);
} }
// add it to the new one // add it to the new one
@@ -1393,7 +1393,7 @@ bool wxWindowBase::Reparent(wxWindowBase *newParent)
} }
else else
{ {
wxTopLevelWindows.Append((wxWindow *)this); wxTopLevelWindows.Append(this);
} }
// We need to notify window (and its subwindows) if by changing the parent // We need to notify window (and its subwindows) if by changing the parent