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

Avoid crashes in wxMSW when using buttons without valid parent.

Browse Source 
Child controls such as buttons are supposed to always have a valid parent but
if, somehow, they don't, still don't crash in wxMSW button code but just
trigger an assert failure instead of unavailable button top level parent
instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-03-18 01:35:53 +00:00
parent 37e4846697
commit 76cae7cbc2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/button.cpp
View File

@@ -277,7 +277,7 @@ static wxTopLevelWindow *GetTLWParentIfNotBeingDeleted(wxWindow *win)
// set this button as being currently default // set this button as being currently default
void wxButton::SetTmpDefault() void wxButton::SetTmpDefault()
{ {
wxTopLevelWindow * const tlw = GetTLWParentIfNotBeingDeleted(GetParent()); wxTopLevelWindow * const tlw = GetTLWParentIfNotBeingDeleted(this);
if ( !tlw ) if ( !tlw )
return; return;
@@ -291,7 +291,7 @@ void wxButton::SetTmpDefault()
// unset this button as currently default, it may still stay permanent default // unset this button as currently default, it may still stay permanent default
void wxButton::UnsetTmpDefault() void wxButton::UnsetTmpDefault()
{ {
wxTopLevelWindow * const tlw = GetTLWParentIfNotBeingDeleted(GetParent()); wxTopLevelWindow * const tlw = GetTLWParentIfNotBeingDeleted(this);
if ( !tlw ) if ( !tlw )
return; return;