Don't trigger kill focus event twice

[wxWidgets.git] / src / msw / button.cpp

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;
 }
 
-// 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)
 {
-    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;
+
             break;
         }
+
+        win = 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