X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/84cae69a8b6530450d37bd25e5190e8f963750bb..beb2638a997914bd12c55e81589adebd90af9ed2:/src/common/docview.cpp

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index ac7af5109a..c00db551ce 100644
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -56,8 +56,11 @@
 #include "wx/cmdproc.h"
 #include "wx/tokenzr.h"
 #include "wx/filename.h"
+#include "wx/stdpaths.h"
 #include "wx/vector.h"
-#include "wx/ptr_scpd.h"
+#include "wx/scopedarray.h"
+#include "wx/scopedptr.h"
+#include "wx/except.h"
 
 #if wxUSE_STD_IOSTREAM
     #include "wx/ioswrap.h"
@@ -155,8 +158,7 @@ wxDocument::~wxDocument()
 {
     DeleteContents();
 
-    if (m_commandProcessor)
-        delete m_commandProcessor;
+    delete m_commandProcessor;
 
     if (GetDocumentManager())
         GetDocumentManager()->RemoveDocument(this);
@@ -169,10 +171,10 @@ wxDocument::~wxDocument()
 
 bool wxDocument::Close()
 {
-    if (OnSaveModified())
-        return OnCloseDocument();
-    else
+    if ( !OnSaveModified() )
         return false;
+
+    return OnCloseDocument();
 }
 
 bool wxDocument::OnCloseDocument()
@@ -232,9 +234,10 @@ bool wxDocument::DeleteAllViews()
 
 wxView *wxDocument::GetFirstView() const
 {
-    if (m_documentViews.GetCount() == 0)
+    if ( m_documentViews.empty() )
         return NULL;
-    return (wxView *)m_documentViews.GetFirst()->GetData();
+
+    return static_cast<wxView *>(m_documentViews.GetFirst()->GetData());
 }
 
 wxDocManager *wxDocument::GetDocumentManager() const
@@ -244,11 +247,13 @@ wxDocManager *wxDocument::GetDocumentManager() const
 
 bool wxDocument::OnNewDocument()
 {
-    if ( !OnSaveModified() )
-        return false;
+    // notice that there is no need to neither reset nor even check the
+    // modified flag here as the document itself is a new object (this is only
+    // called from CreateDocument()) and so it shouldn't be saved anyhow even
+    // if it is modified -- this could happen if the user code creates
+    // documents pre-filled with some user-entered (and which hence must not be
+    // lost) information
 
-    DeleteContents();
-    Modify(false);
     SetDocumentSaved(false);
 
     const wxString name = GetDocumentManager()->MakeNewDocumentName();
@@ -275,15 +280,17 @@ bool wxDocument::SaveAs()
     if (!docTemplate)
         return false;
 
-#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__)
-    wxString filter = docTemplate->GetDescription() + wxT(" (") + docTemplate->GetFileFilter() + wxT(")|") + docTemplate->GetFileFilter();
+#ifdef wxHAS_MULTIPLE_FILEDLG_FILTERS
+    wxString filter = docTemplate->GetDescription() + wxT(" (") +
+        docTemplate->GetFileFilter() + wxT(")|") +
+        docTemplate->GetFileFilter();
 
     // Now see if there are some other template with identical view and document
     // classes, whose filters may also be used.
-
     if (docTemplate->GetViewClassInfo() && docTemplate->GetDocClassInfo())
     {
-        wxList::compatibility_iterator node = docTemplate->GetDocumentManager()->GetTemplates().GetFirst();
+        wxList::compatibility_iterator
+            node = docTemplate->GetDocumentManager()->GetTemplates().GetFirst();
         while (node)
         {
             wxDocTemplate *t = (wxDocTemplate*) node->GetData();
@@ -296,7 +303,8 @@ bool wxDocument::SaveAs()
                 if ( !filter.empty() )
                     filter << wxT('|');
 
-                filter << t->GetDescription() << wxT(" (") << t->GetFileFilter() << wxT(") |")
+                filter << t->GetDescription()
+                       << wxT(" (") << t->GetFileFilter() << wxT(") |")
                        << t->GetFileFilter();
             }
 
@@ -306,9 +314,14 @@ bool wxDocument::SaveAs()
 #else
     wxString filter = docTemplate->GetFileFilter() ;
 #endif
+
     wxString defaultDir = docTemplate->GetDirectory();
-    if (defaultDir.IsEmpty())
+    if ( defaultDir.empty() )
+    {
         defaultDir = wxPathOnly(GetFilename());
+        if ( defaultDir.empty() )
+            defaultDir = GetDocumentManager()->GetLastDirectory();
+    }
 
     wxString fileName = wxFileSelector(_("Save As"),
             defaultDir,
@@ -319,7 +332,7 @@ bool wxDocument::SaveAs()
             GetDocumentWindow());
 
     if (fileName.empty())
-        return false;
+        return false; // cancelled by user
 
     wxString ext;
     wxFileName::SplitPath(fileName, NULL, NULL, &ext);
@@ -337,17 +350,15 @@ bool wxDocument::SaveAs()
     SetTitle(wxFileNameFromPath(fileName));
     SetFilename(fileName, true);    // will call OnChangeFileName automatically
 
-   // A file that doesn't use the default extension of its document template cannot be opened
-   // via the FileHistory, so we do not add it.
+   // A file that doesn't use the default extension of its document template
+   // cannot be opened via the FileHistory, so we do not add it.
    if (docTemplate->FileMatchesTemplate(fileName))
    {
        GetDocumentManager()->AddFileToHistory(fileName);
    }
-   else
-   {
-       // The user will probably not be able to open the file again, so
-       // we could warn about the wrong file-extension here.
-   }
+   //else: the user will probably not be able to open the file again, so we
+   //      could warn about the wrong file-extension here
+
    return true;
 }
 
@@ -371,15 +382,20 @@ bool wxDocument::OnSaveDocument(const wxString& file)
 
 bool wxDocument::OnOpenDocument(const wxString& file)
 {
-    if ( !OnSaveModified() )
-        return false;
+    // notice that there is no need to check the modified flag here for the
+    // reasons explained in OnNewDocument()
 
     if ( !DoOpenDocument(file) )
         return false;
 
     SetFilename(file, true);
-    Modify(false);
-    m_savedYet = true;
+
+    // stretching the logic a little this does make sense because the document
+    // had been saved into the file we just loaded it from, it just could have
+    // happened during a previous program execution, it's just that the name of
+    // this method is a bit unfortunate, it should probably have been called
+    // HasAssociatedFileName()
+    SetDocumentSaved(true);
 
     UpdateAllViews();
 
@@ -450,11 +466,9 @@ wxString wxDocument::DoGetUserReadableName() const
 
 wxWindow *wxDocument::GetDocumentWindow() const
 {
-    wxView *view = GetFirstView();
-    if (view)
-        return view->GetFrame();
-    else
-        return wxTheApp->GetTopWindow();
+    wxView * const view = GetFirstView();
+
+    return view ? view->GetFrame() : wxTheApp->GetTopWindow();
 }
 
 wxCommandProcessor *wxDocument::OnCreateCommandProcessor()
@@ -471,7 +485,7 @@ bool wxDocument::OnSaveModified()
                  (
                     wxString::Format
                     (
-                     _("Do you want to save changes to document %s?"),
+                     _("Do you want to save changes to %s?"),
                      GetUserReadableName()
                     ),
                     wxTheApp->GetAppDisplayName(),
@@ -636,21 +650,54 @@ 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 )
+    {
+        // prevent it from doing anything with us
+        m_docChildFrame->SetView(NULL);
+
+        // it doesn't make sense to leave the frame alive if its associated
+        // view doesn't exist any more so unconditionally close it as well
+        //
+        // notice that we only get here if m_docChildFrame is non-NULL in the
+        // first place and it will be always NULL if we're deleted because our
+        // frame was closed, so this only catches the case of directly deleting
+        // the view, as it happens if its creation fails in wxDocTemplate::
+        // CreateView() for example
+        m_docChildFrame->GetWindow()->Destroy();
+    }
+
+    if ( m_viewDocument )
+        m_viewDocument->RemoveView(this);
 }
 
-bool wxView::TryValidator(wxEvent& event)
+void wxView::SetDocChildFrame(wxDocChildFrameAnyBase *docChildFrame)
+{
+    SetFrame(docChildFrame ? docChildFrame->GetWindow() : NULL);
+    m_docChildFrame = docChildFrame;
+}
+
+bool wxView::TryBefore(wxEvent& event)
 {
     wxDocument * const doc = GetDocument();
     return doc && doc->ProcessEventHere(event);
 }
 
-void wxView::OnActivateView(bool WXUNUSED(activate), wxView *WXUNUSED(activeView), wxView *WXUNUSED(deactiveView))
+void wxView::OnActivateView(bool WXUNUSED(activate),
+                            wxView *WXUNUSED(activeView),
+                            wxView *WXUNUSED(deactiveView))
 {
 }
 
@@ -747,11 +794,15 @@ wxDocTemplate::~wxDocTemplate()
 // Tries to dynamically construct an object of the right class.
 wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags)
 {
+    // InitDocument() is supposed to delete the document object if its
+    // initialization fails so don't use wxScopedPtr<> here: this is fragile
+    // but unavoidable because the default implementation uses CreateView()
+    // which may -- or not -- create a wxView and if it does create it and its
+    // initialization fails then the view destructor will delete the document
+    // (via RemoveView()) and as we can't distinguish between the two cases we
+    // just have to assume that it always deletes it in case of failure
     wxDocument * const doc = DoCreateDocument();
 
-    // VZ: this code doesn't delete doc if InitDocument() (i.e. doc->OnCreate())
-    //     fails, is this intentional?
-
     return doc && InitDocument(doc, path, flags) ? doc : NULL;
 }
 
@@ -765,12 +816,10 @@ wxDocTemplate::InitDocument(wxDocument* doc, const wxString& path, long flags)
 
     if (doc->OnCreate(path, flags))
         return true;
-    else
-    {
-        if (GetDocumentManager()->GetDocuments().Member(doc))
-            doc->DeleteAllViews();
-        return false;
-    }
+
+    if (GetDocumentManager()->GetDocuments().Member(doc))
+        doc->DeleteAllViews();
+    return false;
 }
 
 wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags)
