X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0dcdeee9e74c3bc485c2daf45537e7f5e6431126..405d8f465740a78d2d19a2b108ac8fd65ff1a5e2:/src/common/containr.cpp

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 51a0e1744b..5ad3a7f006 100644
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -50,13 +50,20 @@ wxControlContainer::wxControlContainer(wxWindow *winParent)
 
 void wxControlContainer::SetLastFocus(wxWindow *win)
 {
-    // find the last _immediate_ child which got focus
-    while ( win && win != m_winParent )
+    // if we're setting the focus
+    if ( win )
     {
-        win = win->GetParent();
-    }
+        // 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();
+        }
 
-    wxASSERT_MSG( win, _T("attempt to set last focus to not a child?") );
+        wxASSERT_MSG( win, _T("attempt to set last focus to not a child?") );
+    }
 
     m_winLastFocused = win;
 }