From 6f8239de2307c1ed34ae5a98b330748c60ef2b10 Mon Sep 17 00:00:00 2001
From: Ron Lee <ron@debian.org>
Date: Fri, 8 Mar 2002 01:23:17 +0000
Subject: [PATCH] Moved assert to before the segfault.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
src/common/containr.cpp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 5ad3a7f006..fcd92fc6ac 100644
--- 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;
--
2.47.2