X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/94e0018723919fe2ca2f5b5f0a42804c16dbf3a1..d485bda109d5ef0fef36a3f737549e9b9f54baab:/src/common/containr.cpp

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 2fda844c96..fbd3ea33d2 100644
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -47,14 +47,20 @@
 // wxControlContainerBase
 // ----------------------------------------------------------------------------
 
-void wxControlContainerBase::SetCanFocus(bool acceptsFocus)
+bool wxControlContainerBase::UpdateCanFocusChildren()
 {
-    if ( acceptsFocus == m_acceptsFocus )
-        return;
+    const bool acceptsFocusChildren = HasAnyFocusableChildren();
+    if ( acceptsFocusChildren != m_acceptsFocusChildren )
+    {
+        m_acceptsFocusChildren = acceptsFocusChildren;
 
-    m_acceptsFocus = acceptsFocus;
+        // In the ports where it does something non trivial, the parent window
+        // should only be focusable if it doesn't have any focusable children
+        // (e.g. native focus handling in wxGTK totally breaks down otherwise).
+        m_winParent->SetCanFocus(m_acceptsFocusSelf && !m_acceptsFocusChildren);
+    }
 
-    m_winParent->SetCanFocus(m_acceptsFocus);
+    return m_acceptsFocusChildren;
 }
 
 bool wxControlContainerBase::HasAnyFocusableChildren() const
@@ -174,19 +180,6 @@ void wxControlContainer::SetLastFocus(wxWindow *win)
             wxLogTrace(TRACE_FOCUS, wxT("No more last focus"));
         }
     }
-
-    // propagate the last focus upwards so that our parent can set focus back
-    // to us if it loses it now and regains later; do *not* do this if we are
-    // a toplevel window (e.g. wxDialog) that has another frame as its parent
-    if ( !m_winParent->IsTopLevel() )
-    {
-        wxWindow *parent = m_winParent->GetParent();
-        if ( parent )
-        {
-            wxChildFocusEvent eventFocus(m_winParent);
-            parent->GetEventHandler()->ProcessEvent(eventFocus);
-        }
-    }
 }
 
 // --------------------------------------------------------------------
@@ -653,17 +646,27 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
         // It might happen that the window got reparented
         if ( (*childLastFocused)->GetParent() == win )
         {
-            // And it also could have become hidden in the meanwhile, in this
-            // case focus its parent instead.
-            while ( !(*childLastFocused)->IsShown() )
+            // And it also could have become hidden in the meanwhile
+            // We want to focus on the deepest widget visible
+            wxWindow *deepestVisibleWindow = NULL;
+
+            while ( *childLastFocused )
             {
+                if ( (*childLastFocused)->IsShown() )
+                {
+                    if ( !deepestVisibleWindow )
+                        deepestVisibleWindow = *childLastFocused;
+                }
+                else
+                    deepestVisibleWindow = NULL;
+
                 *childLastFocused = (*childLastFocused)->GetParent();
-                if ( !*childLastFocused )
-                    break;
             }
 
-            if ( *childLastFocused )
+            if ( deepestVisibleWindow )
             {
+                *childLastFocused = deepestVisibleWindow;
+
                 wxLogTrace(TRACE_FOCUS,
                            wxT("SetFocusToChild() => last child (0x%p)."),
                            (*childLastFocused)->GetHandle());