revert r51647 change as it broke the code overriding AcceptsFocusFromKeyboard() to...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/containr.h b/include/wx/containr.h
index 710078dc0cad154960c3526e69e9162cfa5f1a97..0ba59825c5905d714afe03b24f980783c194175d 100644 (file)
--- a/include/wx/containr.h
+++ b/include/wx/containr.h
@@ -70,6 +70,11 @@ public:
     // wxListCtrl) and so should get focus for ourselves
     bool AcceptsFocusRecursively() const { return true; }
 
+    // this is used to determine whether we can accept focus when Tab or
+    // another navigation key is pressed -- we alsways can, for the same reason
+    // as mentioned above for AcceptsFocusRecursively()
+    bool AcceptsFocusFromKeyboard() const { return true; }
+
     // Call this when the number of children of the window changes.
     // If we have any children, this panel (used just as container for
     // them) shouldn't get focus for itself.
@@ -103,6 +108,7 @@ private:
 public:                                                                       \
     virtual bool AcceptsFocus() const;                                        \
     virtual bool AcceptsFocusRecursively() const;                             \
+    virtual bool AcceptsFocusFromKeyboard() const;                            \
     virtual void AddChild(wxWindowBase *child);                               \
     virtual void RemoveChild(wxWindowBase *child);                            \
     virtual void SetFocus();                                                  \
@@ -143,9 +149,13 @@ protected:                                                                    \
     bool classname::AcceptsFocus() const                                      \
     {                                                                         \
         return m_container.AcceptsFocus();                                    \
+    }                                                                         \
+                                                                              \
+    bool classname::AcceptsFocusFromKeyboard() const                          \
+    {                                                                         \
+        return m_container.AcceptsFocusFromKeyboard();                        \
     }
 
-
 #ifdef wxHAS_NATIVE_TAB_TRAVERSAL
 
 // ----------------------------------------------------------------------------

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 8f41d782f2f2848311b3a96ae062f70f900d9558..43de0255b06a98d0b881e65a8649f950c7ec4a82 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -566,7 +566,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
         }
 #endif // __WXMSW__
 
-        if ( child->CanAcceptFocus() )
+        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