moved wx/panel include to correct wxGTK compilation error

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

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 2cac0008accd3ddc106fc5213faae21029b0835a..51a0e1744bd4c2369c192389a4a87656bdd50b75 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -241,7 +241,7 @@ void wxControlContainer::HandleOnWindowDestroy(wxWindowBase *child)
 // focus handling
 // ----------------------------------------------------------------------------
 
-void wxControlContainer::DoSetFocus()
+bool wxControlContainer::DoSetFocus()
 {
     wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08x."),
                m_winParent->GetHandle());
@@ -273,10 +273,24 @@ void wxControlContainer::DoSetFocus()
     //
     // RR: Removed for now. Let's see what happens..
 
-    if ( !SetFocusToChild() )
+    // if our child already has focus, don't take it away from it
+    wxWindow *win = wxWindow::FindFocus();
+    while ( win )
     {
-        m_winParent->SetFocus();
+        if ( win == m_winParent )
+            return TRUE;
+
+        if ( win->IsTopLevel() )
+        {
+            // don't look beyond the first top level parent - useless and
+            // unnecessary
+            break;
+        }
+
+        win = win->GetParent();
     }
+
+    return SetFocusToChild();
 }
 
 void wxControlContainer::HandleOnFocus(wxFocusEvent& event)