@@ -809,7 +858,7 @@ wxDocument *wxDocTemplate::DoCreateDocument()
     if (!m_docClassInfo)
         return NULL;
 
-    return (wxDocument *)m_docClassInfo->CreateObject();
+    return static_cast<wxDocument *>(m_docClassInfo->CreateObject());
 }
 
 wxView *wxDocTemplate::DoCreateView()
@@ -817,7 +866,7 @@ wxView *wxDocTemplate::DoCreateView()
     if (!m_viewClassInfo)
         return NULL;
 
-    return (wxView *)m_viewClassInfo->CreateObject();
+    return static_cast<wxView *>(m_viewClassInfo->CreateObject());
 }
 
 // ----------------------------------------------------------------------------
@@ -880,19 +929,18 @@ wxDocManager::~wxDocManager()
 // closes the specified document
 bool wxDocManager::CloseDocument(wxDocument* doc, bool force)
 {
-    if (doc->Close() || force)
-    {
-        // Implicitly deletes the document when
-        // the last view is deleted
-        doc->DeleteAllViews();
+    if ( !doc->Close() && !force )
+        return false;
 
-        // Check we're really deleted
-        if (m_docs.Member(doc))
-            delete doc;
+    // Implicitly deletes the document when
+    // the last view is deleted
+    doc->DeleteAllViews();
 
-        return true;
-    }
-    return false;
+    // Check we're really deleted
+    if (m_docs.Member(doc))
+        delete doc;
+
+    return true;
 }
 
 bool wxDocManager::CloseDocuments(bool force)
