fixed wxXmlResource::Load's detection of filenames to be done as early as possible

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index ac7af5109a16d62ab28b6fd2570d8d97b75143a9..dc2704999528206eea55859739eaafcc8a677bc4 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -56,8 +56,10 @@
 #include "wx/cmdproc.h"
 #include "wx/tokenzr.h"
 #include "wx/filename.h"
 #include "wx/cmdproc.h"
 #include "wx/tokenzr.h"
 #include "wx/filename.h"

+#include "wx/stdpaths.h"

 #include "wx/vector.h"
 #include "wx/vector.h"

-#include "wx/ptr_scpd.h"
+#include "wx/scopedarray.h"
+#include "wx/scopedptr.h"

 
 #if wxUSE_STD_IOSTREAM
     #include "wx/ioswrap.h"
 
 #if wxUSE_STD_IOSTREAM
     #include "wx/ioswrap.h"


@@ -155,8 +157,7 @@ wxDocument::~wxDocument()
 {
     DeleteContents();
 
 {
     DeleteContents();
 

-    if (m_commandProcessor)
-        delete m_commandProcessor;
+    delete m_commandProcessor;

 
     if (GetDocumentManager())
         GetDocumentManager()->RemoveDocument(this);
 
     if (GetDocumentManager())
         GetDocumentManager()->RemoveDocument(this);


@@ -169,10 +170,10 @@ wxDocument::~wxDocument()
 
 bool wxDocument::Close()
 {
 
 bool wxDocument::Close()
 {

-    if (OnSaveModified())
-        return OnCloseDocument();
-    else
+    if ( !OnSaveModified() )

         return false;
         return false;

+
+    return OnCloseDocument();

 }
 
 bool wxDocument::OnCloseDocument()
 }
 
 bool wxDocument::OnCloseDocument()


@@ -232,9 +233,10 @@ bool wxDocument::DeleteAllViews()
 
 wxView *wxDocument::GetFirstView() const
 {
 
 wxView *wxDocument::GetFirstView() const
 {

-    if (m_documentViews.GetCount() == 0)
+    if ( m_documentViews.empty() )

         return NULL;
         return NULL;

-    return (wxView *)m_documentViews.GetFirst()->GetData();
+
+    return static_cast<wxView *>(m_documentViews.GetFirst()->GetData());

 }
 
 wxDocManager *wxDocument::GetDocumentManager() const
 }
 
 wxDocManager *wxDocument::GetDocumentManager() const


@@ -275,15 +277,17 @@ bool wxDocument::SaveAs()
     if (!docTemplate)
         return false;
 
     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.
 
     // 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())
     {
     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();
         while (node)
         {
             wxDocTemplate *t = (wxDocTemplate*) node->GetData();


@@ -296,7 +300,8 @@ bool wxDocument::SaveAs()
                 if ( !filter.empty() )
                     filter << wxT('|');
 
                 if ( !filter.empty() )
                     filter << wxT('|');
 

-                filter << t->GetDescription() << wxT(" (") << t->GetFileFilter() << wxT(") |")
+                filter << t->GetDescription()
+                       << wxT(" (") << t->GetFileFilter() << wxT(") |")

                        << t->GetFileFilter();
             }
 
                        << t->GetFileFilter();
             }
 


@@ -306,9 +311,14 @@ bool wxDocument::SaveAs()
 #else
     wxString filter = docTemplate->GetFileFilter() ;
 #endif
 #else
     wxString filter = docTemplate->GetFileFilter() ;
 #endif

+

     wxString defaultDir = docTemplate->GetDirectory();
     wxString defaultDir = docTemplate->GetDirectory();

-    if (defaultDir.IsEmpty())
+    if ( defaultDir.empty() )
+    {

         defaultDir = wxPathOnly(GetFilename());
         defaultDir = wxPathOnly(GetFilename());

+        if ( defaultDir.empty() )
+            defaultDir = GetDocumentManager()->GetLastDirectory();
+    }

 
     wxString fileName = wxFileSelector(_("Save As"),
             defaultDir,
 
     wxString fileName = wxFileSelector(_("Save As"),
             defaultDir,


@@ -319,7 +329,7 @@ bool wxDocument::SaveAs()
             GetDocumentWindow());
 
     if (fileName.empty())
             GetDocumentWindow());
 
     if (fileName.empty())

-        return false;
+        return false; // cancelled by user

 
     wxString ext;
     wxFileName::SplitPath(fileName, NULL, NULL, &ext);
 
     wxString ext;
     wxFileName::SplitPath(fileName, NULL, NULL, &ext);


@@ -337,17 +347,15 @@ bool wxDocument::SaveAs()
     SetTitle(wxFileNameFromPath(fileName));
     SetFilename(fileName, true);    // will call OnChangeFileName automatically
 
     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);
    }
    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;
 }
 
    return true;
 }
 


