finding papersizes allows for 1 mm tolerance

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

diff --git a/src/common/docmdi.cpp b/src/common/docmdi.cpp
index 4038ddb70024811d9f165641f98f6c15e80c5063..2c7f79268a0ff19ca1b29c159bc05b0f429b2123 100644 (file)
--- a/src/common/docmdi.cpp
+++ b/src/common/docmdi.cpp
@@ -20,7 +20,7 @@
   #pragma hdrstop
 #endif
 
-#if wxUSE_DOC_VIEW_ARCHITECTURE
+#if wxUSE_MDI_ARCHITECTURE
 
 #include "wx/docmdi.h"
 
@@ -50,8 +50,8 @@ void wxDocMDIParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 
 void wxDocMDIParentFrame::OnMRUFile(wxCommandEvent& event)
 {
-      wxString f(m_docManager->GetHistoryFile(event.GetSelection() - wxID_FILE1));
-      if (f != _T(""))
+      wxString f(m_docManager->GetHistoryFile(event.GetId() - wxID_FILE1));
+      if (f != wxT(""))
         (void)m_docManager->CreateDocument(f, wxDOC_SILENT);
 }
 
@@ -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)