X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/456bc6d9b83882a3b0e919fc733898d9d331ecd6..e6adf05834e880312efa3d59914ecc1d4f5f78a6:/src/common/containr.cpp

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index c5133c803d..04a7794bfe 100644
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -29,6 +29,9 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/event.h"
+    #include "wx/window.h"
 #endif //WX_PRECOMP
 
 #include "wx/containr.h"
@@ -48,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?") );
@@ -242,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());
@@ -274,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)