@@ -450,11 +458,9 @@ wxString wxDocument::DoGetUserReadableName() const
 
 wxWindow *wxDocument::GetDocumentWindow() 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()
 }
 
 wxCommandProcessor *wxDocument::OnCreateCommandProcessor()


@@ -471,7 +477,7 @@ bool wxDocument::OnSaveModified()
                  (
                     wxString::Format
                     (
                  (
                     wxString::Format
                     (

-                     _("Do you want to save changes to document %s?"),
+                     _("Do you want to save changes to %s?"),

                      GetUserReadableName()
                     ),
                     wxTheApp->GetAppDisplayName(),
                      GetUserReadableName()
                     ),
                     wxTheApp->GetAppDisplayName(),


@@ -650,7 +656,9 @@ bool wxView::TryValidator(wxEvent& event)
     return doc && doc->ProcessEventHere(event);
 }
 
     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))

 {
 }
 
 {
 }
 


@@ -765,12 +773,10 @@ wxDocTemplate::InitDocument(wxDocument* doc, const wxString& path, long flags)
 
     if (doc->OnCreate(path, flags))
         return true;
 
     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)
 }
 
 wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags)


@@ -809,7 +815,7 @@ wxDocument *wxDocTemplate::DoCreateDocument()
     if (!m_docClassInfo)
         return NULL;
 
     if (!m_docClassInfo)
         return NULL;
 

-    return (wxDocument *)m_docClassInfo->CreateObject();
+    return static_cast<wxDocument *>(m_docClassInfo->CreateObject());

 }
 
 wxView *wxDocTemplate::DoCreateView()
 }
 
 wxView *wxDocTemplate::DoCreateView()


@@ -817,7 +823,7 @@ wxView *wxDocTemplate::DoCreateView()
     if (!m_viewClassInfo)
         return NULL;
 
     if (!m_viewClassInfo)
         return NULL;
 

-    return (wxView *)m_viewClassInfo->CreateObject();
+    return static_cast<wxView *>(m_viewClassInfo->CreateObject());

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -880,19 +886,18 @@ wxDocManager::~wxDocManager()
 // closes the specified document
 bool wxDocManager::CloseDocument(wxDocument* doc, bool force)
 {
 // 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)
 }
 
 bool wxDocManager::CloseDocuments(bool force)


@@ -938,6 +943,19 @@ bool wxDocManager::Initialize()
     return true;
 }
 
     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;
 wxFileHistory *wxDocManager::OnCreateFileHistory()
 {
     return new wxFileHistory;


@@ -968,7 +986,7 @@ void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event))
 
 void wxDocManager::OnFileOpen(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxDocManager::OnFileOpen(wxCommandEvent& WXUNUSED(event))
 {

-    if ( !CreateDocument( wxEmptyString, 0) )
+    if ( !CreateDocument("") )

     {
         OnOpenFileFailure();
     }
     {
         OnOpenFileFailure();
     }


@@ -1001,7 +1019,7 @@ void wxDocManager::OnFileSaveAs(wxCommandEvent& WXUNUSED(event))
 void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_PRINTING_ARCHITECTURE
 void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_PRINTING_ARCHITECTURE

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

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


@@ -1019,7 +1037,7 @@ void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
 void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_PRINTING_ARCHITECTURE
 void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_PRINTING_ARCHITECTURE

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

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


@@ -1027,16 +1045,18 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
     if (printout)
     {
         // Pass two printout objects: for preview, and possible printing.
     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;
         if ( !preview->Ok() )
         {
             delete preview;

-            wxMessageBox( _("Sorry, print preview needs a printer to be installed.") );
+            wxLogError(_("Print preview creation failed."));

             return;
         }
 
             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);
         frame->Centre(wxBOTH);
         frame->Initialize();
         frame->Show(true);


@@ -1046,24 +1066,26 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
 
 void wxDocManager::OnUndo(wxCommandEvent& 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();
         event.Skip();

+        return;
+    }
+
+    cmdproc->Undo();

 }
 
 void wxDocManager::OnRedo(wxCommandEvent& event)
 {
 }
 
 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();
         event.Skip();

+        return;
+    }
+
+    cmdproc->Redo();

 }
 
 // Handlers for UI update commands
 }
 
 // Handlers for UI update commands


@@ -1095,47 +1117,57 @@ void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event)
 
 void wxDocManager::OnUpdateUndo(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)
 {
 }
 
 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::TryValidator(wxEvent& event)
 {

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

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


@@ -1310,11 +1342,14 @@ bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc))
 
 wxDocument *wxDocManager::GetCurrentDocument() const
 {
 
 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
 }
 
 // Make a default name for a new document


