fix for using wxDataObjectComposite with the clipboard

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

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 57c9361752f5b8e1059f0ed99221b723d993b56e..5ad3a7f00652e6ff53fda9736ee9cbe689efbef7 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -50,18 +50,21 @@ wxControlContainer::wxControlContainer(wxWindow *winParent)
 
 void wxControlContainer::SetLastFocus(wxWindow *win)
 {
-    // find the last _immediate_ child which got focus
-    while ( win )
+    // if we're setting the focus
+    if ( win )
     {
-        wxWindow *winParent = win->GetParent();
-        if ( winParent == m_winParent )
-            break;
+        // 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();
+        }
 
-        win = winParent;
+        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;
 }