@@ -938,6 +986,19 @@ bool wxDocManager::Initialize()
     return true;
 }
 
+wxString wxDocManager::GetLastDirectory() const
+{
+    // use the system-dependent default location for the document files if
+    // we're being opened for the first time
+    if ( m_lastDirectory.empty() )
+    {
+        wxDocManager * const self = const_cast<wxDocManager *>(this);
+        self->m_lastDirectory = wxStandardPaths::Get().GetAppDocumentsDir();
+    }
+
+    return m_lastDirectory;
+}
+
 wxFileHistory *wxDocManager::OnCreateFileHistory()
 {
     return new wxFileHistory;
@@ -968,7 +1029,7 @@ void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event))
 
 void wxDocManager::OnFileOpen(wxCommandEvent& WXUNUSED(event))
 {
-    if ( !CreateDocument( wxEmptyString, 0) )
+    if ( !CreateDocument("") )
     {
         OnOpenFileFailure();
     }
@@ -1001,7 +1062,7 @@ void wxDocManager::OnFileSaveAs(wxCommandEvent& WXUNUSED(event))
 void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_PRINTING_ARCHITECTURE
-    wxView *view = GetCurrentView();
+    wxView *view = GetActiveView();
     if (!view)
         return;
 
@@ -1019,7 +1080,7 @@ void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
 void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_PRINTING_ARCHITECTURE
-    wxView *view = GetCurrentView();
+    wxView *view = GetActiveView();
     if (!view)
         return;
 
@@ -1027,16 +1088,18 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
     if (printout)
     {
         // Pass two printout objects: for preview, and possible printing.
-        wxPrintPreviewBase *preview = new wxPrintPreview(printout, view->OnCreatePrintout());
+        wxPrintPreviewBase *
+            preview = new wxPrintPreview(printout, view->OnCreatePrintout());
         if ( !preview->Ok() )
         {
             delete preview;
-            wxMessageBox( _("Sorry, print preview needs a printer to be installed.") );
+            wxLogError(_("Print preview creation failed."));
             return;
         }
 
-        wxPreviewFrame *frame = new wxPreviewFrame(preview, (wxFrame *)wxTheApp->GetTopWindow(), _("Print Preview"),
-                wxPoint(100, 100), wxSize(600, 650));
+        wxPreviewFrame *
+            frame = new wxPreviewFrame(preview, wxTheApp->GetTopWindow(),
+                                       _("Print Preview"));
         frame->Centre(wxBOTH);
         frame->Initialize();
         frame->Show(true);
@@ -1046,24 +1109,26 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
 
 void wxDocManager::OnUndo(wxCommandEvent& event)
 {
-    wxDocument *doc = GetCurrentDocument();
-    if (!doc)
-        return;
-    if (doc->GetCommandProcessor())
-        doc->GetCommandProcessor()->Undo();
-    else
+    wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor();
+    if ( !cmdproc )
+    {
         event.Skip();
+        return;
+    }
+
+    cmdproc->Undo();
 }
 
 void wxDocManager::OnRedo(wxCommandEvent& event)
 {
-    wxDocument *doc = GetCurrentDocument();
-    if (!doc)
-        return;
-    if (doc->GetCommandProcessor())
-        doc->GetCommandProcessor()->Redo();
-    else
+    wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor();
+    if ( !cmdproc )
+    {
         event.Skip();
+        return;
+    }
+
+    cmdproc->Redo();
 }
 
 // Handlers for UI update commands
@@ -1095,47 +1160,57 @@ void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event)
 
 void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event)
 {
-    wxDocument *doc = GetCurrentDocument();
-    if (!doc)
-        event.Enable(false);
-    else if (!doc->GetCommandProcessor())
-        event.Skip();
-    else
+    wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor();
+    if ( !cmdproc )
     {
-        event.Enable( doc->GetCommandProcessor()->CanUndo() );
-        doc->GetCommandProcessor()->SetMenuStrings();
+        event.Enable(false);
+        return;
     }
+
+    event.Enable(cmdproc->CanUndo());
+    cmdproc->SetMenuStrings();
 }
 
 void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event)
 {
-    wxDocument *doc = GetCurrentDocument();
-    if (!doc)
-        event.Enable(false);
-    else if (!doc->GetCommandProcessor())
-        event.Skip();
-    else
+    wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor();
+    if ( !cmdproc )
     {
-        event.Enable( doc->GetCommandProcessor()->CanRedo() );
-        doc->GetCommandProcessor()->SetMenuStrings();
+        event.Enable(false);
+        return;
     }
+
+    event.Enable(cmdproc->CanRedo());
+    cmdproc->SetMenuStrings();
 }
 