@@ -1462,12 +1497,10 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
                                                 long WXUNUSED(flags),
                                                 bool WXUNUSED(save))
 {
                                                 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;
 
     wxString descrBuf;
 

-    int i;
-    for (i = 0; i < noTemplates; i++)
+    for (int i = 0; i < noTemplates; i++)

     {
         if (templates[i]->IsVisible())
         {
     {
         if (templates[i]->IsVisible())
         {


@@ -1490,7 +1523,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
     wxWindow* parent = wxFindSuitableParent();
 
     wxString pathTmp = wxFileSelectorEx(_("Open File"),
     wxWindow* parent = wxFindSuitableParent();
 
     wxString pathTmp = wxFileSelectorEx(_("Open File"),

-                                        m_lastDirectory,
+                                        GetLastDirectory(),

                                         wxEmptyString,
                                         &FilterIndex,
                                         descrBuf,
                                         wxEmptyString,
                                         &FilterIndex,
                                         descrBuf,


@@ -1508,13 +1541,16 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
             else
                 msgTitle = wxString(_("File error"));
 
             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;
         }
 
             path = wxEmptyString;
             return NULL;
         }

-        m_lastDirectory = wxPathOnly(pathTmp);
+
+        SetLastDirectory(wxPathOnly(pathTmp));

 
         path = pathTmp;
 
 
         path = pathTmp;
 


@@ -1526,16 +1562,18 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
             theTemplate = FindTemplateForPath(path);
         if ( !theTemplate )
         {
             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
     {
         }
     }
     else
     {

-        path = wxEmptyString;
+        path.clear();

     }
 
     return theTemplate;
     }
 
     return theTemplate;


@@ -1545,7 +1583,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
                                                 int noTemplates, bool sort)
 {
     wxArrayString strings;
                                                 int noTemplates, bool sort)
 {
     wxArrayString strings;

-    wxDocTemplate **data = new wxDocTemplate *[noTemplates];
+    wxScopedArray<wxDocTemplate *> data(new wxDocTemplate *[noTemplates]);

     int i;
     int n = 0;
 
     int i;
     int n = 0;
 


@@ -1612,13 +1650,11 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
                             _("Select a document template"),
                             _("Templates"),
                             strings,
                             _("Select a document template"),
                             _("Templates"),
                             strings,

-                            (void **)data,
+                            (void **)data.get(),

                             wxFindSuitableParent()
                           );
     }
 
                             wxFindSuitableParent()
                           );
     }
 

-    delete[] data;
-

     return theTemplate;
 }
 
     return theTemplate;
 }
 


@@ -1626,7 +1662,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
                                             int noTemplates, bool sort)
 {
     wxArrayString strings;
                                             int noTemplates, bool sort)
 {
     wxArrayString strings;

-    wxDocTemplate **data = new wxDocTemplate *[noTemplates];
+    wxScopedArray<wxDocTemplate *> data(new wxDocTemplate *[noTemplates]);

     int i;
     int n = 0;
 
     int i;
     int n = 0;
 


@@ -1689,13 +1725,12 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
                             _("Select a document view"),
                             _("Views"),
                             strings,
                             _("Select a document view"),
                             _("Views"),
                             strings,

-                            (void **)data,
+                            (void **)data.get(),

                             wxFindSuitableParent()
                           );
 
     }
 
                             wxFindSuitableParent()
                           );
 
     }
 

-    delete[] data;

     return theTemplate;
 }
 
     return theTemplate;
 }
 


@@ -1787,26 +1822,22 @@ void wxDocChildFrame::OnActivate(wxActivateEvent& event)
 
 void wxDocChildFrame::OnCloseWindow(wxCloseEvent& event)
 {
 
 void wxDocChildFrame::OnCloseWindow(wxCloseEvent& event)
 {

-    if (m_childView)
+    if ( !m_childView )
+        return;
+
+    // passing false to Close() means to not delete associated window
+    if ( event.CanVeto() && !m_childView->Close(false) )

     {
     {

-        bool ans = event.CanVeto()
-                    ? m_childView->Close(false) // false means don't delete associated window
-                    : true; // Must delete.
+        event.Veto();
+        return;
+    }

 
 

-        if (ans)
-        {
-            m_childView->Activate(false);
-            delete m_childView;
-            m_childView = NULL;
-            m_childDocument = NULL;
+    m_childView->Activate(false);
+    delete m_childView;
+    m_childView = NULL;
+    m_childDocument = NULL;

 
 

-            this->Destroy();
-        }
-        else
-            event.Veto();
-    }
-    else
-        event.Veto();
+    Destroy();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1900,7 +1931,7 @@ void wxDocParentFrame::OnCloseWindow(wxCloseEvent& event)
 {
     if (m_docManager->Clear(!event.CanVeto()))
     {
 {
     if (m_docManager->Clear(!event.CanVeto()))
     {

-        this->Destroy();
+        Destroy();

     }
     else
         event.Veto();
     }
     else
         event.Veto();


@@ -1966,7 +1997,8 @@ bool wxDocPrintout::OnBeginDocument(int startPage, int endPage)
     return true;
 }
 
     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;
 {
     *minPage = 1;
     *maxPage = 1;