Added DoSetSize and DoMoveWindow to generic wxStaticLine.

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

diff --git a/src/common/docmdi.cpp b/src/common/docmdi.cpp
index 0379f04ff8850eb12ac03a87b31d88231f8db534..fa690612713e30900c4fcf109184e832595f640a 100644 (file)
--- a/src/common/docmdi.cpp
+++ b/src/common/docmdi.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -17,18 +17,10 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WX_PRECOMP
-#include "wx/defs.h"
-#endif
-
-#if wxUSE_DOC_VIEW_ARCHITECTURE
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
+#if wxUSE_MDI_ARCHITECTURE && wxUSE_DOC_VIEW_ARCHITECTURE

 
 #include "wx/docmdi.h"
 
 
 #include "wx/docmdi.h"
 


@@ -58,8 +50,8 @@ void wxDocMDIParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 
 void wxDocMDIParentFrame::OnMRUFile(wxCommandEvent& event)
 {
 
 void wxDocMDIParentFrame::OnMRUFile(wxCommandEvent& event)
 {

-      wxString f(m_docManager->GetHistoryFile(event.GetSelection() - wxID_FILE1));
-      if (f != "")
+      wxString f(m_docManager->GetHistoryFile(event.GetId() - wxID_FILE1));
+      if (f != wxT(""))

         (void)m_docManager->CreateDocument(f, wxDOC_SILENT);
 }
 
         (void)m_docManager->CreateDocument(f, wxDOC_SILENT);
 }
 


@@ -113,16 +105,28 @@ wxDocMDIChildFrame::~wxDocMDIChildFrame(void)
 // Extend event processing to search the view's event table
 bool wxDocMDIChildFrame::ProcessEvent(wxEvent& event)
 {
 // 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))
        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
         else

-            return TRUE;
+            ret = TRUE;

     }
        else
     }
        else

-               return TRUE;
+        ret = TRUE;
+
+    ActiveEvent = NULL;
+    return ret;

 }
 
 void wxDocMDIChildFrame::OnActivate(wxActivateEvent& event)
 }
 
 void wxDocMDIChildFrame::OnActivate(wxActivateEvent& event)