correction after the previous commit which introduced bug 1888014

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index 45f6b377957936f2e8c18f485bc4e60619380ebf..9ccd939cc16f17233e46eb52ed8e5e77c9962318 100644 (file)
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -367,26 +367,32 @@ wxWindow *wxButton::SetDefault()
     return winOldDefault;
 }
 
     return winOldDefault;
 }
 

-// special version of wxGetTopLevelParent() which is safe to call when the
-// parent is being destroyed: wxGetTopLevelParent() would just return NULL in
-// this case because wxWindow version of IsTopLevel() is used when it's called
-// during window destruction instead of wxTLW one, but we want to distinguish
-// between these cases
+// return the top level parent window if it's not being deleted yet, otherwise
+// return NULL

 static wxTopLevelWindow *GetTLWParentIfNotBeingDeleted(wxWindow *win)
 {
 static wxTopLevelWindow *GetTLWParentIfNotBeingDeleted(wxWindow *win)
 {

-    for ( ; win; win = win->GetParent() )
+    for ( ;; )

     {
     {

-        if ( win->IsTopLevel() )
+        // IsTopLevel() will return false for a wxTLW being deleted, so we also
+        // need the parent test for this case
+        wxWindow * const parent = win->GetParent();
+        if ( !parent || win->IsTopLevel() )

         {
             if ( win->IsBeingDeleted() )
                 return NULL;
         {
             if ( win->IsBeingDeleted() )
                 return NULL;

+

             break;
         }
             break;
         }

+
+        win = parent;

     }
 
     wxASSERT_MSG( win, _T("button without top level parent?") );
 
     }
 
     wxASSERT_MSG( win, _T("button without top level parent?") );
 

-    return wxDynamicCast(win, wxTopLevelWindow);
+    wxTopLevelWindow * const tlw = wxDynamicCast(win, wxTopLevelWindow);
+    wxASSERT_MSG( tlw, _T("logic error in GetTLWParentIfNotBeingDeleted()") );
+
+    return tlw;

 }
 
 // set this button as being currently default
 }
 
 // set this button as being currently default