better child focus

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

diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index ef5bf328f9fd364e033275cdac5f702b508bf425..4abd0216ae522e8c24427cb190288ab4bbba9d86 100644 (file)
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -4310,7 +4310,8 @@ void wxAuiManager::OnChildFocus(wxChildFocusEvent& event)
     // active panes are allowed by the owner)
     if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE)
     {
     // active panes are allowed by the owner)
     if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE)
     {

-        if (GetPane(event.GetWindow()).IsOk())
+        wxAuiPaneInfo& pane = GetPane(event.GetWindow());
+        if (pane.IsOk() && (pane.state & wxAuiPaneInfo::optionActive) == 0)

         {
             SetActivePane(m_panes, event.GetWindow());
             m_frame->Refresh();
         {
             SetActivePane(m_panes, event.GetWindow());
             m_frame->Refresh();