X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6285be722384e07c2587e769dce7cabb8adbd31b..dbcbe229628c7667da2b6257198467d4f09ab28d:/src/common/containr.cpp

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index f818d7ebb1..04a7794bfe 100644
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -51,13 +51,9 @@ wxControlContainer::wxControlContainer(wxWindow *winParent)
 void wxControlContainer::SetLastFocus(wxWindow *win)
 {
     // find the last _immediate_ child which got focus
-    while ( win )
+    while ( win && win != m_winParent )
     {
-        wxWindow *parent = win->GetParent();
-        if ( parent == m_winParent )
-            break;
-
-        win = parent;
+        win = win->GetParent();
     }
 
     wxASSERT_MSG( win, _T("attempt to set last focus to not a child?") );
@@ -245,7 +241,7 @@ void wxControlContainer::HandleOnWindowDestroy(wxWindowBase *child)
 // focus handling
 // ----------------------------------------------------------------------------
 
-void wxControlContainer::DoSetFocus()
+bool wxControlContainer::DoSetFocus()
 {
     wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08x."),
                m_winParent->GetHandle());
@@ -277,10 +273,7 @@ void wxControlContainer::DoSetFocus()
     //
     // RR: Removed for now. Let's see what happens..
 
-    if ( !SetFocusToChild() )
-    {
-        m_winParent->SetFocus();
-    }
+    return SetFocusToChild();
 }
 
 void wxControlContainer::HandleOnFocus(wxFocusEvent& event)