warning (in Unicode only) fix

[wxWidgets.git] / src / common / containr.cpp

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 6262adfd24d32931216fa0e418711ea18fe5eaf8..fe1ea94cab0dace8a5add805a358dfe3ce23d2a8 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -36,6 +36,10 @@
 
 #include "wx/containr.h"
 
+#ifdef __WXMAC__
+    #include "wx/scrolbar.h"
+#endif
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -61,6 +65,12 @@ bool wxControlContainer::AcceptsFocus() const
         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();
@@ -70,8 +80,18 @@ bool wxControlContainer::AcceptsFocus() const
                 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;