X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f20c5486114167def8c5ce0f9144c222f619f9c..389d906b21e2cf2939fad5990383f2b33dcc6373:/src/common/containr.cpp

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 57c9361752..b76ec648d6 100644
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -50,17 +50,24 @@ wxControlContainer::wxControlContainer(wxWindow *winParent)
 
 void wxControlContainer::SetLastFocus(wxWindow *win)
 {
-    // find the last _immediate_ child which got focus
-    while ( win )
+    // if we're setting the focus
+    if ( win )
     {
-        wxWindow *winParent = win->GetParent();
-        if ( winParent == m_winParent )
-            break;
+        // find the last _immediate_ child which got focus but be prepared to
+        // handle the case when win == m_winParent as well
+        wxWindow *winParent = win;
+        while ( winParent != m_winParent )
+        {
+            win = winParent;
+            winParent = win->GetParent();
 
-        win = winParent;
-    }
+            // 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( win, _T("attempt to set last focus to not a child?") );
+            wxASSERT_MSG( winParent, _T("Setting last-focus for a window that is not our child?") );
+        }
+    }
 
     m_winLastFocused = win;
 }