-wxView *wxDocManager::GetCurrentView() const
+wxView *wxDocManager::GetActiveView() const
 {
-    if (m_currentView)
-        return m_currentView;
-    if (m_docs.GetCount() == 1)
+    wxView *view = GetCurrentView();
+
+    if ( !view && !m_docs.empty() )
     {
-        wxDocument* doc = (wxDocument*) m_docs.GetFirst()->GetData();
-        return doc->GetFirstView();
+        // if we have exactly one document, consider its view to be the current
+        // one
+        //
+        // VZ: I'm not exactly sure why is this needed but this is how this
+        //     code used to behave before the bug #9518 was fixed and it seems
+        //     safer to preserve the old logic
+        wxList::compatibility_iterator node = m_docs.GetFirst();
+        if ( !node->GetNext() )
+        {
+            wxDocument *doc = static_cast<wxDocument *>(node->GetData());
+            view = doc->GetFirstView();
+        }
+        //else: we have more than one document
     }
-    return NULL;
+
+    return view;
 }
 
-bool wxDocManager::TryValidator(wxEvent& event)
+bool wxDocManager::TryBefore(wxEvent& event)
 {
-    wxView * const view = GetCurrentView();
+    wxView * const view = GetActiveView();
     return view && view->ProcessEventHere(event);
 }
 
