Fixes needed to get transient popup windows working, also implement SetFont for OS...

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index dc2704999528206eea55859739eaafcc8a677bc4..ca552a25d4fc6dfee5398bd3df8c9a585dd98040 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -642,15 +642,27 @@ wxView::wxView()
     m_viewDocument = NULL;
 
     m_viewFrame = NULL;
+
+    m_docChildFrame = NULL;
 }
 
 wxView::~wxView()
 {
     GetDocumentManager()->ActivateView(this, false);
-    m_viewDocument->RemoveView(this);
+
+    // reset our frame view first, before removing it from the document as
+    // SetView(NULL) is a simple call while RemoveView() may result in user
+    // code being executed and this user code can, for example, show a message
+    // box which would result in an activation event for m_docChildFrame and so
+    // could reactivate the view being destroyed -- unless we reset it first
+    if ( m_docChildFrame && m_docChildFrame->GetView() == this )
+        m_docChildFrame->SetView(NULL);
+
+    if ( m_viewDocument )
+        m_viewDocument->RemoveView(this);
 }
 
-bool wxView::TryValidator(wxEvent& event)
+bool wxView::TryBefore(wxEvent& event)
 {
     wxDocument * const doc = GetDocument();
     return doc && doc->ProcessEventHere(event);
@@ -1165,7 +1177,7 @@ wxView *wxDocManager::GetActiveView() const
     return view;
 }
 
-bool wxDocManager::TryValidator(wxEvent& event)
+bool wxDocManager::TryBefore(wxEvent& event)
 {
     wxView * const view = GetActiveView();
     return view && view->ProcessEventHere(event);
@@ -1776,68 +1788,27 @@ void wxDocManager::ActivateView(wxView *view, bool activate)
 }
 
 // ----------------------------------------------------------------------------
-// Default document child frame
+// wxDocChildFrameAnyBase
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxDocChildFrame, wxFrame)
-    EVT_ACTIVATE(wxDocChildFrame::OnActivate)
-    EVT_CLOSE(wxDocChildFrame::OnCloseWindow)
-END_EVENT_TABLE()
-
-wxDocChildFrame::wxDocChildFrame(wxDocument *doc,
-                                 wxView *view,
-                                 wxFrame *frame,
-                                 wxWindowID id,
-                                 const wxString& title,
-                                 const wxPoint& pos,
-                                 const wxSize& size,
-                                 long style,
-                                 const wxString& name)
-               : wxFrame(frame, id, title, pos, size, style, name)
-{
-    m_childDocument = doc;
-    m_childView = view;
-    if (view)
-        view->SetFrame(this);
-}
-
-bool wxDocChildFrame::TryValidator(wxEvent& event)
+bool wxDocChildFrameAnyBase::CloseView(wxCloseEvent& event)
 {
-    if ( !m_childView )
-        return false;
-
-    // FIXME: why is this needed here?
-    m_childView->Activate(true);
-
-    return m_childView->ProcessEventHere(event);
-}
-
-void wxDocChildFrame::OnActivate(wxActivateEvent& event)
-{
-    wxFrame::OnActivate(event);
-
-    if (m_childView)
-        m_childView->Activate(event.GetActive());
-}
-
-void wxDocChildFrame::OnCloseWindow(wxCloseEvent& event)
-{
-    if ( !m_childView )
-        return;
-
-    // passing false to Close() means to not delete associated window
-    if ( event.CanVeto() && !m_childView->Close(false) )
+    if ( m_childView )
     {
-        event.Veto();
-        return;
+        if ( event.CanVeto() && !m_childView->Close(false) )
+        {
+            event.Veto();
+            return false;
+        }
+
+        m_childView->Activate(false);
+        delete m_childView;
+        m_childView = NULL;
     }
 
-    m_childView->Activate(false);
-    delete m_childView;
-    m_childView = NULL;
     m_childDocument = NULL;
 
-    Destroy();
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -1920,9 +1891,12 @@ void wxDocParentFrame::OnMRUFile(wxCommandEvent& event)
 }
 
 // Extend event processing to search the view's event table
-bool wxDocParentFrame::TryValidator(wxEvent& event)
+bool wxDocParentFrame::TryBefore(wxEvent& event)
 {
-    return m_docManager && m_docManager->ProcessEventHere(event);
+    if ( m_docManager && m_docManager->ProcessEventHere(event) )
+        return true;
+
+    return wxFrame::TryBefore(event);
 }
 
 // Define the behaviour for the frame closing