fix compilation with wxUSE_EXTENDED_RTTI && !WXWIN_COMPATIBILITY_2_6 (bug 1688249)

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

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 4f05ea60f21daa85073a1d12608426c69fc5c9dc..84be03d1462d980da5ad0ac0434d8519fd6ac7a2 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -24,13 +24,18 @@
     #pragma hdrstop
 #endif
 
+#ifndef WX_PRECOMP
+    #include "wx/containr.h"
+#endif
+
+#ifndef wxHAS_NATIVE_TAB_TRAVERSAL
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/event.h"
     #include "wx/window.h"
     #include "wx/scrolbar.h"
     #include "wx/radiobut.h"
-    #include "wx/containr.h"
 #endif //WX_PRECOMP
 
 // trace mask for focus messages
@@ -49,44 +54,39 @@ wxControlContainer::wxControlContainer(wxWindow *winParent)
 
 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::compatibility_iterator node = m_winParent->GetChildren().GetFirst();
-        if ( !node )
-            return true;
+    // 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
+    // accepts focus
+    wxWindowList::compatibility_iterator 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 ;
+    // 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;
-            }
+    while ( node )
+    {
+        wxWindow *child = node->GetData();
+        node = node->GetNext();
 
 #ifdef __WXMAC__
-            wxScrollBar *sb = wxDynamicCast( child , wxScrollBar ) ;
-            if ( sb == NULL || !m_winParent->MacIsWindowScrollbar( sb ) )
-                hasRealChildren = true ;
+        if ( m_winParent->MacIsWindowScrollbar( child ) )
+            continue;
+        hasRealChildren = true ;
 #endif
-            node = node->GetNext();
+        if ( child->CanAcceptFocus() )
+        {
+            return true;
         }
+    }
 
 #ifdef __WXMAC__
-        if ( !hasRealChildren )
-            return true ;
+    if ( !hasRealChildren )
+        return true ;
 #endif
-    }
 
     return false;
 }
@@ -308,8 +308,15 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
             }
         }
 
-        if ( bookctrl && bookctrl->GetEventHandler()->ProcessEvent(event) )
-            return;
+        if ( bookctrl )
+        {
+            // make sure that we don't bubble up the event again from the book
+            // control resulting in infinite recursion
+            wxNavigationKeyEvent eventCopy(event);
+            eventCopy.SetEventObject(m_winParent);
+            if ( bookctrl->GetEventHandler()->ProcessEvent(eventCopy) )
+                return;
+        }
     }
 
     // there is not much to do if we don't have children and we're not
@@ -498,7 +505,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
         }
 #endif // __WXMSW__
 
-        if ( child->AcceptsFocusFromKeyboard() )
+        if ( child->CanAcceptFocusFromKeyboard() )
         {
             // if we're setting the focus to a child panel we should prevent it
             // from giving it to the child which had the focus the last time
@@ -637,8 +644,14 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
     while ( node )
     {
         wxWindow *child = node->GetData();
+        node = node->GetNext();
 
-        if ( child->AcceptsFocusFromKeyboard() && !child->IsTopLevel() )
+#ifdef __WXMAC__
+        if ( child->GetParent()->MacIsWindowScrollbar( child ) )
+            continue;
+#endif
+        
+        if ( child->CanAcceptFocusFromKeyboard() && !child->IsTopLevel() )
         {
 #ifdef __WXMSW__
             // If a radiobutton is the first focusable child, search for the
@@ -660,9 +673,9 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
             child->SetFocusFromKbd();
             return true;
         }
-
-        node = node->GetNext();
     }
 
     return false;
 }
+
+#endif // !wxHAS_NATIVE_TAB_TRAVERSAL