compilation fixes for !wxUSE_FONTMAP

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

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 04a7794bfefc093259ef3f2484c9475f88a6c573..5ad3a7f00652e6ff53fda9736ee9cbe689efbef7 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -50,13 +50,20 @@ wxControlContainer::wxControlContainer(wxWindow *winParent)
 
 void wxControlContainer::SetLastFocus(wxWindow *win)
 {
-    // find the last _immediate_ child which got focus
-    while ( win && win != m_winParent )
+    // if we're setting the focus
+    if ( win )
     {
-        win = win->GetParent();
-    }
+        // find the last _immediate_ child which got focus but be prepared to
+        // handle the case when win == m_winParent as well
+        wxWindow *winParent = win;
+        while ( winParent != m_winParent )
+        {
+            win = winParent;
+            winParent = win->GetParent();
+        }
 
-    wxASSERT_MSG( win, _T("attempt to set last focus to not a child?") );
+        wxASSERT_MSG( win, _T("attempt to set last focus to not a child?") );
+    }
 
     m_winLastFocused = win;
 }
@@ -273,6 +280,23 @@ bool wxControlContainer::DoSetFocus()
     //
     // RR: Removed for now. Let's see what happens..
 
+    // if our child already has focus, don't take it away from it
+    wxWindow *win = wxWindow::FindFocus();
+    while ( win )
+    {
+        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();
 }