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

fix GetTLWParentIfNotBeingDeleted() to work correctly even if an intermediate non-TLW parent is being deleted, it should still return the TLW parent and not NULL in this case, otherwise we'd crash when a button child of a panel being deleted is current temporary default button [backport of r51570 from trunk]

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@51571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-02-06 14:20:22 +00:00
parent bc11931c4e
commit 006988d24f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/msw/button.cpp
View File

@@ -366,11 +366,12 @@ static wxTopLevelWindow *GetTLWParentIfNotBeingDeleted(wxWindow *win)
{ {
for ( ; win; win = win->GetParent() ) for ( ; win; win = win->GetParent() )
{ {
if ( win->IsBeingDeleted() )
return NULL;
if ( win->IsTopLevel() ) if ( win->IsTopLevel() )
{
if ( win->IsBeingDeleted() )
return NULL;
break; break;
}
} }
wxASSERT_MSG( win, _T("button without top level parent?") ); wxASSERT_MSG( win, _T("button without top level parent?") );