]> git.saurik.com Git - wxWidgets.git/commitdiff
Avoid crashes in wxMSW when using buttons without valid parent.
authorVadim Zeitlin <vadim@wxwidgets.org>
Sun, 18 Mar 2012 01:35:53 +0000 (01:35 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sun, 18 Mar 2012 01:35:53 +0000 (01:35 +0000)
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

src/msw/button.cpp

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