X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83c865f51868366fcf48b4188144e26c648cbc7c..e7300ec6d9ebbd1cfa2fcf12c0ce6e5aee85a152:/src/common/containr.cpp

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 5ad3a7f006..b76ec648d6 100644
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -60,9 +60,13 @@ void wxControlContainer::SetLastFocus(wxWindow *win)
         {
             win = winParent;
             winParent = win->GetParent();
-        }
 
-        wxASSERT_MSG( win, _T("attempt to set last focus to not a child?") );
+            // Yes, this can happen, though in a totally pathological case.
+            // like when detaching a menubar from a frame with a child which
+            // has pushed itself as an event handler for the menubar.  (wxGtk)
+
+            wxASSERT_MSG( winParent, _T("Setting last-focus for a window that is not our child?") );
+        }
     }
 
     m_winLastFocused = win;