wxMessageBox off the main thread lost result code.

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 8ed6b129aaf1deb94fd699058af14ef691ef78c4..b646d9efe21b1a88b6b21df89d8e432b384906c2 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -76,8 +75,6 @@
     #include "wx/wfstream.h"
 #endif
 
     #include "wx/wfstream.h"
 #endif
 

-typedef wxVector<wxDocTemplate *> wxDocTemplates;
-

 // ----------------------------------------------------------------------------
 // wxWidgets macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWidgets macros
 // ----------------------------------------------------------------------------


@@ -860,19 +857,25 @@ wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags)
 bool
 wxDocTemplate::InitDocument(wxDocument* doc, const wxString& path, long flags)
 {
 bool
 wxDocTemplate::InitDocument(wxDocument* doc, const wxString& path, long flags)
 {

-    wxScopeGuard g = wxMakeObjGuard(*doc, &wxDocument::DeleteAllViews);
-
-    doc->SetFilename(path);
-    doc->SetDocumentTemplate(this);
-    GetDocumentManager()->AddDocument(doc);
-    doc->SetCommandProcessor(doc->OnCreateCommandProcessor());
-
-    if ( !doc->OnCreate(path, flags) )
-        return false;
-
-    g.Dismiss(); // no need to call DeleteAllViews() anymore
+    // Normally, if wxDocument::OnCreate() fails, it happens because the view
+    // initialization fails and then the document is destroyed due to the
+    // destruction of its last view. But take into account the (currently
+    // unrealized, AFAICS) possibility of other failures as well and ensure
+    // that the document is always destroyed if it can't be initialized.
+    wxTRY
+    {
+        doc->SetFilename(path);
+        doc->SetDocumentTemplate(this);
+        GetDocumentManager()->AddDocument(doc);
+        doc->SetCommandProcessor(doc->OnCreateCommandProcessor());

 
 

-    return true;
+        return doc->OnCreate(path, flags);
+    }
+    wxCATCH_ALL(
+        if ( GetDocumentManager()->GetDocuments().Member(doc) )
+            doc->DeleteAllViews();
+        throw;
+    )

 }
 
 wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags)
 }
 
 wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags)


