containers don't always accept focus (patch 718913)

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

diff --git a/include/wx/containr.h b/include/wx/containr.h
index 234161da031e63fcb2740062af8f8cb7b813b392..fd3ba533ceb4a982bd5f3ac9e33d5612f1a66a3e 100644 (file)
--- a/include/wx/containr.h
+++ b/include/wx/containr.h
@@ -69,6 +69,9 @@ public:
     // the focus and the default processing should take place
     bool DoSetFocus();
 
+    // can our child get the focus?
+    bool AcceptsFocus() const;
+
     // called from OnChildFocus() handler, i.e. when one of our (grand)
     // children gets the focus
     void SetLastFocus(wxWindow *win);
@@ -111,6 +114,7 @@ public: \
     virtual wxWindow *GetDefaultItem() const; \
     virtual wxWindow *SetDefaultItem(wxWindow *child); \
     virtual void SetTmpDefaultItem(wxWindow *win); \
+    virtual bool AcceptsFocus() const; \
 \
 protected: \
     wxControlContainer m_container
@@ -164,6 +168,10 @@ void classname::OnChildFocus(wxChildFocusEvent& event) \
 void classname::OnFocus(wxFocusEvent& event) \
 { \
     m_container.HandleOnFocus(event); \
+} \
+bool classname::AcceptsFocus() const \
+{ \
+    return m_container.AcceptsFocus(); \
 }
 
 

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index cf52acee49c312a271a956b9afa6acfb96cc92a6..5f251fda7b828ebd6de91fd2eb9190b6cadffa87 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -49,6 +49,28 @@ wxControlContainer::wxControlContainer(wxWindow *winParent)
     m_winDefault = NULL;
 }
 
+bool wxControlContainer::AcceptsFocus() const
+{
+    // We can accept focus only when at last one child will accept focus
+    if ( m_winParent->IsShown() && m_winParent->IsEnabled() )
+    {
+        wxWindowList::Node *node = m_winParent->GetChildren().GetFirst();
+        while ( node )
+        {
+            wxWindow *child = node->GetData();
+
+            if ( child->AcceptsFocus() )
+            {
+                return TRUE;
+            }
+
+            node = node->GetNext();
+        }
+    }
+
+    return FALSE;
+}
+
 void wxControlContainer::SetLastFocus(wxWindow *win)
 {
     // the panel itself should never get the focus at all but if it does happen
@@ -386,3 +408,4 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
 
     return FALSE;
 }
+