@@ -1256,15 +1331,18 @@ wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)
     docNew->SetDocumentName(temp->GetDocumentName());
     docNew->SetDocumentTemplate(temp);
 
-    // call the appropriate function depending on whether we're creating a new
-    // file or opening an existing one
-    if ( !(flags & wxDOC_NEW ? docNew->OnNewDocument()
-                             : docNew->OnOpenDocument(path)) )
+    wxTRY
     {
-         // Document is implicitly deleted by DeleteAllViews
-         docNew->DeleteAllViews();
-         return NULL;
+        // call the appropriate function depending on whether we're creating a
+        // new file or opening an existing one
+        if ( !(flags & wxDOC_NEW ? docNew->OnNewDocument()
+                                 : docNew->OnOpenDocument(path)) )
+        {
+            docNew->DeleteAllViews();
+            return NULL;
+        }
     }
+    wxCATCH_ALL( docNew->DeleteAllViews(); throw; )
 
     // add the successfully opened file to MRU, but only if we're going to be
     // able to reopen it successfully later which requires the template for
@@ -1310,11 +1388,14 @@ bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc))
 
 wxDocument *wxDocManager::GetCurrentDocument() const
 {
-    wxView *view = GetCurrentView();
-    if (view)
-        return view->GetDocument();
-    else
-        return NULL;
+    wxView * const view = GetActiveView();
+    return view ? view->GetDocument() : NULL;
+}
+
+wxCommandProcessor *wxDocManager::GetCurrentCommandProcessor() const
+{
+    wxDocument * const doc = GetCurrentDocument();
+    return doc ? doc->GetCommandProcessor() : NULL;
 }
 
 // Make a default name for a new document
