X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..a400a8230f751da518c29bd9a1c67132a4ae2b75:/src/common/containr.cpp?ds=sidebyside

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 5b5df9ea92..fe1ea94cab 100644
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -6,7 +6,7 @@
 // Created:     06.08.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows license
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -36,6 +36,10 @@
 
 #include "wx/containr.h"
 
+#ifdef __WXMAC__
+    #include "wx/scrolbar.h"
+#endif
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -49,6 +53,50 @@ wxControlContainer::wxControlContainer(wxWindow *winParent)
     m_winDefault = NULL;
 }
 
+bool wxControlContainer::AcceptsFocus() const
+{
+    // if we're not shown or disabled, we can't accept focus
+    if ( m_winParent->IsShown() && m_winParent->IsEnabled() )
+    {
+        // otherwise we can accept focus either if we have no children at all
+        // (in this case we're probably not used as a container) or only when
+        // at least one child will accept focus
+        wxWindowList::Node *node = m_winParent->GetChildren().GetFirst();
+        if ( !node )
+            return TRUE;
+
+#ifdef __WXMAC__
+        // wxMac has eventually the two scrollbars as children, they don't count
+        // as real children in the algorithm mentioned above
+        bool hasRealChildren = false ;
+#endif
+        
+        while ( node )
+        {
+            wxWindow *child = node->GetData();
+
+            if ( child->AcceptsFocus() )
+            {
+                return TRUE;
+            }
+
+#ifdef __WXMAC__
+            wxScrollBar *sb = wxDynamicCast( child , wxScrollBar ) ;
+            if ( sb == NULL || !m_winParent->MacIsWindowScrollbar( sb ) )
+                hasRealChildren = true ;
+#endif
+            node = node->GetNext();
+        }
+        
+#ifdef __WXMAC__
+        if ( !hasRealChildren )
+            return TRUE ;
+#endif
+    }
+
+    return FALSE;
+}
+
 void wxControlContainer::SetLastFocus(wxWindow *win)
 {
     // the panel itself should never get the focus at all but if it does happen
@@ -376,7 +424,7 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
                        _T("SetFocusToChild() => first child (0x%08lx)."),
                        (unsigned long)child->GetHandle());
 
-            *childLastFocused = child;  // should be redundant, but it is not
+            *childLastFocused = child;
             child->SetFocusFromKbd();
             return TRUE;
         }
@@ -386,3 +434,4 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
 
     return FALSE;
 }
+