Use wxMenuBar::Attach/Detach() instead of SetInvokingWindow() in wxGTK1.

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

diff --git a/src/common/docmdi.cpp b/src/common/docmdi.cpp
index a0de68f3d45766828f374f6e29cc4c7268076268..c8911d606ade00fac77d21b670060ab02946e503 100644 (file)
--- a/src/common/docmdi.cpp
+++ b/src/common/docmdi.cpp
@@ -6,29 +6,17 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "docmdi.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+  #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-#include "wx/defs.h"
-#endif
-
-#if USE_DOC_VIEW_ARCHITECTURE
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
+#if wxUSE_MDI_ARCHITECTURE
 
 #include "wx/docmdi.h"
 
@@ -41,113 +29,65 @@ IMPLEMENT_CLASS(wxDocMDIParentFrame, wxMDIParentFrame)
 BEGIN_EVENT_TABLE(wxDocMDIParentFrame, wxMDIParentFrame)
     EVT_MENU(wxID_EXIT, wxDocMDIParentFrame::OnExit)
     EVT_MENU_RANGE(wxID_FILE1, wxID_FILE9, wxDocMDIParentFrame::OnMRUFile)
+    EVT_CLOSE(wxDocMDIParentFrame::OnCloseWindow)
 END_EVENT_TABLE()
 
-wxDocMDIParentFrame::wxDocMDIParentFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title,
-  const wxPoint& pos, const wxSize& size, long style, const wxString& name):
-  wxMDIParentFrame(frame, id, title, pos, size, style, name)
+wxDocMDIParentFrame::wxDocMDIParentFrame()
 {
-  m_docManager = manager;
-}
-
-void wxDocMDIParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
-{
-    Close();
-}
-
-void wxDocMDIParentFrame::OnMRUFile(wxCommandEvent& event)
-{
-      wxString f(m_docManager->GetHistoryFile(event.GetSelection() - wxID_FILE1));
-      if (f != "")
-        (void)m_docManager->CreateDocument(f, wxDOC_SILENT);
+    Init();
 }
 
-// Extend event processing to search the view's event table
-bool wxDocMDIParentFrame::ProcessEvent(wxEvent& event)
+wxDocMDIParentFrame::wxDocMDIParentFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title,
+  const wxPoint& pos, const wxSize& size, long style, const wxString& name)
 {
-    // Try the document manager, then do default processing
-    if (!m_docManager || !m_docManager->ProcessEvent(event))
-        return wxEvtHandler::ProcessEvent(event);
-    else
-        return TRUE;
+    Init();
+    Create(manager, frame, id, title, pos, size, style, name);
 }
 
-// Define the behaviour for the frame closing
-// - must delete all frames except for the main one.
-bool wxDocMDIParentFrame::OnClose(void)
+bool wxDocMDIParentFrame::Create(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title,
+  const wxPoint& pos, const wxSize& size, long style, const wxString& name)
 {
-  return m_docManager->Clear(FALSE);
+    m_docManager = manager;
+    return wxMDIParentFrame::Create(frame, id, title, pos, size, style, name);
 }
 
-
-/*
- * Default document child frame for MDI children
- */
-
-IMPLEMENT_CLASS(wxDocMDIChildFrame, wxMDIChildFrame)
-
-BEGIN_EVENT_TABLE(wxDocMDIChildFrame, wxMDIChildFrame)
-    EVT_ACTIVATE(wxDocMDIChildFrame::OnActivate)
-END_EVENT_TABLE()
-
-wxDocMDIChildFrame::wxDocMDIChildFrame(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID  id,
-  const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name):
-    wxMDIChildFrame(frame, id, title, pos, size, style, name)
+void wxDocMDIParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 {
-  m_childDocument = doc;
-  m_childView = view;
-  if (view)
-    view->SetFrame(this);
+    Close();
 }
 
-wxDocMDIChildFrame::~wxDocMDIChildFrame(void)
+void wxDocMDIParentFrame::Init()
 {
-       m_childView = (wxView *) NULL;
+    m_docManager = NULL;
 }
 
-// Extend event processing to search the view's event table
-bool wxDocMDIChildFrame::ProcessEvent(wxEvent& event)
+void wxDocMDIParentFrame::OnMRUFile(wxCommandEvent& 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);
-        else
-            return TRUE;
-    }
-       else
-               return TRUE;
+    wxString f(m_docManager->GetHistoryFile(event.GetId() - wxID_FILE1));
+    if (!f.empty())
+        (void)m_docManager->CreateDocument(f, wxDOC_SILENT);
 }
 
-void wxDocMDIChildFrame::OnActivate(wxActivateEvent& event)
+bool wxDocMDIParentFrame::TryBefore(wxEvent& event)
 {
-  wxMDIChildFrame::OnActivate(event);
+    if ( m_docManager && m_docManager->ProcessEventHere(event) )
+        return true;
 
-  if (event.GetActive() && m_childView)
-    m_childView->Activate(event.GetActive());
+    return wxMDIParentFrame::TryBefore(event);
 }
 
-bool wxDocMDIChildFrame::OnClose(void)
+void wxDocMDIParentFrame::OnCloseWindow(wxCloseEvent& event)
 {
-  // Close view but don't delete the frame while doing so!
-  // ...since it will be deleted by wxWindows if we return TRUE.
-  if (m_childView)
+  if (m_docManager->Clear(!event.CanVeto()))
   {
-    bool ans = m_childView->Close(FALSE); // FALSE means don't delete associated window
-    if (ans)
-    {
-      m_childView->Activate(FALSE);
-      delete m_childView;
-      m_childView = (wxView *) NULL;
-      m_childDocument = (wxDocument *) NULL;
-    }
-    
-    return ans;
+    this->Destroy();
   }
-  else return TRUE;
+  else
+    event.Veto();
 }
 
-#endif
-    // USE_DOC_VIEW_ARCHITECTURE
+
+IMPLEMENT_CLASS(wxDocMDIChildFrame, wxMDIChildFrame)
+
+#endif // wxUSE_DOC_VIEW_ARCHITECTURE