Remove always moving window to the top of the Z-order on on Show

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

diff --git a/src/common/docmdi.cpp b/src/common/docmdi.cpp
index 6e92c70f57f174dfe3fbda1f35052486af35bee0..29f89756d093a347ee404d403146c625620e43d8 100644 (file)
--- a/src/common/docmdi.cpp
+++ b/src/common/docmdi.cpp
@@ -9,26 +9,14 @@
 // 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 wxUSE_DOC_VIEW_ARCHITECTURE
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
+#if wxUSE_MDI_ARCHITECTURE
 
 #include "wx/docmdi.h"
 
@@ -44,11 +32,23 @@ BEGIN_EVENT_TABLE(wxDocMDIParentFrame, wxMDIParentFrame)
     EVT_CLOSE(wxDocMDIParentFrame::OnCloseWindow)
 END_EVENT_TABLE()
 
+wxDocMDIParentFrame::wxDocMDIParentFrame()
+{
+    Init();
+}
+
 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)
+  const wxPoint& pos, const wxSize& size, long style, const wxString& name)
 {
-  m_docManager = manager;
+    Init();
+    Create(manager, frame, id, title, pos, size, style, name);
+}
+
+bool wxDocMDIParentFrame::Create(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title,
+  const wxPoint& pos, const wxSize& size, long style, const wxString& name)
+{
+    m_docManager = manager;
+    return wxMDIParentFrame::Create(frame, id, title, pos, size, style, name);
 }
 
 void wxDocMDIParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
@@ -56,10 +56,15 @@ void wxDocMDIParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
     Close();
 }
 
+void wxDocMDIParentFrame::Init()
+{
+    m_docManager = NULL;
+}
+
 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.empty())
         (void)m_docManager->CreateDocument(f, wxDOC_SILENT);
 }
 
@@ -70,7 +75,7 @@ bool wxDocMDIParentFrame::ProcessEvent(wxEvent& event)
     if (!m_docManager || !m_docManager->ProcessEvent(event))
         return wxEvtHandler::ProcessEvent(event);
     else
-        return TRUE;
+        return true;
 }
 
 void wxDocMDIParentFrame::OnCloseWindow(wxCloseEvent& event)
@@ -95,34 +100,69 @@ BEGIN_EVENT_TABLE(wxDocMDIChildFrame, wxMDIChildFrame)
     EVT_CLOSE(wxDocMDIChildFrame::OnCloseWindow)
 END_EVENT_TABLE()
 
+void wxDocMDIChildFrame::Init()
+{
+    m_childDocument = (wxDocument*)  NULL;
+    m_childView = (wxView*) NULL;
+}
+
+wxDocMDIChildFrame::wxDocMDIChildFrame()
+{
+    Init();
+}
+
 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)
+  const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name)
 {
-  m_childDocument = doc;
-  m_childView = view;
-  if (view)
-    view->SetFrame(this);
+    Init();
+    Create(doc, view, frame, id, title, pos, size, style, name);
+}
+
+bool wxDocMDIChildFrame::Create(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID  id,
+  const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name)
+{
+    m_childDocument = doc;
+    m_childView = view;
+    if (wxMDIChildFrame::Create(frame, id, title, pos, size, style, name))
+    {
+        if (view)
+            view->SetFrame(this);
+        return true;
+    }
+
+    return false;
 }
 
 wxDocMDIChildFrame::~wxDocMDIChildFrame(void)
 {
-       m_childView = (wxView *) NULL;
+    m_childView = (wxView *) NULL;
 }
 
 // Extend event processing to search the view's event table
 bool wxDocMDIChildFrame::ProcessEvent(wxEvent& event)
 {
-       if ( !m_childView || ! m_childView->ProcessEvent(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;
+    else
+        ret = true;
+
+    ActiveEvent = NULL;
+    return ret;
 }
 
 void wxDocMDIChildFrame::OnActivate(wxActivateEvent& event)
@@ -136,18 +176,16 @@ void wxDocMDIChildFrame::OnActivate(wxActivateEvent& event)
 void wxDocMDIChildFrame::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.
+  // ...since it will be deleted by wxWidgets if we return true.
   if (m_childView)
   {
-    bool ans = FALSE;
-    if (!event.CanVeto())
-      ans = TRUE; // Must delete.
-    else
-      ans = m_childView->Close(FALSE); // FALSE means don't delete associated window
+    bool ans = event.CanVeto()
+                ? m_childView->Close(false) // false means don't delete associated window
+                : true; // Must delete.
 
     if (ans)
     {
-      m_childView->Activate(FALSE);
+      m_childView->Activate(false);
       delete m_childView;
       m_childView = (wxView *) NULL;
       m_childDocument = (wxDocument *) NULL;