@@ -1187,7 +1190,7 @@ void wxDocManager::OnMRUFileNotExist(unsigned n, const wxString& filename)
 
 void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
 {

-    wxView *view = GetActiveView();
+    wxView *view = GetAnyUsableView();

     if (!view)
         return;
 
     if (!view)
         return;
 


@@ -1221,7 +1224,7 @@ wxPreviewFrame* wxDocManager::CreatePreviewFrame(wxPrintPreviewBase* preview,
 void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
 {
     wxBusyCursor busy;
 void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
 {
     wxBusyCursor busy;

-    wxView *view = GetActiveView();
+    wxView *view = GetAnyUsableView();

     if (!view)
         return;
 
     if (!view)
         return;
 


@@ -1350,7 +1353,7 @@ void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event)
     cmdproc->SetMenuStrings();
 }
 
     cmdproc->SetMenuStrings();
 }
 

-wxView *wxDocManager::GetActiveView() const
+wxView *wxDocManager::GetAnyUsableView() const

 {
     wxView *view = GetCurrentView();
 
 {
     wxView *view = GetCurrentView();
 


@@ -1376,7 +1379,7 @@ wxView *wxDocManager::GetActiveView() const
 
 bool wxDocManager::TryBefore(wxEvent& event)
 {
 
 bool wxDocManager::TryBefore(wxEvent& event)
 {

-    wxView * const view = GetActiveView();
+    wxView * const view = GetAnyUsableView();

     return view && view->ProcessEventLocally(event);
 }
 
     return view && view->ProcessEventLocally(event);
 }
 


@@ -1384,11 +1387,11 @@ namespace
 {
 
 // helper function: return only the visible templates
 {
 
 // helper function: return only the visible templates

-wxDocTemplates GetVisibleTemplates(const wxList& allTemplates)
+wxDocTemplateVector GetVisibleTemplates(const wxList& allTemplates)

 {
     // select only the visible templates
     const size_t totalNumTemplates = allTemplates.GetCount();
 {
     // select only the visible templates
     const size_t totalNumTemplates = allTemplates.GetCount();

-    wxDocTemplates templates;
+    wxDocTemplateVector templates;

     if ( totalNumTemplates )
     {
         templates.reserve(totalNumTemplates);
     if ( totalNumTemplates )
     {
         templates.reserve(totalNumTemplates);


@@ -1409,9 +1412,9 @@ wxDocTemplates GetVisibleTemplates(const wxList& allTemplates)
 
 } // anonymous namespace
 
 
 } // anonymous namespace
 

-void wxDocManager::ActivateDocument(wxDocument *doc)
+void wxDocument::Activate()

 {
 {

-    wxView * const view = doc->GetFirstView();
+    wxView * const view = GetFirstView();

     if ( !view )
         return;
 
     if ( !view )
         return;
 


@@ -1420,12 +1423,25 @@ void wxDocManager::ActivateDocument(wxDocument *doc)
         win->Raise();
 }
 
         win->Raise();
 }
 

+wxDocument* wxDocManager::FindDocumentByPath(const wxString& path) const
+{
+    const wxFileName fileName(path);
+    for ( wxList::const_iterator i = m_docs.begin(); i != m_docs.end(); ++i )
+    {
+        wxDocument * const doc = wxStaticCast(*i, wxDocument);
+
+        if ( fileName == wxFileName(doc->GetFilename()) )
+            return doc;
+    }
+    return NULL;
+}
+

 wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)
 {
     // this ought to be const but SelectDocumentType/Path() are not
     // const-correct and can't be changed as, being virtual, this risks
     // breaking user code overriding them
 wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)
 {
     // this ought to be const but SelectDocumentType/Path() are not
     // const-correct and can't be changed as, being virtual, this risks
     // breaking user code overriding them

-    wxDocTemplates templates(GetVisibleTemplates(m_templates));
+    wxDocTemplateVector templates(GetVisibleTemplates(m_templates));

     const size_t numTemplates = templates.size();
     if ( !numTemplates )
     {
     const size_t numTemplates = templates.size();
     if ( !numTemplates )
     {


@@ -1466,21 +1482,15 @@ wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)
     // check whether the document with this path is already opened
     if ( !path.empty() )
     {
     // check whether the document with this path is already opened
     if ( !path.empty() )
     {

-        const wxFileName fn(path);
-        for ( wxList::const_iterator i = m_docs.begin(); i != m_docs.end(); ++i )
+        wxDocument * const doc = FindDocumentByPath(path);
+        if (doc)

         {
         {

-            wxDocument * const doc = (wxDocument*)*i;
-
-            if ( fn == doc->GetFilename() )
-            {
-                // file already open, just activate it and return
-                ActivateDocument(doc);
-                return doc;
-            }
+            // file already open, just activate it and return
+            doc->Activate();
+            return doc;

         }
     }
 
         }
     }
 

-

     // no, we need to create a new document
 
 
     // no, we need to create a new document
 
 


@@ -1501,7 +1511,6 @@ wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)
         return NULL;
 
     docNew->SetDocumentName(temp->GetDocumentName());
         return NULL;
 
     docNew->SetDocumentName(temp->GetDocumentName());

-    docNew->SetDocumentTemplate(temp);

 
     wxTRY
     {
 
     wxTRY
     {


@@ -1525,14 +1534,14 @@ wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)
     // at least under Mac (where views are top level windows) it seems to be
     // necessary to manually activate the new document to bring it to the
     // forefront -- and it shouldn't hurt doing this under the other platforms
     // at least under Mac (where views are top level windows) it seems to be
     // necessary to manually activate the new document to bring it to the
     // forefront -- and it shouldn't hurt doing this under the other platforms

-    ActivateDocument(docNew);
+    docNew->Activate();

 
     return docNew;
 }
 
 wxView *wxDocManager::CreateView(wxDocument *doc, long flags)
 {
 
     return docNew;
 }
 
 wxView *wxDocManager::CreateView(wxDocument *doc, long flags)
 {

-    wxDocTemplates templates(GetVisibleTemplates(m_templates));
+    wxDocTemplateVector templates(GetVisibleTemplates(m_templates));

     const size_t numTemplates = templates.size();
 
     if ( numTemplates == 0 )
     const size_t numTemplates = templates.size();
 
     if ( numTemplates == 0 )


@@ -1565,7 +1574,7 @@ bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc))
 
 wxDocument *wxDocManager::GetCurrentDocument() const
 {
 
 wxDocument *wxDocManager::GetCurrentDocument() const
 {

-    wxView * const view = GetActiveView();
+    wxView * const view = GetAnyUsableView();

     return view ? view->GetDocument() : NULL;
 }
 
     return view ? view->GetDocument() : NULL;
 }
 


@@ -2009,6 +2018,31 @@ void wxDocManager::ActivateView(wxView *view, bool activate)
 // wxDocChildFrameAnyBase
 // ----------------------------------------------------------------------------
 
 // wxDocChildFrameAnyBase
 // ----------------------------------------------------------------------------
 

+bool wxDocChildFrameAnyBase::TryProcessEvent(wxEvent& event)
+{
+    if ( !m_childView )
+    {
+        // We must be being destroyed, don't forward events anywhere as
+        // m_childDocument could be invalid by now.
+        return false;
+    }
+
+    // Store a (non-owning) pointer to the last processed event here to be able
+    // to recognize this event again if it bubbles up to the parent frame, see
+    // the code in wxDocParentFrameAnyBase::TryProcessEvent().
+    m_lastEvent = &event;
+
+    // Forward the event to the document manager which will, in turn, forward
+    // it to its active view which must be our m_childView.
+    //
+    // Notice that we do things in this roundabout way to guarantee the correct
+    // event handlers call order: first the document, then the view and then the
+    // document manager itself. And if we forwarded the event directly to the
+    // view, then the document manager would do it once again when we forwarded
+    // it to it.
+    return m_childDocument->GetDocumentManager()->ProcessEventLocally(event);
+}
+

 bool wxDocChildFrameAnyBase::CloseView(wxCloseEvent& event)
 {
     if ( m_childView )
 bool wxDocChildFrameAnyBase::CloseView(wxCloseEvent& event)
 {
     if ( m_childView )


@@ -2041,6 +2075,29 @@ bool wxDocChildFrameAnyBase::CloseView(wxCloseEvent& event)
 // wxDocParentFrameAnyBase
 // ----------------------------------------------------------------------------
 
 // wxDocParentFrameAnyBase
 // ----------------------------------------------------------------------------
 

+bool wxDocParentFrameAnyBase::TryProcessEvent(wxEvent& event)
+{
+    if ( !m_docManager )
+        return false;
+
+    // If we have an active view, its associated child frame may have
+    // already forwarded the event to wxDocManager, check for this:
+    if ( wxView* const view = m_docManager->GetAnyUsableView() )
+    {
+        wxDocChildFrameAnyBase* const childFrame = view->GetDocChildFrame();
+        if ( childFrame && childFrame->HasAlreadyProcessed(event) )
+            return false;
+    }
+
+    // But forward the event to wxDocManager ourselves if there are no views at
+    // all or if this event hadn't been sent to the child frame previously.
+    return m_docManager->ProcessEventLocally(event);
+}
+
+// ----------------------------------------------------------------------------
+// Printing support
+// ----------------------------------------------------------------------------
+

 #if wxUSE_PRINTING_ARCHITECTURE
 
 namespace
 #if wxUSE_PRINTING_ARCHITECTURE
 
 namespace