don't use wxApp::GetStdIcon

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

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 5ad3a7f00652e6ff53fda9736ee9cbe689efbef7..b76ec648d6ba04a4e30f6f538c2ccc5db9d5291f 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -60,9 +60,13 @@ void wxControlContainer::SetLastFocus(wxWindow *win)
         {
             win = winParent;
             winParent = win->GetParent();
-        }
 
-        wxASSERT_MSG( win, _T("attempt to set last focus to not a child?") );
+            // Yes, this can happen, though in a totally pathological case.
+            // like when detaching a menubar from a frame with a child which
+            // has pushed itself as an event handler for the menubar.  (wxGtk)
+
+            wxASSERT_MSG( winParent, _T("Setting last-focus for a window that is not our child?") );
+        }
     }
 
     m_winLastFocused = win;