From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 28 Nov 2001 19:50:37 +0000 (+0000)
Subject: fixed (at least some of) the focus asserts
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/83c865f51868366fcf48b4188144e26c648cbc7c?hp=a3b72ffb8f0431145da6e6d0fcb0338b74ea6814

fixed (at least some of) the focus asserts


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

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 57c9361752..5ad3a7f006 100644
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -50,18 +50,21 @@ 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;
+        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;
 }