X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afdefa8e84c59e774f4d8238f782d65a4d819f26..cd3c2375e6fddd3d478a6776900c21aaeb2d0f08:/src/common/docmdi.cpp

diff --git a/src/common/docmdi.cpp b/src/common/docmdi.cpp
index 78da575af5..fa69061271 100644
--- a/src/common/docmdi.cpp
+++ b/src/common/docmdi.cpp
@@ -105,16 +105,28 @@ wxDocMDIChildFrame::~wxDocMDIChildFrame(void)
 // Extend event processing to search the view's event table
 bool wxDocMDIChildFrame::ProcessEvent(wxEvent& event)
 {
+    static wxEvent *ActiveEvent = NULL;
+
+    // Break recursion loops
+    if (ActiveEvent == &event)
+        return FALSE;
+
+    ActiveEvent = &event;
+
+    bool ret;
 	if ( !m_childView || ! m_childView->ProcessEvent(event) )
     {
         // Only hand up to the parent if it's a menu command
         if (!event.IsKindOf(CLASSINFO(wxCommandEvent)) || !GetParent() || !GetParent()->ProcessEvent(event))
-		    return wxEvtHandler::ProcessEvent(event);
+            ret = wxEvtHandler::ProcessEvent(event);
         else
-            return TRUE;
+            ret = TRUE;
     }
 	else
-		return TRUE;
+        ret = TRUE;
+
+    ActiveEvent = NULL;
+    return ret;
 }
 
 void wxDocMDIChildFrame::OnActivate(wxActivateEvent& event)