From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 18 Mar 2012 01:35:53 +0000 (+0000)
Subject: Avoid crashes in wxMSW when using buttons without valid parent.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/76cae7cbc2b31aeba7be094e4161fd73bcf30022

Avoid crashes in wxMSW when using buttons without valid parent.

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
---

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index 3e9bfb5739..d00f877793 100644
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -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;