@@ -1462,12 +1543,10 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
                                                 long WXUNUSED(flags),
                                                 bool WXUNUSED(save))
 {
-    // We can only have multiple filters in Windows and GTK
-#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__)
+#ifdef wxHAS_MULTIPLE_FILEDLG_FILTERS
     wxString descrBuf;
 
-    int i;
-    for (i = 0; i < noTemplates; i++)
+    for (int i = 0; i < noTemplates; i++)
     {
         if (templates[i]->IsVisible())
         {
@@ -1490,7 +1569,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
     wxWindow* parent = wxFindSuitableParent();
 
     wxString pathTmp = wxFileSelectorEx(_("Open File"),
-                                        m_lastDirectory,
+                                        GetLastDirectory(),
                                         wxEmptyString,
                                         &FilterIndex,
                                         descrBuf,
@@ -1508,13 +1587,16 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
             else
                 msgTitle = wxString(_("File error"));
 
-            (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK | wxICON_EXCLAMATION | wxCENTRE,
-                parent);
+            wxMessageBox(_("Sorry, could not open this file."),
+                         msgTitle,
+                         wxOK | wxICON_EXCLAMATION | wxCENTRE,
+                         parent);
 
             path = wxEmptyString;
             return NULL;
         }
-        m_lastDirectory = wxPathOnly(pathTmp);
+
+        SetLastDirectory(wxPathOnly(pathTmp));
 
         path = pathTmp;
 
@@ -1526,16 +1608,18 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
             theTemplate = FindTemplateForPath(path);
         if ( !theTemplate )
         {
-            // Since we do not add files with non-default extensions to the FileHistory this
-            // can only happen if the application changes the allowed templates in runtime.
-            (void)wxMessageBox(_("Sorry, the format for this file is unknown."),
-                                _("Open File"),
-                                wxOK | wxICON_EXCLAMATION | wxCENTRE, wxFindSuitableParent());
+            // Since we do not add files with non-default extensions to the
+            // file history this can only happen if the application changes the
+            // allowed templates in runtime.
+            wxMessageBox(_("Sorry, the format for this file is unknown."),
+                         _("Open File"),
+                         wxOK | wxICON_EXCLAMATION | wxCENTRE,
+                         parent);
         }
     }
     else
     {
-        path = wxEmptyString;
+        path.clear();
     }
 
     return theTemplate;
@@ -1545,7 +1629,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
                                                 int noTemplates, bool sort)
 {
     wxArrayString strings;
-    wxDocTemplate **data = new wxDocTemplate *[noTemplates];
+    wxScopedArray<wxDocTemplate *> data(new wxDocTemplate *[noTemplates]);
     int i;
     int n = 0;
 
@@ -1612,13 +1696,11 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
                             _("Select a document template"),
                             _("Templates"),
                             strings,
-                            (void **)data,
+                            (void **)data.get(),
                             wxFindSuitableParent()
                           );
     }
 
-    delete[] data;
-
     return theTemplate;
 }
 
@@ -1626,7 +1708,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
                                             int noTemplates, bool sort)
 {
     wxArrayString strings;
-    wxDocTemplate **data = new wxDocTemplate *[noTemplates];
+    wxScopedArray<wxDocTemplate *> data(new wxDocTemplate *[noTemplates]);
     int i;
     int n = 0;
 
@@ -1689,13 +1771,12 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
                             _("Select a document view"),
                             _("Views"),
                             strings,
-                            (void **)data,
+                            (void **)data.get(),
                             wxFindSuitableParent()
                           );
 
     }
 
-    delete[] data;
     return theTemplate;
 }
 
@@ -1741,72 +1822,34 @@ 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)
+    if ( m_childView )
     {
-        bool ans = event.CanVeto()
-                    ? m_childView->Close(false) // false means don't delete associated window
-                    : true; // Must delete.
-
-        if (ans)
+        if ( event.CanVeto() && !m_childView->Close(false) )
         {
-            m_childView->Activate(false);
-            delete m_childView;
-            m_childView = NULL;
-            m_childDocument = NULL;
-
-            this->Destroy();
-        }
-        else
             event.Veto();
+            return false;
+        }
+
+        m_childView->Activate(false);
+
+        // it is important to reset m_childView frame pointer to NULL before
+        // deleting it because while normally it is the frame which deletes the
+        // view when it's closed, the view also closes the frame if it is
+        // deleted directly not by us as indicated by its doc child frame
+        // pointer still being set
+        m_childView->SetDocChildFrame(NULL);
+        delete m_childView;
+        m_childView = NULL;
     }
-    else
-        event.Veto();
+
+    m_childDocument = NULL;
+
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -1889,9 +1932,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
@@ -1900,7 +1946,7 @@ void wxDocParentFrame::OnCloseWindow(wxCloseEvent& event)
 {
     if (m_docManager->Clear(!event.CanVeto()))
     {
-        this->Destroy();
+        Destroy();
     }
     else
         event.Veto();
@@ -1966,7 +2012,8 @@ bool wxDocPrintout::OnBeginDocument(int startPage, int endPage)
     return true;
 }
 
-void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo)
+void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage,
+                                int *selPageFrom, int *selPageTo)
 {
     *minPage = 1;
     *maxPage = 1;