X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1f82b073f53542b6baf63f6485962da63ab85d9..b404a8f3b072129c107c6d9a5e0f6f53cd34807b:/src/common/docview.cpp

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 8f693926e5..e4f6bf3bdb 100644
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        docview.cpp
+// Name:        src/common/docview.cpp
 // Purpose:     Document/view classes
 // Author:      Julian Smart
-// Modified by:
+// Modified by: Vadim Zeitlin
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -17,135 +17,135 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "docview.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_DOC_VIEW_ARCHITECTURE
 
+#include "wx/docview.h"
+
 #ifndef WX_PRECOMP
+    #include "wx/list.h"
     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/dc.h"
     #include "wx/dialog.h"
     #include "wx/menu.h"
-    #include "wx/list.h"
     #include "wx/filedlg.h"
     #include "wx/intl.h"
-#endif
-
-
-#ifdef __WXGTK__
+    #include "wx/log.h"
+    #include "wx/msgdlg.h"
     #include "wx/mdi.h"
+    #include "wx/choicdlg.h"
 #endif
 
 #if wxUSE_PRINTING_ARCHITECTURE
-  #include "wx/prntbase.h"
-  #include "wx/printdlg.h"
+    #include "wx/prntbase.h"
+    #include "wx/printdlg.h"
 #endif
 
-#include "wx/msgdlg.h"
-#include "wx/choicdlg.h"
-#include "wx/docview.h"
 #include "wx/confbase.h"
+#include "wx/filename.h"
 #include "wx/file.h"
-
-#include <stdio.h>
-#include <string.h>
+#include "wx/ffile.h"
+#include "wx/cmdproc.h"
+#include "wx/tokenzr.h"
+#include "wx/filename.h"
+#include "wx/stdpaths.h"
+#include "wx/vector.h"
+#include "wx/scopedarray.h"
+#include "wx/scopedptr.h"
+#include "wx/except.h"
 
 #if wxUSE_STD_IOSTREAM
-  #include "wx/ioswrap.h"
-  #if wxUSE_IOSTREAMH
-    #include <fstream.h>
-  #else
-    #include <fstream>
-  #endif
+    #include "wx/ioswrap.h"
+    #include "wx/beforestd.h"
+    #if wxUSE_IOSTREAMH
+        #include <fstream.h>
+    #else
+        #include <fstream>
+    #endif
+    #include "wx/afterstd.h"
 #else
-  #include "wx/wfstream.h"
+    #include "wx/wfstream.h"
 #endif
 
-// ----------------------------------------------------------------------------
-// wxWindows macros
-// ----------------------------------------------------------------------------
-
-    IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
-    IMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler)
-    IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxDocManager, wxEvtHandler)
-    IMPLEMENT_CLASS(wxDocChildFrame, wxFrame)
-    IMPLEMENT_CLASS(wxDocParentFrame, wxFrame)
-
-    #if wxUSE_PRINTING_ARCHITECTURE
-        IMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout)
-    #endif
-
-    IMPLEMENT_CLASS(wxCommand, wxObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxCommandProcessor, wxObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
+typedef wxVector<wxDocTemplate *> wxDocTemplates;
 
 // ----------------------------------------------------------------------------
-// function prototypes
+// wxWidgets macros
 // ----------------------------------------------------------------------------
 
-static inline wxString FindExtension(const wxChar *path);
-
-// ----------------------------------------------------------------------------
-// local constants
-// ----------------------------------------------------------------------------
+IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
+IMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler)
+IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxDocManager, wxEvtHandler)
+IMPLEMENT_CLASS(wxDocChildFrame, wxFrame)
+IMPLEMENT_CLASS(wxDocParentFrame, wxFrame)
 
-static const wxChar *s_MRUEntryFormat = wxT("&%d %s");
+#if wxUSE_PRINTING_ARCHITECTURE
+    IMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout)
+#endif
 
 // ============================================================================
 // implementation
 // ============================================================================
 
 // ----------------------------------------------------------------------------
-// local functions
+// private helpers
 // ----------------------------------------------------------------------------
 
-static wxString FindExtension(const wxChar *path)
+namespace
+{
+
+wxString FindExtension(const wxString& path)
 {
     wxString ext;
-    wxSplitPath(path, NULL, NULL, &ext);
+    wxFileName::SplitPath(path, NULL, NULL, &ext);
 
     // VZ: extensions are considered not case sensitive - is this really a good
     //     idea?
     return ext.MakeLower();
 }
 
+} // anonymous namespace
+
 // ----------------------------------------------------------------------------
 // Definition of wxDocument
 // ----------------------------------------------------------------------------
 
 wxDocument::wxDocument(wxDocument *parent)
 {
-    m_documentModified = FALSE;
+    m_documentModified = false;
+    m_documentTemplate = NULL;
+
     m_documentParent = parent;
-    m_documentTemplate = (wxDocTemplate *) NULL;
-    m_savedYet = FALSE;
+    if ( parent )
+        parent->m_childDocuments.push_back(this);
+
+    m_commandProcessor = NULL;
+    m_savedYet = false;
 }
 
 bool wxDocument::DeleteContents()
 {
-    return TRUE;
+    return true;
 }
 
 wxDocument::~wxDocument()
 {
-    DeleteContents();
+    delete m_commandProcessor;
 
-    if (m_commandProcessor)
-        delete m_commandProcessor;
+    if (GetDocumentManager())
+        GetDocumentManager()->RemoveDocument(this);
 
-    GetDocumentManager()->RemoveDocument(this);
+    if ( m_documentParent )
+        m_documentParent->m_childDocuments.remove(this);
 
     // Not safe to do here, since it'll invoke virtual view functions
     // expecting to see valid derived objects: and by the time we get here,
@@ -155,208 +155,282 @@ wxDocument::~wxDocument()
 
 bool wxDocument::Close()
 {
-    if (OnSaveModified())
-        return OnCloseDocument();
-    else
-        return FALSE;
+    if ( !OnSaveModified() )
+        return false;
+
+    // When the parent document closes, its children must be closed as well as
+    // they can't exist without the parent.
+
+    // As usual, first check if all children can be closed.
+    DocsList::const_iterator it = m_childDocuments.begin();
+    for ( DocsList::const_iterator end = m_childDocuments.end(); it != end; ++it )
+    {
+        if ( !(*it)->OnSaveModified() )
+        {
+            // Leave the parent document opened if a child can't close.
+            return false;
+        }
+    }
+
+    // Now that they all did, do close them: as m_childDocuments is modified as
+    // we iterate over it, don't use the usual for-style iteration here.
+    while ( !m_childDocuments.empty() )
+    {
+        wxDocument * const childDoc = m_childDocuments.front();
+
+        // This will call OnSaveModified() once again but it shouldn't do
+        // anything as the document was just saved or marked as not needing to
+        // be saved by the call to OnSaveModified() that returned true above.
+        if ( !childDoc->Close() )
+        {
+            wxFAIL_MSG( "Closing the child document unexpectedly failed "
+                        "after its OnSaveModified() returned true" );
+        }
+
+        // Delete the child document by deleting all its views.
+        childDoc->DeleteAllViews();
+    }
+
+
+    return OnCloseDocument();
 }
 
 bool wxDocument::OnCloseDocument()
 {
+    // Tell all views that we're about to close
+    NotifyClosing();
     DeleteContents();
-    Modify(FALSE);
-    return TRUE;
+    Modify(false);
+    return true;
 }
 
 // Note that this implicitly deletes the document when the last view is
 // deleted.
 bool wxDocument::DeleteAllViews()
 {
-    wxNode *node = m_documentViews.First();
-    while (node)
+    wxDocManager* manager = GetDocumentManager();
+
+    // first check if all views agree to be closed
+    const wxList::iterator end = m_documentViews.end();
+    for ( wxList::iterator i = m_documentViews.begin(); i != end; ++i )
     {
-        wxView *view = (wxView *)node->Data();
-        if (!view->Close())
-            return FALSE;
+        wxView *view = (wxView *)*i;
+        if ( !view->Close() )
+            return false;
+    }
+
+    // all views agreed to close, now do close them
+    if ( m_documentViews.empty() )
+    {
+        // normally the document would be implicitly deleted when the last view
+        // is, but if don't have any views, do it here instead
+        if ( manager && manager->GetDocuments().Member(this) )
+            delete this;
+    }
+    else // have views
+    {
+        // as we delete elements we iterate over, don't use the usual "from
+        // begin to end" loop
+        for ( ;; )
+        {
+            wxView *view = (wxView *)*m_documentViews.begin();
 
-        wxNode *next = node->Next();
+            bool isLastOne = m_documentViews.size() == 1;
 
-        delete view; // Deletes node implicitly
-        node = next;
+            // this always deletes the node implicitly and if this is the last
+            // view also deletes this object itself (also implicitly, great),
+            // so we can't test for m_documentViews.empty() after calling this!
+            delete view;
+
+            if ( isLastOne )
+                break;
+        }
     }
-    return TRUE;
+
+    return true;
 }
 
 wxView *wxDocument::GetFirstView() const
 {
-    if (m_documentViews.Number() == 0)
-        return (wxView *) NULL;
-    return (wxView *)m_documentViews.First()->Data();
+    if ( m_documentViews.empty() )
+        return NULL;
+
+    return static_cast<wxView *>(m_documentViews.GetFirst()->GetData());
+}
+
+void wxDocument::Modify(bool mod)
+{
+    if (mod != m_documentModified)
+    {
+        m_documentModified = mod;
+
+        // Allow views to append asterix to the title
+        wxView* view = GetFirstView();
+        if (view) view->OnChangeFilename();
+    }
 }
 
 wxDocManager *wxDocument::GetDocumentManager() const
 {
-    return m_documentTemplate->GetDocumentManager();
+    // For child documents we use the same document manager as the parent, even
+    // though we don't have our own template (as children are not opened/saved
+    // directly).
+    if ( m_documentParent )
+        return m_documentParent->GetDocumentManager();
+
+    return m_documentTemplate ? m_documentTemplate->GetDocumentManager() : NULL;
 }
 
 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
 
-    if (OnCloseDocument()==FALSE) return FALSE;
-    DeleteContents();
-    Modify(FALSE);
-    SetDocumentSaved(FALSE);
+    SetDocumentSaved(false);
 
-    wxString name;
-    GetDocumentManager()->MakeDefaultName(name);
+    const wxString name = GetDocumentManager()->MakeNewDocumentName();
     SetTitle(name);
-    SetFilename(name, TRUE);
+    SetFilename(name, true);
 
-    return TRUE;
+    return true;
 }
 
 bool wxDocument::Save()
 {
-    bool ret = FALSE;
+    if ( AlreadySaved() )
+        return true;
 
-    if (!IsModified()) return TRUE;
-    if (m_documentFile == wxT("") || !m_savedYet)
-        ret = SaveAs();
-    else
-        ret = OnSaveDocument(m_documentFile);
-    if ( ret )
-        SetDocumentSaved(TRUE);
-    return ret;
+    if ( m_documentFile.empty() || !m_savedYet )
+        return SaveAs();
+
+    return OnSaveDocument(m_documentFile);
 }
 
 bool wxDocument::SaveAs()
 {
     wxDocTemplate *docTemplate = GetDocumentTemplate();
     if (!docTemplate)
-        return FALSE;
+        return false;
 
-    wxString tmp = wxFileSelector(_("Save as"),
-            docTemplate->GetDirectory(),
-            GetFilename(),
-            docTemplate->GetDefaultExtension(),
-            docTemplate->GetFileFilter(),
-            wxSAVE | wxOVERWRITE_PROMPT,
-            GetDocumentWindow());
+#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();
+        while (node)
+        {
+            wxDocTemplate *t = (wxDocTemplate*) node->GetData();
+
+            if (t->IsVisible() && t != docTemplate &&
+                t->GetViewClassInfo() == docTemplate->GetViewClassInfo() &&
+                t->GetDocClassInfo() == docTemplate->GetDocClassInfo())
+            {
+                // add a '|' to separate this filter from the previous one
+                if ( !filter.empty() )
+                    filter << wxT('|');
 
-    if (tmp.IsEmpty())
-        return FALSE;
+                filter << t->GetDescription()
+                       << wxT(" (") << t->GetFileFilter() << wxT(") |")
+                       << t->GetFileFilter();
+            }
 
-    wxString fileName(tmp);
-    wxString path, name, ext;
-    wxSplitPath(fileName, & path, & name, & ext);
+            node = node->GetNext();
+        }
+    }
+#else
+    wxString filter = docTemplate->GetFileFilter() ;
+#endif
 
-    if (ext.IsEmpty() || ext == wxT(""))
+    wxString defaultDir = docTemplate->GetDirectory();
+    if ( defaultDir.empty() )
     {
-        fileName += ".";
-        fileName += docTemplate->GetDefaultExtension();
+        defaultDir = wxPathOnly(GetFilename());
+        if ( defaultDir.empty() )
+            defaultDir = GetDocumentManager()->GetLastDirectory();
     }
 
-    SetFilename(fileName);
-    SetTitle(wxFileNameFromPath(fileName));
+    wxString fileName = wxFileSelector(_("Save As"),
+            defaultDir,
+            wxFileNameFromPath(GetFilename()),
+            docTemplate->GetDefaultExtension(),
+            filter,
+            wxFD_SAVE | wxFD_OVERWRITE_PROMPT,
+            GetDocumentWindow());
 
-    GetDocumentManager()->AddFileToHistory(fileName);
+    if (fileName.empty())
+        return false; // cancelled by user
 
-    // Notify the views that the filename has changed
-    wxNode *node = m_documentViews.First();
-    while (node)
+    // Files that were not saved correctly are not added to the FileHistory.
+    if (!OnSaveDocument(fileName))
+        return false;
+
+    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.
+    if (docTemplate->FileMatchesTemplate(fileName))
     {
-        wxView *view = (wxView *)node->Data();
-        view->OnChangeFilename();
-        node = node->Next();
+        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
 
-    return OnSaveDocument(m_documentFile);
+    return true;
 }
 
 bool wxDocument::OnSaveDocument(const wxString& file)
 {
     if ( !file )
-        return FALSE;
+        return false;
 
-    wxString msgTitle;
-    if (wxTheApp->GetAppName() != wxT(""))
-        msgTitle = wxTheApp->GetAppName();
-    else
-        msgTitle = wxString(_("File error"));
+    if ( !DoSaveDocument(file) )
+        return false;
 
-#if wxUSE_STD_IOSTREAM
-    ofstream store(wxString(file.fn_str()));
-    if (store.fail() || store.bad())
-#else
-    wxFileOutputStream store(wxString(file.fn_str()));
-    if (store.LastError() != wxSTREAM_NOERROR)
-#endif
-    {
-        (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,
-                           GetDocumentWindow());
-        // Saving error
-        return FALSE;
-    }
-    if (!SaveObject(store))
-    {
-        (void)wxMessageBox(_("Sorry, could not save this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
-                           GetDocumentWindow());
-        // Saving error
-        return FALSE;
-    }
-    Modify(FALSE);
+    Modify(false);
     SetFilename(file);
-    return TRUE;
+    SetDocumentSaved(true);
+#if defined( __WXOSX_MAC__ ) && wxOSX_USE_CARBON
+    wxFileName fn(file) ;
+    fn.MacSetDefaultTypeAndCreator() ;
+#endif
+    return true;
 }
 
 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()
 
-    wxString msgTitle;
-    if (wxTheApp->GetAppName() != wxT(""))
-        msgTitle = wxTheApp->GetAppName();
-    else
-        msgTitle = wxString(_("File error"));
+    if ( !DoOpenDocument(file) )
+        return false;
 
-#if wxUSE_STD_IOSTREAM
-    ifstream store(wxString(file.fn_str()));
-    if (store.fail() || store.bad())
-#else
-    wxFileInputStream store(wxString(file.fn_str()));
-    if (store.LastError() != wxSTREAM_NOERROR)
-#endif
-    {
-        (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
-                           GetDocumentWindow());
-        return FALSE;
-    }
-#if wxUSE_STD_IOSTREAM
-    if (!LoadObject(store))
-#else
-    int res = LoadObject(store).LastError();
-    if ((res != wxSTREAM_NOERROR) &&
-        (res != wxSTREAM_EOF))
-#endif
-    {
-        (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
-                           GetDocumentWindow());
-        return FALSE;
-    }
-    SetFilename(file, TRUE);
-    Modify(FALSE);
-    m_savedYet = TRUE;
+    SetFilename(file, 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();
 
-    return TRUE;
+    return true;
 }
 
 #if wxUSE_STD_IOSTREAM
-istream& wxDocument::LoadObject(istream& stream)
+wxSTD istream& wxDocument::LoadObject(wxSTD istream& stream)
 #else
 wxInputStream& wxDocument::LoadObject(wxInputStream& stream)
 #endif
@@ -365,7 +439,7 @@ wxInputStream& wxDocument::LoadObject(wxInputStream& stream)
 }
 
 #if wxUSE_STD_IOSTREAM
-ostream& wxDocument::SaveObject(ostream& stream)
+wxSTD ostream& wxDocument::SaveObject(wxSTD ostream& stream)
 #else
 wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream)
 #endif
@@ -375,37 +449,68 @@ wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream)
 
 bool wxDocument::Revert()
 {
-    return FALSE;
+    if ( wxMessageBox
+         (
+            _("Discard changes and reload the last saved version?"),
+            wxTheApp->GetAppDisplayName(),
+            wxYES_NO | wxCANCEL | wxICON_QUESTION,
+            GetDocumentWindow()
+          ) != wxYES )
+        return false;
+
+    if ( !DoOpenDocument(GetFilename()) )
+        return false;
+
+    Modify(false);
+    UpdateAllViews();
+
+    return true;
 }
 
 
 // Get title, or filename if no title, else unnamed
+#if WXWIN_COMPATIBILITY_2_8
 bool wxDocument::GetPrintableName(wxString& buf) const
 {
-    if (m_documentTitle != wxT(""))
-    {
-        buf = m_documentTitle;
-        return TRUE;
-    }
-    else if (m_documentFile != wxT(""))
-    {
-        buf = wxFileNameFromPath(m_documentFile);
-        return TRUE;
-    }
-    else
-    {
-        buf = _("unnamed");
-        return TRUE;
-    }
+    // this function cannot only be overridden by the user code but also
+    // called by it so we need to ensure that we return the same thing as
+    // GetUserReadableName() but we can't call it because this would result in
+    // an infinite recursion, hence we use the helper DoGetUserReadableName()
+    buf = DoGetUserReadableName();
+
+    return true;
+}
+#endif // WXWIN_COMPATIBILITY_2_8
+
+wxString wxDocument::GetUserReadableName() const
+{
+#if WXWIN_COMPATIBILITY_2_8
+    // we need to call the old virtual function to ensure that the overridden
+    // version of it is still called
+    wxString name;
+    if ( GetPrintableName(name) )
+        return name;
+#endif // WXWIN_COMPATIBILITY_2_8
+
+    return DoGetUserReadableName();
+}
+
+wxString wxDocument::DoGetUserReadableName() const
+{
+    if ( !m_documentTitle.empty() )
+        return m_documentTitle;
+
+    if ( !m_documentFile.empty() )
+        return wxFileNameFromPath(m_documentFile);
+
+    return _("unnamed");
 }
 
 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()
@@ -413,67 +518,62 @@ wxCommandProcessor *wxDocument::OnCreateCommandProcessor()
     return new wxCommandProcessor;
 }
 
-// TRUE if safe to close
+// true if safe to close
 bool wxDocument::OnSaveModified()
 {
-    if (IsModified())
-    {
-        wxString title;
-        GetPrintableName(title);
-
-        wxString msgTitle;
-        if (wxTheApp->GetAppName() != wxT(""))
-            msgTitle = wxTheApp->GetAppName();
-        else
-            msgTitle = wxString(_("Warning"));
-
-        wxString prompt;
-        prompt.Printf(_("Do you want to save changes to document %s?"),
-                (const wxChar *)title);
-        int res = wxMessageBox(prompt, msgTitle,
-                wxYES_NO|wxCANCEL|wxICON_QUESTION,
-                GetDocumentWindow());
-        if (res == wxNO)
+    if ( IsModified() )
+    {
+        switch ( wxMessageBox
+                 (
+                    wxString::Format
+                    (
+                     _("Do you want to save changes to %s?"),
+                     GetUserReadableName()
+                    ),
+                    wxTheApp->GetAppDisplayName(),
+                    wxYES_NO | wxCANCEL | wxICON_QUESTION | wxCENTRE
+                 ) )
         {
-            Modify(FALSE);
-            return TRUE;
+            case wxNO:
+                Modify(false);
+                break;
+
+            case wxYES:
+                return Save();
+
+            case wxCANCEL:
+                return false;
         }
-        else if (res == wxYES)
-            return Save();
-        else if (res == wxCANCEL)
-            return FALSE;
     }
-    return TRUE;
+
+    return true;
 }
 
 bool wxDocument::Draw(wxDC& WXUNUSED(context))
 {
-    return TRUE;
+    return true;
 }
 
 bool wxDocument::AddView(wxView *view)
 {
-    if (!m_documentViews.Member(view))
+    if ( !m_documentViews.Member(view) )
     {
         m_documentViews.Append(view);
         OnChangedViewList();
     }
-    return TRUE;
+    return true;
 }
 
 bool wxDocument::RemoveView(wxView *view)
 {
     (void)m_documentViews.DeleteObject(view);
     OnChangedViewList();
-    return TRUE;
+    return true;
 }
 
 bool wxDocument::OnCreate(const wxString& WXUNUSED(path), long flags)
 {
-    if (GetDocumentTemplate()->CreateView(this, flags))
-        return TRUE;
-    else
-        return FALSE;
+    return GetDocumentTemplate()->CreateView(this, flags) != NULL;
 }
 
 // Called after a view is added or removed.
@@ -481,71 +581,165 @@ bool wxDocument::OnCreate(const wxString& WXUNUSED(path), long flags)
 // there are no more views.
 void wxDocument::OnChangedViewList()
 {
-    if (m_documentViews.Number() == 0)
+    if ( m_documentViews.empty() && OnSaveModified() )
+        delete this;
+}
+
+void wxDocument::UpdateAllViews(wxView *sender, wxObject *hint)
+{
+    wxList::compatibility_iterator node = m_documentViews.GetFirst();
+    while (node)
     {
-        if (OnSaveModified())
-        {
-            delete this;
-        }
+        wxView *view = (wxView *)node->GetData();
+        if (view != sender)
+            view->OnUpdate(sender, hint);
+        node = node->GetNext();
     }
 }
 
-void wxDocument::UpdateAllViews(wxView *sender, wxObject *hint)
+void wxDocument::NotifyClosing()
 {
-    wxNode *node = m_documentViews.First();
+    wxList::compatibility_iterator node = m_documentViews.GetFirst();
     while (node)
     {
-        wxView *view = (wxView *)node->Data();
-        view->OnUpdate(sender, hint);
-        node = node->Next();
+        wxView *view = (wxView *)node->GetData();
+        view->OnClosingDocument();
+        node = node->GetNext();
     }
 }
 
 void wxDocument::SetFilename(const wxString& filename, bool notifyViews)
 {
     m_documentFile = filename;
+    OnChangeFilename(notifyViews);
+}
+
+void wxDocument::OnChangeFilename(bool notifyViews)
+{
     if ( notifyViews )
     {
         // Notify the views that the filename has changed
-        wxNode *node = m_documentViews.First();
+        wxList::compatibility_iterator node = m_documentViews.GetFirst();
         while (node)
         {
-            wxView *view = (wxView *)node->Data();
+            wxView *view = (wxView *)node->GetData();
             view->OnChangeFilename();
-            node = node->Next();
+            node = node->GetNext();
         }
     }
 }
 
+bool wxDocument::DoSaveDocument(const wxString& file)
+{
+#if wxUSE_STD_IOSTREAM
+    wxSTD ofstream store(file.mb_str(), wxSTD ios::binary);
+    if ( !store )
+#else
+    wxFileOutputStream store(file);
+    if ( store.GetLastError() != wxSTREAM_NO_ERROR )
+#endif
+    {
+        wxLogError(_("File \"%s\" could not be opened for writing."), file);
+        return false;
+    }
+
+    if (!SaveObject(store))
+    {
+        wxLogError(_("Failed to save document to the file \"%s\"."), file);
+        return false;
+    }
+
+    return true;
+}
+
+bool wxDocument::DoOpenDocument(const wxString& file)
+{
+#if wxUSE_STD_IOSTREAM
+    wxSTD ifstream store(file.mb_str(), wxSTD ios::binary);
+    if ( !store )
+#else
+    wxFileInputStream store(file);
+    if (store.GetLastError() != wxSTREAM_NO_ERROR || !store.IsOk())
+#endif
+    {
+        wxLogError(_("File \"%s\" could not be opened for reading."), file);
+        return false;
+    }
+
+#if wxUSE_STD_IOSTREAM
+    LoadObject(store);
+    if ( !store )
+#else
+    int res = LoadObject(store).GetLastError();
+    if ( res != wxSTREAM_NO_ERROR && res != wxSTREAM_EOF )
+#endif
+    {
+        wxLogError(_("Failed to read document from the file \"%s\"."), file);
+        return false;
+    }
+
+    return true;
+}
+
+
 // ----------------------------------------------------------------------------
 // Document view
 // ----------------------------------------------------------------------------
 
 wxView::wxView()
 {
-    //  SetDocument(doc);
-    m_viewDocument = (wxDocument*) NULL;
+    m_viewDocument = NULL;
+
+    m_viewFrame = NULL;
 
-    m_viewTypeName = wxT("");
-    m_viewFrame = (wxFrame *) NULL;
+    m_docChildFrame = NULL;
 }
 
 wxView::~wxView()
 {
-//    GetDocumentManager()->ActivateView(this, FALSE, TRUE);
-    m_viewDocument->RemoveView(this);
+    if (m_viewDocument && GetDocumentManager())
+        GetDocumentManager()->ActivateView(this, false);
+
+    // 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);
+}
+
+void wxView::SetDocChildFrame(wxDocChildFrameAnyBase *docChildFrame)
+{
+    SetFrame(docChildFrame ? docChildFrame->GetWindow() : NULL);
+    m_docChildFrame = docChildFrame;
 }
 
-// Extend event processing to search the document's event table
-bool wxView::ProcessEvent(wxEvent& event)
+bool wxView::TryBefore(wxEvent& event)
 {
-    if ( !GetDocument() || !GetDocument()->ProcessEvent(event) )
-        return wxEvtHandler::ProcessEvent(event);
-    else
-        return TRUE;
+    wxDocument * const doc = GetDocument();
+    return doc && doc->ProcessEventLocally(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))
 {
 }
 
@@ -560,14 +754,21 @@ void wxView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
 
 void wxView::OnChangeFilename()
 {
-    if (GetFrame() && GetDocument())
-    {
-        wxString title;
+    // GetFrame can return wxWindow rather than wxTopLevelWindow due to
+    // generic MDI implementation so use SetLabel rather than SetTitle.
+    // It should cause SetTitle() for top level windows.
+    wxWindow *win = GetFrame();
+    if (!win) return;
 
-        GetDocument()->GetPrintableName(title);
+    wxDocument *doc = GetDocument();
+    if (!doc) return;
 
-        GetFrame()->SetTitle(title);
+    wxString label = doc->GetUserReadableName();
+    if (doc->IsModified())
+    {
+       label += "*";
     }
+    win->SetLabel(label);
 }
 
 void wxView::SetDocument(wxDocument *doc)
@@ -579,15 +780,12 @@ void wxView::SetDocument(wxDocument *doc)
 
 bool wxView::Close(bool deleteWindow)
 {
-    if (OnClose(deleteWindow))
-        return TRUE;
-    else
-        return FALSE;
+    return OnClose(deleteWindow);
 }
 
 void wxView::Activate(bool activate)
 {
-    if (GetDocumentManager())
+    if (GetDocument() && GetDocumentManager())
     {
         OnActivateView(activate, this, GetDocumentManager()->GetCurrentView());
         GetDocumentManager()->ActivateView(this, activate);
@@ -596,7 +794,7 @@ void wxView::Activate(bool activate)
 
 bool wxView::OnClose(bool WXUNUSED(deleteWindow))
 {
-    return GetDocument() ? GetDocument()->Close() : TRUE;
+    return GetDocument() ? GetDocument()->Close() : true;
 }
 
 #if wxUSE_PRINTING_ARCHITECTURE
@@ -643,47 +841,81 @@ wxDocTemplate::~wxDocTemplate()
 // Tries to dynamically construct an object of the right class.
 wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags)
 {
-    if (!m_docClassInfo)
-        return (wxDocument *) NULL;
-    wxDocument *doc = (wxDocument *)m_docClassInfo->CreateObject();
+    // 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();
+
+    return doc && InitDocument(doc, path, flags) ? doc : NULL;
+}
+
+bool
+wxDocTemplate::InitDocument(wxDocument* doc, const wxString& path, long flags)
+{
     doc->SetFilename(path);
     doc->SetDocumentTemplate(this);
     GetDocumentManager()->AddDocument(doc);
     doc->SetCommandProcessor(doc->OnCreateCommandProcessor());
 
     if (doc->OnCreate(path, flags))
-        return doc;
-    else
-    {
-        delete doc;
-        return (wxDocument *) NULL;
-    }
+        return true;
+
+    if (GetDocumentManager()->GetDocuments().Member(doc))
+        doc->DeleteAllViews();
+    return false;
 }
 
 wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags)
 {
-    if (!m_viewClassInfo)
-        return (wxView *) NULL;
-    wxView *view = (wxView *)m_viewClassInfo->CreateObject();
+    wxScopedPtr<wxView> view(DoCreateView());
+    if ( !view )
+        return NULL;
+
     view->SetDocument(doc);
-    if (view->OnCreate(doc, flags))
-    {
-        return view;
-    }
-    else
-    {
-        delete view;
-        return (wxView *) NULL;
-    }
+    if ( !view->OnCreate(doc, flags) )
+        return NULL;
+
+    return view.release();
 }
 
 // The default (very primitive) format detection: check is the extension is
 // that of the template
 bool wxDocTemplate::FileMatchesTemplate(const wxString& path)
 {
+    wxStringTokenizer parser (GetFileFilter(), wxT(";"));
+    wxString anything = wxT ("*");
+    while (parser.HasMoreTokens())
+    {
+        wxString filter = parser.GetNextToken();
+        wxString filterExt = FindExtension (filter);
+        if ( filter.IsSameAs (anything)    ||
+             filterExt.IsSameAs (anything) ||
+             filterExt.IsSameAs (FindExtension (path)) )
+            return true;
+    }
     return GetDefaultExtension().IsSameAs(FindExtension(path));
 }
 
+wxDocument *wxDocTemplate::DoCreateDocument()
+{
+    if (!m_docClassInfo)
+        return NULL;
+
+    return static_cast<wxDocument *>(m_docClassInfo->CreateObject());
+}
+
+wxView *wxDocTemplate::DoCreateView()
+{
+    if (!m_viewClassInfo)
+        return NULL;
+
+    return static_cast<wxView *>(m_viewClassInfo->CreateObject());
+}
+
 // ----------------------------------------------------------------------------
 // wxDocManager
 // ----------------------------------------------------------------------------
@@ -691,6 +923,7 @@ bool wxDocTemplate::FileMatchesTemplate(const wxString& path)
 BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
     EVT_MENU(wxID_OPEN, wxDocManager::OnFileOpen)
     EVT_MENU(wxID_CLOSE, wxDocManager::OnFileClose)
+    EVT_MENU(wxID_CLOSE_ALL, wxDocManager::OnFileCloseAll)
     EVT_MENU(wxID_REVERT, wxDocManager::OnFileRevert)
     EVT_MENU(wxID_NEW, wxDocManager::OnFileNew)
     EVT_MENU(wxID_SAVE, wxDocManager::OnFileSave)
@@ -698,8 +931,14 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
     EVT_MENU(wxID_UNDO, wxDocManager::OnUndo)
     EVT_MENU(wxID_REDO, wxDocManager::OnRedo)
 
+    // We don't know in advance how many items can there be in the MRU files
+    // list so set up OnMRUFile() as a handler for all menu events and do the
+    // check for the id of the menu item clicked inside it.
+    EVT_MENU(wxID_ANY, wxDocManager::OnMRUFile)
+
     EVT_UPDATE_UI(wxID_OPEN, wxDocManager::OnUpdateFileOpen)
-    EVT_UPDATE_UI(wxID_CLOSE, wxDocManager::OnUpdateFileClose)
+    EVT_UPDATE_UI(wxID_CLOSE, wxDocManager::OnUpdateDisableIfNoDoc)
+    EVT_UPDATE_UI(wxID_CLOSE_ALL, wxDocManager::OnUpdateDisableIfNoDoc)
     EVT_UPDATE_UI(wxID_REVERT, wxDocManager::OnUpdateFileRevert)
     EVT_UPDATE_UI(wxID_NEW, wxDocManager::OnUpdateFileNew)
     EVT_UPDATE_UI(wxID_SAVE, wxDocManager::OnUpdateFileSave)
@@ -709,76 +948,131 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
 
 #if wxUSE_PRINTING_ARCHITECTURE
     EVT_MENU(wxID_PRINT, wxDocManager::OnPrint)
-    EVT_MENU(wxID_PRINT_SETUP, wxDocManager::OnPrintSetup)
     EVT_MENU(wxID_PREVIEW, wxDocManager::OnPreview)
+    EVT_MENU(wxID_PRINT_SETUP, wxDocManager::OnPageSetup)
 
-    EVT_UPDATE_UI(wxID_PRINT, wxDocManager::OnUpdatePrint)
-    EVT_UPDATE_UI(wxID_PRINT_SETUP, wxDocManager::OnUpdatePrintSetup)
-    EVT_UPDATE_UI(wxID_PREVIEW, wxDocManager::OnUpdatePreview)
-#endif
+    EVT_UPDATE_UI(wxID_PRINT, wxDocManager::OnUpdateDisableIfNoDoc)
+    EVT_UPDATE_UI(wxID_PREVIEW, wxDocManager::OnUpdateDisableIfNoDoc)
+    // NB: we keep "Print setup" menu item always enabled as it can be used
+    //     even without an active document
+#endif // wxUSE_PRINTING_ARCHITECTURE
 END_EVENT_TABLE()
 
-wxDocManager* wxDocManager::sm_docManager = (wxDocManager*) NULL;
+wxDocManager* wxDocManager::sm_docManager = NULL;
 
-wxDocManager::wxDocManager(long flags, bool initialize)
+wxDocManager::wxDocManager(long WXUNUSED(flags), bool initialize)
 {
+    sm_docManager = this;
+
     m_defaultDocumentNameCounter = 1;
-    m_flags = flags;
-    m_currentView = (wxView *) NULL;
-    m_maxDocsOpen = 10000;
-    m_fileHistory = (wxFileHistory *) NULL;
-    if (initialize)
+    m_currentView = NULL;
+    m_maxDocsOpen = INT_MAX;
+    m_fileHistory = NULL;
+    if ( initialize )
         Initialize();
-    sm_docManager = this;
 }
 
 wxDocManager::~wxDocManager()
 {
     Clear();
-    if (m_fileHistory)
-        delete m_fileHistory;
-    sm_docManager = (wxDocManager*) NULL;
+    delete m_fileHistory;
+    sm_docManager = NULL;
 }
 
-bool wxDocManager::Clear(bool force)
+// closes the specified document
+bool wxDocManager::CloseDocument(wxDocument* doc, bool force)
 {
-    wxNode *node = m_docs.First();
-    while (node)
-    {
-        wxDocument *doc = (wxDocument *)node->Data();
-        wxNode *next = node->Next();
+    if ( !doc->Close() && !force )
+        return false;
 
-        if (!doc->Close() && !force)
-            return FALSE;
+    // Implicitly deletes the document when
+    // the last view is deleted
+    doc->DeleteAllViews();
 
-        // Implicitly deletes the document when the last
-        // view is removed (deleted)
-        doc->DeleteAllViews();
+    // Check we're really deleted
+    if (m_docs.Member(doc))
+        delete doc;
+
+    return true;
+}
+
+bool wxDocManager::CloseDocuments(bool force)
+{
+    wxList::compatibility_iterator node = m_docs.GetFirst();
+    while (node)
+    {
+        wxDocument *doc = (wxDocument *)node->GetData();
+        wxList::compatibility_iterator next = node->GetNext();
 
-        // Check document is deleted
-        if (m_docs.Member(doc))
-            delete doc;
+        if (!CloseDocument(doc, force))
+            return false;
 
         // This assumes that documents are not connected in
         // any way, i.e. deleting one document does NOT
         // delete another.
         node = next;
     }
-    node = m_templates.First();
-    while (node)
-    {
-        wxDocTemplate *templ = (wxDocTemplate*) node->Data();
-        wxNode* next = node->Next();
-        delete templ;
-        node = next;
-    }
-    return TRUE;
+    return true;
+}
+
+bool wxDocManager::Clear(bool force)
+{
+    if (!CloseDocuments(force))
+        return false;
+
+    m_currentView = NULL;
+
+    wxList::compatibility_iterator node = m_templates.GetFirst();
+    while (node)
+    {
+        wxDocTemplate *templ = (wxDocTemplate*) node->GetData();
+        wxList::compatibility_iterator next = node->GetNext();
+        delete templ;
+        node = next;
+    }
+    return true;
 }
 
 bool wxDocManager::Initialize()
 {
     m_fileHistory = OnCreateFileHistory();
-    return TRUE;
+    return true;
+}
+
+wxString wxDocManager::GetLastDirectory() const
+{
+    // if we haven't determined the last used directory yet, do it now
+    if ( m_lastDirectory.empty() )
+    {
+        // we're going to modify m_lastDirectory in this const method, so do it
+        // via non-const self pointer instead of const this one
+        wxDocManager * const self = const_cast<wxDocManager *>(this);
+
+        // first try to reuse the directory of the most recently opened file:
+        // this ensures that if the user opens a file, closes the program and
+        // runs it again the "Open file" dialog will open in the directory of
+        // the last file he used
+        if ( m_fileHistory && m_fileHistory->GetCount() )
+        {
+            const wxString lastOpened = m_fileHistory->GetHistoryFile(0);
+            const wxFileName fn(lastOpened);
+            if ( fn.DirExists() )
+            {
+                self->m_lastDirectory = fn.GetPath();
+            }
+            //else: should we try the next one?
+        }
+        //else: no history yet
+
+        // if we don't have any files in the history (yet?), use the
+        // system-dependent default location for the document files
+        if ( m_lastDirectory.empty() )
+        {
+            self->m_lastDirectory = wxStandardPaths::Get().GetAppDocumentsDir();
+        }
+    }
+
+    return m_lastDirectory;
 }
 
 wxFileHistory *wxDocManager::OnCreateFileHistory()
@@ -789,24 +1083,26 @@ wxFileHistory *wxDocManager::OnCreateFileHistory()
 void wxDocManager::OnFileClose(wxCommandEvent& WXUNUSED(event))
 {
     wxDocument *doc = GetCurrentDocument();
-    if (!doc)
-        return;
-    if (doc->Close())
-    {
-        doc->DeleteAllViews();
-        if (m_docs.Member(doc))
-            delete doc;
-    }
+    if (doc)
+        CloseDocument(doc);
+}
+
+void wxDocManager::OnFileCloseAll(wxCommandEvent& WXUNUSED(event))
+{
+    CloseDocuments(false);
 }
 
 void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event))
 {
-    CreateDocument(wxString(""), wxDOC_NEW);
+    CreateNewDocument();
 }
 
 void wxDocManager::OnFileOpen(wxCommandEvent& WXUNUSED(event))
 {
-    CreateDocument(wxString(""), 0);
+    if ( !CreateDocument("") )
+    {
+        OnOpenFileFailure();
+    }
 }
 
 void wxDocManager::OnFileRevert(wxCommandEvent& WXUNUSED(event))
@@ -833,362 +1129,476 @@ void wxDocManager::OnFileSaveAs(wxCommandEvent& WXUNUSED(event))
     doc->SaveAs();
 }
 
-void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
+void wxDocManager::OnMRUFile(wxCommandEvent& event)
+{
+    // Check if the id is in the range assigned to MRU list entries.
+    const int id = event.GetId();
+    if ( id >= wxID_FILE1 &&
+            id < wxID_FILE1 + static_cast<int>(m_fileHistory->GetCount()) )
+    {
+        DoOpenMRUFile(id - wxID_FILE1);
+    }
+    else
+    {
+        event.Skip();
+    }
+}
+
+void wxDocManager::DoOpenMRUFile(unsigned n)
 {
+    wxString filename(GetHistoryFile(n));
+    if ( filename.empty() )
+        return;
+
+    wxString errMsg; // must contain exactly one "%s" if non-empty
+    if ( wxFile::Exists(filename) )
+    {
+        // Try to open it but don't give an error if it failed: this could be
+        // normal, e.g. because the user cancelled opening it, and we don't
+        // have any useful information to put in the error message anyhow, so
+        // we assume that in case of an error the appropriate message had been
+        // already logged.
+        (void)CreateDocument(filename, wxDOC_SILENT);
+    }
+    else // file doesn't exist
+    {
+        OnMRUFileNotExist(n, filename);
+    }
+}
+
+void wxDocManager::OnMRUFileNotExist(unsigned n, const wxString& filename)
+{
+    // remove the file which we can't open from the MRU list
+    RemoveFileFromHistory(n);
+
+    // and tell the user about it
+    wxLogError(_("The file '%s' doesn't exist and couldn't be opened.\n"
+                 "It has been removed from the most recently used files list."),
+               filename);
+}
+
 #if wxUSE_PRINTING_ARCHITECTURE
-    wxView *view = GetCurrentView();
+
+void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
+{
+    wxView *view = GetActiveView();
     if (!view)
         return;
 
     wxPrintout *printout = view->OnCreatePrintout();
     if (printout)
     {
-        wxPrinter printer;
-        printer.Print(view->GetFrame(), printout, TRUE);
+        wxPrintDialogData printDialogData(m_pageSetupDialogData.GetPrintData());
+        wxPrinter printer(&printDialogData);
+        printer.Print(view->GetFrame(), printout, true);
 
         delete printout;
     }
-#endif // wxUSE_PRINTING_ARCHITECTURE
 }
 
-void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
+void wxDocManager::OnPageSetup(wxCommandEvent& WXUNUSED(event))
 {
-#if wxUSE_PRINTING_ARCHITECTURE
-    wxWindow *parentWin = wxTheApp->GetTopWindow();
-    wxView *view = GetCurrentView();
-    if (view)
-        parentWin = view->GetFrame();
-
-    wxPrintDialogData data;
+    wxPageSetupDialog dlg(wxTheApp->GetTopWindow(), &m_pageSetupDialogData);
+    if ( dlg.ShowModal() == wxID_OK )
+    {
+        m_pageSetupDialogData = dlg.GetPageSetupData();
+    }
+}
 
-    wxPrintDialog printerDialog(parentWin, &data);
-    printerDialog.GetPrintDialogData().SetSetupDialog(TRUE);
-    printerDialog.ShowModal();
-#endif // wxUSE_PRINTING_ARCHITECTURE
+wxPreviewFrame* wxDocManager::CreatePreviewFrame(wxPrintPreviewBase* preview,
+                                                 wxWindow *parent,
+                                                 const wxString& title)
+{
+    return new wxPreviewFrame(preview, parent, title);
 }
 
 void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
 {
-#if wxUSE_PRINTING_ARCHITECTURE
-    wxView *view = GetCurrentView();
+    wxBusyCursor busy;
+    wxView *view = GetActiveView();
     if (!view)
         return;
 
     wxPrintout *printout = view->OnCreatePrintout();
     if (printout)
     {
+        wxPrintDialogData printDialogData(m_pageSetupDialogData.GetPrintData());
+
         // Pass two printout objects: for preview, and possible printing.
-        wxPrintPreviewBase *preview = (wxPrintPreviewBase *) NULL;
-        preview = new wxPrintPreview(printout, view->OnCreatePrintout());
+        wxPrintPreviewBase *
+            preview = new wxPrintPreview(printout,
+                                         view->OnCreatePrintout(),
+                                         &printDialogData);
+        if ( !preview->IsOk() )
+        {
+            delete preview;
+            wxLogError(_("Print preview creation failed."));
+            return;
+        }
+
+        wxPreviewFrame* frame = CreatePreviewFrame(preview,
+                                                   wxTheApp->GetTopWindow(),
+                                                   _("Print Preview"));
+        wxCHECK_RET( frame, "should create a print preview frame" );
 
-        wxPreviewFrame *frame = new wxPreviewFrame(preview, (wxFrame *)wxTheApp->GetTopWindow(), _("Print Preview"),
-                wxPoint(100, 100), wxSize(600, 650));
         frame->Centre(wxBOTH);
         frame->Initialize();
-        frame->Show(TRUE);
+        frame->Show(true);
     }
-#endif // wxUSE_PRINTING_ARCHITECTURE
 }
+#endif // wxUSE_PRINTING_ARCHITECTURE
 
-void wxDocManager::OnUndo(wxCommandEvent& WXUNUSED(event))
+void wxDocManager::OnUndo(wxCommandEvent& event)
 {
-    wxDocument *doc = GetCurrentDocument();
-    if (!doc)
+    wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor();
+    if ( !cmdproc )
+    {
+        event.Skip();
         return;
-    if (doc->GetCommandProcessor())
-        doc->GetCommandProcessor()->Undo();
+    }
+
+    cmdproc->Undo();
 }
 
-void wxDocManager::OnRedo(wxCommandEvent& WXUNUSED(event))
+void wxDocManager::OnRedo(wxCommandEvent& event)
 {
-    wxDocument *doc = GetCurrentDocument();
-    if (!doc)
+    wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor();
+    if ( !cmdproc )
+    {
+        event.Skip();
         return;
-    if (doc->GetCommandProcessor())
-        doc->GetCommandProcessor()->Redo();
+    }
+
+    cmdproc->Redo();
 }
 
 // Handlers for UI update commands
 
 void wxDocManager::OnUpdateFileOpen(wxUpdateUIEvent& event)
 {
-    event.Enable( TRUE );
+    // CreateDocument() (which is called from OnFileOpen) may succeed
+    // only when there is at least a template:
+    event.Enable( GetTemplates().GetCount()>0 );
 }
 
-void wxDocManager::OnUpdateFileClose(wxUpdateUIEvent& event)
+void wxDocManager::OnUpdateDisableIfNoDoc(wxUpdateUIEvent& event)
 {
-    wxDocument *doc = GetCurrentDocument();
-    event.Enable( (doc != (wxDocument*) NULL) );
+    event.Enable( GetCurrentDocument() != NULL );
 }
 
 void wxDocManager::OnUpdateFileRevert(wxUpdateUIEvent& event)
 {
-    wxDocument *doc = GetCurrentDocument();
-    event.Enable( (doc != (wxDocument*) NULL) );
+    wxDocument* doc = GetCurrentDocument();
+    event.Enable(doc && doc->IsModified() && doc->GetDocumentSaved());
 }
 
 void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event)
 {
-    event.Enable( TRUE );
+    // CreateDocument() (which is called from OnFileNew) may succeed
+    // only when there is at least a template:
+    event.Enable( GetTemplates().GetCount()>0 );
 }
 
 void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event)
 {
-    wxDocument *doc = GetCurrentDocument();
-    event.Enable( (doc != (wxDocument*) NULL) );
+    wxDocument * const doc = GetCurrentDocument();
+    event.Enable( doc && !doc->IsChildDocument() && !doc->AlreadySaved() );
 }
 
 void wxDocManager::OnUpdateFileSaveAs(wxUpdateUIEvent& event)
 {
-    wxDocument *doc = GetCurrentDocument();
-    event.Enable( (doc != (wxDocument*) NULL) );
+    wxDocument * const doc = GetCurrentDocument();
+    event.Enable( doc && !doc->IsChildDocument() );
 }
 
 void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event)
 {
-    wxDocument *doc = GetCurrentDocument();
-    event.Enable( (doc && doc->GetCommandProcessor() && doc->GetCommandProcessor()->CanUndo()) );
+    wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor();
+    if ( !cmdproc )
+    {
+        event.Enable(false);
+        return;
+    }
+
+    event.Enable(cmdproc->CanUndo());
+    cmdproc->SetMenuStrings();
 }
 
 void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event)
 {
-    wxDocument *doc = GetCurrentDocument();
-    event.Enable( (doc && doc->GetCommandProcessor() && doc->GetCommandProcessor()->CanRedo()) );
+    wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor();
+    if ( !cmdproc )
+    {
+        event.Enable(false);
+        return;
+    }
+
+    event.Enable(cmdproc->CanRedo());
+    cmdproc->SetMenuStrings();
 }
 
-void wxDocManager::OnUpdatePrint(wxUpdateUIEvent& event)
+wxView *wxDocManager::GetActiveView() const
 {
-    wxDocument *doc = GetCurrentDocument();
-    event.Enable( (doc != (wxDocument*) NULL) );
+    wxView *view = GetCurrentView();
+
+    if ( !view && !m_docs.empty() )
+    {
+        // 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 view;
 }
 
-void wxDocManager::OnUpdatePrintSetup(wxUpdateUIEvent& event)
+bool wxDocManager::TryBefore(wxEvent& event)
 {
-    event.Enable( TRUE );
+    wxView * const view = GetActiveView();
+    return view && view->ProcessEventLocally(event);
 }
 
-void wxDocManager::OnUpdatePreview(wxUpdateUIEvent& event)
+namespace
 {
-    wxDocument *doc = GetCurrentDocument();
-    event.Enable( (doc != (wxDocument*) NULL) );
-}
 
-wxView *wxDocManager::GetCurrentView() const
+// helper function: return only the visible templates
+wxDocTemplates GetVisibleTemplates(const wxList& allTemplates)
 {
-    if (m_currentView)
-        return m_currentView;
-    if (m_docs.Number() == 1)
+    // select only the visible templates
+    const size_t totalNumTemplates = allTemplates.GetCount();
+    wxDocTemplates templates;
+    if ( totalNumTemplates )
     {
-        wxDocument* doc = (wxDocument*) m_docs.First()->Data();
-        return doc->GetFirstView();
+        templates.reserve(totalNumTemplates);
+
+        for ( wxList::const_iterator i = allTemplates.begin(),
+                                   end = allTemplates.end();
+              i != end;
+              ++i )
+        {
+            wxDocTemplate * const temp = (wxDocTemplate *)*i;
+            if ( temp->IsVisible() )
+                templates.push_back(temp);
+        }
     }
-    return (wxView *) NULL;
+
+    return templates;
 }
 
-// Extend event processing to search the view's event table
-bool wxDocManager::ProcessEvent(wxEvent& event)
+} // anonymous namespace
+
+void wxDocManager::ActivateDocument(wxDocument *doc)
 {
-    wxView* view = GetCurrentView();
-    if (view)
-    {
-        if (view->ProcessEvent(event))
-            return TRUE;
-    }
-    return wxEvtHandler::ProcessEvent(event);
+    wxView * const view = doc->GetFirstView();
+    if ( !view )
+        return;
+
+    view->Activate(true);
+    if ( wxWindow *win = view->GetFrame() )
+        win->SetFocus();
 }
 
-wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
+wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)
 {
-    wxDocTemplate **templates = new wxDocTemplate *[m_templates.Number()];
-    int i;
-    int n = 0;
-    for (i = 0; i < m_templates.Number(); i++)
+    // 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));
+    const size_t numTemplates = templates.size();
+    if ( !numTemplates )
     {
-        wxDocTemplate *temp = (wxDocTemplate *)(m_templates.Nth(i)->Data());
-        if (temp->IsVisible())
-        {
-            templates[n] = temp;
-            n ++;
-        }
-    }
-    if (n == 0)
-    {
-        delete[] templates;
-        return (wxDocument *) NULL;
+        // no templates can be used, can't create document
+        return NULL;
     }
 
-    // If we've reached the max number of docs, close the
-    // first one.
-    if (GetDocuments().Number() >= m_maxDocsOpen)
+
+    // normally user should select the template to use but wxDOC_SILENT flag we
+    // choose one ourselves
+    wxString path = pathOrig;   // may be modified below
+    wxDocTemplate *temp;
+    if ( flags & wxDOC_SILENT )
     {
-        wxDocument *doc = (wxDocument *)GetDocuments().First()->Data();
-        if (doc->Close())
-        {
-            // Implicitly deletes the document when
-            // the last view is deleted
-            doc->DeleteAllViews();
+        wxASSERT_MSG( !path.empty(),
+                      "using empty path with wxDOC_SILENT doesn't make sense" );
 
-            // Check we're really deleted
-            if (m_docs.Member(doc))
-                delete doc;
+        temp = FindTemplateForPath(path);
+        if ( !temp )
+        {
+            wxLogWarning(_("The format of file '%s' couldn't be determined."),
+                         path);
         }
+    }
+    else // not silent, ask the user
+    {
+        // for the new file we need just the template, for an existing one we
+        // need the template and the path, unless it's already specified
+        if ( (flags & wxDOC_NEW) || !path.empty() )
+            temp = SelectDocumentType(&templates[0], numTemplates);
         else
-            return (wxDocument *) NULL;
+            temp = SelectDocumentPath(&templates[0], numTemplates, path, flags);
     }
 
-    // New document: user chooses a template, unless there's only one.
-    if (flags & wxDOC_NEW)
+    if ( !temp )
+        return NULL;
+
+    // check whether the document with this path is already opened
+    if ( !path.empty() )
     {
-        if (n == 1)
+        const wxFileName fn(path);
+        for ( wxList::const_iterator i = m_docs.begin(); i != m_docs.end(); ++i )
         {
-            wxDocTemplate *temp = templates[0];
-            delete[] templates;
-            wxDocument *newDoc = temp->CreateDocument(path, flags);
-            if (newDoc)
+            wxDocument * const doc = (wxDocument*)*i;
+
+            if ( fn == doc->GetFilename() )
             {
-                newDoc->SetDocumentName(temp->GetDocumentName());
-                newDoc->SetDocumentTemplate(temp);
-                newDoc->OnNewDocument();
+                // file already open, just activate it and return
+                ActivateDocument(doc);
+                return doc;
             }
-            return newDoc;
         }
+    }
 
-        wxDocTemplate *temp = SelectDocumentType(templates, n);
-        delete[] templates;
-        if (temp)
+
+    // no, we need to create a new document
+
+
+    // if we've reached the max number of docs, close the first one.
+    if ( (int)GetDocuments().GetCount() >= m_maxDocsOpen )
+    {
+        if ( !CloseDocument((wxDocument *)GetDocuments().GetFirst()->GetData()) )
         {
-            wxDocument *newDoc = temp->CreateDocument(path, flags);
-            if (newDoc)
-            {
-                newDoc->SetDocumentName(temp->GetDocumentName());
-                newDoc->SetDocumentTemplate(temp);
-                newDoc->OnNewDocument();
-            }
-            return newDoc;
+            // can't open the new document if closing the old one failed
+            return NULL;
         }
-        else
-            return (wxDocument *) NULL;
     }
 
-    // Existing document
-    wxDocTemplate *temp = (wxDocTemplate *) NULL;
-
-    wxString path2(wxT(""));
-    if (path != wxT(""))
-        path2 = path;
 
-    if (flags & wxDOC_SILENT)
-        temp = FindTemplateForPath(path2);
-    else
-        temp = SelectDocumentPath(templates, n, path2, flags);
+    // do create and initialize the new document finally
+    wxDocument * const docNew = temp->CreateDocument(path, flags);
+    if ( !docNew )
+        return NULL;
 
-    delete[] templates;
+    docNew->SetDocumentName(temp->GetDocumentName());
+    docNew->SetDocumentTemplate(temp);
 
-    if (temp)
+    wxTRY
     {
-        wxDocument *newDoc = temp->CreateDocument(path2, flags);
-        if (newDoc)
+        // 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)) )
         {
-            newDoc->SetDocumentName(temp->GetDocumentName());
-            newDoc->SetDocumentTemplate(temp);
-            if (!newDoc->OnOpenDocument(path2))
-            {
-                delete newDoc;
-                return (wxDocument *) NULL;
-            }
-            AddFileToHistory(path2);
+            docNew->DeleteAllViews();
+            return NULL;
         }
-        return newDoc;
     }
-    else
-        return (wxDocument *) 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
+    // this document to be retrievable from the file extension
+    if ( !(flags & wxDOC_NEW) && temp->FileMatchesTemplate(path) )
+        AddFileToHistory(path);
+
+    // 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);
+
+    return docNew;
 }
 
 wxView *wxDocManager::CreateView(wxDocument *doc, long flags)
 {
-    wxDocTemplate **templates = new wxDocTemplate *[m_templates.Number()];
-    int n =0;
-    int i;
-    for (i = 0; i < m_templates.Number(); i++)
-    {
-        wxDocTemplate *temp = (wxDocTemplate *)(m_templates.Nth(i)->Data());
-        if (temp->IsVisible())
-        {
-            if (temp->GetDocumentName() == doc->GetDocumentName())
-            {
-                templates[n] = temp;
-                n ++;
-            }
-        }
-    }
-    if (n == 0)
-    {
-        delete[] templates;
-        return (wxView *) NULL;
-    }
-    if (n == 1)
-    {
-        wxDocTemplate *temp = templates[0];
-        delete[] templates;
-        wxView *view = temp->CreateView(doc, flags);
-        if (view)
-            view->SetViewName(temp->GetViewName());
-        return view;
-    }
+    wxDocTemplates templates(GetVisibleTemplates(m_templates));
+    const size_t numTemplates = templates.size();
 
-    wxDocTemplate *temp = SelectViewType(templates, n);
-    delete[] templates;
-    if (temp)
-    {
-        wxView *view = temp->CreateView(doc, flags);
-        if (view)
-            view->SetViewName(temp->GetViewName());
-        return view;
-    }
-    else
-        return (wxView *) NULL;
+    if ( numTemplates == 0 )
+        return NULL;
+
+    wxDocTemplate * const
+    temp = numTemplates == 1 ? templates[0]
+                             : SelectViewType(&templates[0], numTemplates);
+
+    if ( !temp )
+        return NULL;
+
+    wxView *view = temp->CreateView(doc, flags);
+    if ( view )
+        view->SetViewName(temp->GetViewName());
+    return view;
 }
 
 // Not yet implemented
-void wxDocManager::DeleteTemplate(wxDocTemplate *WXUNUSED(temp), long WXUNUSED(flags))
+void
+wxDocManager::DeleteTemplate(wxDocTemplate *WXUNUSED(temp), long WXUNUSED(flags))
 {
 }
 
 // Not yet implemented
 bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc))
 {
-    return FALSE;
+    return false;
 }
 
 wxDocument *wxDocManager::GetCurrentDocument() const
 {
-    if (m_currentView)
-        return m_currentView->GetDocument();
-    else
-        return (wxDocument *) NULL;
+    wxView * const view = GetActiveView();
+    return view ? view->GetDocument() : NULL;
 }
 
-// Make a default document name
-bool wxDocManager::MakeDefaultName(wxString& name)
+wxCommandProcessor *wxDocManager::GetCurrentCommandProcessor() const
 {
-    name.Printf(_("unnamed%d"), m_defaultDocumentNameCounter);
-    m_defaultDocumentNameCounter++;
+    wxDocument * const doc = GetCurrentDocument();
+    return doc ? doc->GetCommandProcessor() : NULL;
+}
 
-    return TRUE;
+// Make a default name for a new document
+#if WXWIN_COMPATIBILITY_2_8
+bool wxDocManager::MakeDefaultName(wxString& WXUNUSED(name))
+{
+    // we consider that this function can only be overridden by the user code,
+    // not called by it as it only makes sense to call it internally, so we
+    // don't bother to return anything from here
+    return false;
+}
+#endif // WXWIN_COMPATIBILITY_2_8
+
+wxString wxDocManager::MakeNewDocumentName()
+{
+    wxString name;
+
+#if WXWIN_COMPATIBILITY_2_8
+    if ( !MakeDefaultName(name) )
+#endif // WXWIN_COMPATIBILITY_2_8
+    {
+        name.Printf(_("unnamed%d"), m_defaultDocumentNameCounter);
+        m_defaultDocumentNameCounter++;
+    }
+
+    return name;
 }
 
 // Make a frame title (override this to do something different)
 // If docName is empty, a document is not currently active.
 wxString wxDocManager::MakeFrameTitle(wxDocument* doc)
 {
-    wxString appName = wxTheApp->GetAppName();
+    wxString appName = wxTheApp->GetAppDisplayName();
     wxString title;
     if (!doc)
         title = appName;
     else
     {
-        wxString docName;
-        doc->GetPrintableName(docName);
+        wxString docName = doc->GetUserReadableName();
         title = docName + wxString(_(" - ")) + appName;
     }
     return title;
@@ -1198,7 +1608,7 @@ wxString wxDocManager::MakeFrameTitle(wxDocument* doc)
 // Not yet implemented
 wxDocTemplate *wxDocManager::MatchTemplate(const wxString& WXUNUSED(path))
 {
-    return (wxDocTemplate *) NULL;
+    return NULL;
 }
 
 // File history management
@@ -1208,13 +1618,13 @@ void wxDocManager::AddFileToHistory(const wxString& file)
         m_fileHistory->AddFileToHistory(file);
 }
 
-void wxDocManager::RemoveFileFromHistory(int i)
+void wxDocManager::RemoveFileFromHistory(size_t i)
 {
     if (m_fileHistory)
         m_fileHistory->RemoveFileFromHistory(i);
 }
 
-wxString wxDocManager::GetHistoryFile(int i) const
+wxString wxDocManager::GetHistoryFile(size_t i) const
 {
     wxString histFile;
 
@@ -1237,7 +1647,7 @@ void wxDocManager::FileHistoryRemoveMenu(wxMenu *menu)
 }
 
 #if wxUSE_CONFIG
-void wxDocManager::FileHistoryLoad(wxConfigBase& config)
+void wxDocManager::FileHistoryLoad(const wxConfigBase& config)
 {
     if (m_fileHistory)
         m_fileHistory->Load(config);
@@ -1262,12 +1672,9 @@ void wxDocManager::FileHistoryAddFilesToMenu()
         m_fileHistory->AddFilesToMenu();
 }
 
-int wxDocManager::GetNoHistoryFiles() const
+size_t wxDocManager::GetHistoryFilesCount() const
 {
-    if (m_fileHistory)
-        return m_fileHistory->GetNoHistoryFiles();
-    else
-        return 0;
+    return m_fileHistory ? m_fileHistory->GetCount() : 0;
 }
 
 
@@ -1275,13 +1682,12 @@ int wxDocManager::GetNoHistoryFiles() const
 // against that of the template
 wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path)
 {
-    wxDocTemplate *theTemplate = (wxDocTemplate *) NULL;
+    wxDocTemplate *theTemplate = NULL;
 
     // Find the template which this extension corresponds to
-    int i;
-    for (i = 0; i < m_templates.Number(); i++)
+    for (size_t i = 0; i < m_templates.GetCount(); i++)
     {
-        wxDocTemplate *temp = (wxDocTemplate *)m_templates.Nth(i)->Data();
+        wxDocTemplate *temp = (wxDocTemplate *)m_templates.Item(i)->GetData();
         if ( temp->FileMatchesTemplate(path) )
         {
             theTemplate = temp;
@@ -1292,31 +1698,24 @@ wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path)
 }
 
 // Prompts user to open a file, using file specs in templates.
-// How to implement in wxWindows? Must extend the file selector
-// dialog or implement own; OR match the extension to the
-// template extension.
+// Must extend the file selector dialog or implement own; OR
+// match the extension to the template extension.
 
 wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
-#if defined(__WXMSW__) || defined(__WXGTK__)
                                                 int noTemplates,
-#else
-                                                int WXUNUSED(noTemplates),
-#endif
                                                 wxString& path,
                                                 long WXUNUSED(flags),
                                                 bool WXUNUSED(save))
 {
-    // We can only have multiple filters in Windows and GTK
-#if defined(__WXMSW__) || defined(__WXGTK__)
+#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())
         {
             // add a '|' to separate this filter from the previous one
-            if ( !descrBuf.IsEmpty() )
+            if ( !descrBuf.empty() )
                 descrBuf << wxT('|');
 
             descrBuf << templates[i]->GetDescription()
@@ -1326,118 +1725,215 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
     }
 #else
     wxString descrBuf = wxT("*.*");
+    wxUnusedVar(noTemplates);
 #endif
 
-    int FilterIndex = 0;
-    wxString pathTmp = wxFileSelectorEx(_("Select a file"),
-                                        m_lastDirectory,
-                                        wxT(""),
+    int FilterIndex = -1;
+
+    wxString pathTmp = wxFileSelectorEx(_("Open File"),
+                                        GetLastDirectory(),
+                                        wxEmptyString,
                                         &FilterIndex,
                                         descrBuf,
-                                        0,
-                                        wxTheApp->GetTopWindow());
+                                        wxFD_OPEN | wxFD_FILE_MUST_EXIST);
 
-    if (!pathTmp.IsEmpty())
+    wxDocTemplate *theTemplate = NULL;
+    if (!pathTmp.empty())
     {
-        m_lastDirectory = wxPathOnly(pathTmp);
+        if (!wxFileExists(pathTmp))
+        {
+            wxString msgTitle;
+            if (!wxTheApp->GetAppDisplayName().empty())
+                msgTitle = wxTheApp->GetAppDisplayName();
+            else
+                msgTitle = wxString(_("File error"));
+
+            wxMessageBox(_("Sorry, could not open this file."),
+                         msgTitle,
+                         wxOK | wxICON_EXCLAMATION | wxCENTRE);
+
+            path = wxEmptyString;
+            return NULL;
+        }
+
+        SetLastDirectory(wxPathOnly(pathTmp));
 
         path = pathTmp;
 
-        // This is dodgy in that we're selecting the template on the
-        // basis of the file extension, which may not be a standard
-        // one. We really want to know exactly which template was
-        // chosen by using a more advanced file selector.
-        wxDocTemplate *theTemplate = FindTemplateForPath(path);
-        if ( !theTemplate )
+        // first choose the template using the extension, if this fails (i.e.
+        // wxFileSelectorEx() didn't fill it), then use the path
+        if ( FilterIndex != -1 )
             theTemplate = templates[FilterIndex];
-
-        return theTemplate;
+        if ( !theTemplate )
+            theTemplate = FindTemplateForPath(path);
+        if ( !theTemplate )
+        {
+            // 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);
+        }
     }
     else
     {
-        path = wxT("");
-        return (wxDocTemplate *) NULL;
+        path.clear();
     }
-#if 0
-    // In all other windowing systems, until we have more advanced
-    // file selectors, we must select the document type (template) first, and
-    // _then_ pop up the file selector.
-    wxDocTemplate *temp = SelectDocumentType(templates, noTemplates);
-    if (!temp)
-        return (wxDocTemplate *) NULL;
 
-    wxChar *pathTmp = wxFileSelector(_("Select a file"), wxT(""), wxT(""),
-            temp->GetDefaultExtension(),
-            temp->GetFileFilter(),
-            0, wxTheApp->GetTopWindow());
-
-    if (pathTmp)
-    {
-        path = pathTmp;
-        return temp;
-    }
-    else
-        return (wxDocTemplate *) NULL;
-#endif // 0
+    return theTemplate;
 }
 
 wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
-                                                int noTemplates)
+                                                int noTemplates, bool sort)
 {
-    wxChar **strings = new wxChar *[noTemplates];
-    wxChar **data = new wxChar *[noTemplates];
+    wxArrayString strings;
+    wxScopedArray<wxDocTemplate *> data(new wxDocTemplate *[noTemplates]);
     int i;
     int n = 0;
+
     for (i = 0; i < noTemplates; i++)
     {
         if (templates[i]->IsVisible())
         {
-            strings[n] = (wxChar *)templates[i]->m_description.c_str();
-            data[n] = (wxChar *)templates[i];
-            n ++;
+            int j;
+            bool want = true;
+            for (j = 0; j < n; j++)
+            {
+                //filter out NOT unique documents + view combinations
+                if ( templates[i]->m_docTypeName == data[j]->m_docTypeName &&
+                     templates[i]->m_viewTypeName == data[j]->m_viewTypeName
+                   )
+                    want = false;
+            }
+
+            if ( want )
+            {
+                strings.Add(templates[i]->m_description);
+
+                data[n] = templates[i];
+                n ++;
+            }
         }
-    }
-    if (n == 0)
+    }  // for
+
+    if (sort)
     {
-        delete[] strings;
-        delete[] data;
-        return (wxDocTemplate *) NULL;
+        strings.Sort(); // ascending sort
+        // Yes, this will be slow, but template lists
+        // are typically short.
+        int j;
+        n = strings.Count();
+        for (i = 0; i < n; i++)
+        {
+            for (j = 0; j < noTemplates; j++)
+            {
+                if (strings[i] == templates[j]->m_description)
+                    data[i] = templates[j];
+            }
+        }
     }
-    else if (n == 1)
+
+    wxDocTemplate *theTemplate;
+
+    switch ( n )
     {
-        wxDocTemplate *temp = (wxDocTemplate *)data[0];
-        delete[] strings;
-        delete[] data;
-        return temp;
+        case 0:
+            // no visible templates, hence nothing to choose from
+            theTemplate = NULL;
+            break;
+
+        case 1:
+            // don't propose the user to choose if he has no choice
+            theTemplate = data[0];
+            break;
+
+        default:
+            // propose the user to choose one of several
+            theTemplate = (wxDocTemplate *)wxGetSingleChoiceData
+                          (
+                            _("Select a document template"),
+                            _("Templates"),
+                            strings,
+                            (void **)data.get()
+                          );
     }
 
-    wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document template"), _("Templates"), n,
-            strings, (void **)data);
-    delete[] strings;
-    delete[] data;
     return theTemplate;
 }
 
 wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
-        int noTemplates)
+                                            int noTemplates, bool sort)
 {
-    wxChar **strings = new wxChar *[noTemplates];
-    wxChar **data = new wxChar *[noTemplates];
+    wxArrayString strings;
+    wxScopedArray<wxDocTemplate *> data(new wxDocTemplate *[noTemplates]);
     int i;
     int n = 0;
+
     for (i = 0; i < noTemplates; i++)
     {
-        if (templates[i]->IsVisible() && (templates[i]->GetViewName() != wxT("")))
+        wxDocTemplate *templ = templates[i];
+        if ( templ->IsVisible() && !templ->GetViewName().empty() )
         {
-            strings[n] = (wxChar *)templates[i]->m_viewTypeName.c_str();
-            data[n] = (wxChar *)templates[i];
-            n ++;
+            int j;
+            bool want = true;
+            for (j = 0; j < n; j++)
+            {
+                //filter out NOT unique views
+                if ( templates[i]->m_viewTypeName == data[j]->m_viewTypeName )
+                    want = false;
+            }
+
+            if ( want )
+            {
+                strings.Add(templ->m_viewTypeName);
+                data[n] = templ;
+                n ++;
+            }
         }
     }
-    wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document view"), _("Views"), n,
-            strings, (void **)data);
-    delete[] strings;
-    delete[] data;
+
+    if (sort)
+    {
+        strings.Sort(); // ascending sort
+        // Yes, this will be slow, but template lists
+        // are typically short.
+        int j;
+        n = strings.Count();
+        for (i = 0; i < n; i++)
+        {
+            for (j = 0; j < noTemplates; j++)
+            {
+                if (strings[i] == templates[j]->m_viewTypeName)
+                    data[i] = templates[j];
+            }
+        }
+    }
+
+    wxDocTemplate *theTemplate;
+
+    // the same logic as above
+    switch ( n )
+    {
+        case 0:
+            theTemplate = NULL;
+            break;
+
+        case 1:
+            theTemplate = data[0];
+            break;
+
+        default:
+            theTemplate = (wxDocTemplate *)wxGetSingleChoiceData
+                          (
+                            _("Select a document view"),
+                            _("Views"),
+                            strings,
+                            (void **)data.get()
+                          );
+
+    }
+
     return theTemplate;
 }
 
@@ -1452,6 +1948,20 @@ void wxDocManager::DisassociateTemplate(wxDocTemplate *temp)
     m_templates.DeleteObject(temp);
 }
 
+wxDocTemplate* wxDocManager::FindTemplate(const wxClassInfo* classinfo)
+{
+   for ( wxList::compatibility_iterator node = m_templates.GetFirst();
+         node;
+         node = node->GetNext() )
+   {
+      wxDocTemplate* t = wxStaticCast(node->GetData(), wxDocTemplate);
+      if ( t->GetDocClassInfo() == classinfo )
+         return t;
+   }
+
+   return NULL;
+}
+
 // Add and remove a document from the manager's list
 void wxDocManager::AddDocument(wxDocument *doc)
 {
@@ -1466,189 +1976,81 @@ void wxDocManager::RemoveDocument(wxDocument *doc)
 
 // Views or windows should inform the document manager
 // when a view is going in or out of focus
-void wxDocManager::ActivateView(wxView *view, bool activate, bool WXUNUSED(deleting))
-{
-    // If we're deactiving, and if we're not actually deleting the view, then
-    // don't reset the current view because we may be going to
-    // a window without a view.
-    // WHAT DID I MEAN BY THAT EXACTLY?
-    /*
-       if (deleting)
-       {
-       if (m_currentView == view)
-       m_currentView = NULL;
-       }
-       else
-     */
-    {
-        if (activate)
-            m_currentView = view;
-        else
-            m_currentView = (wxView *) NULL;
-    }
-}
-
-// ----------------------------------------------------------------------------
-// Default document child frame
-// ----------------------------------------------------------------------------
-
-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);
-}
-
-wxDocChildFrame::~wxDocChildFrame()
+void wxDocManager::ActivateView(wxView *view, bool activate)
 {
-}
-
-// Extend event processing to search the view's event table
-bool wxDocChildFrame::ProcessEvent(wxEvent& event)
-{
-    if (m_childView)
-        m_childView->Activate(TRUE);
-
-    if ( !m_childView || ! m_childView->ProcessEvent(event) )
+    if ( activate )
     {
-        // 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);
-        else
-            return TRUE;
+        m_currentView = view;
     }
-    else
-        return TRUE;
-}
-
-void wxDocChildFrame::OnActivate(wxActivateEvent& event)
-{
-    wxFrame::OnActivate(event);
-
-    if (m_childView)
-        m_childView->Activate(event.GetActive());
-}
-
-void wxDocChildFrame::OnCloseWindow(wxCloseEvent& event)
-{
-    if (m_childView)
+    else // deactivate
     {
-        bool ans = FALSE;
-        if (!event.CanVeto())
-            ans = TRUE; // Must delete.
-        else
-            ans = m_childView->Close(FALSE); // FALSE means don't delete associated window
-
-        if (ans)
+        if ( m_currentView == view )
         {
-            m_childView->Activate(FALSE);
-            delete m_childView;
-            m_childView = (wxView *) NULL;
-            m_childDocument = (wxDocument *) NULL;
-
-            this->Destroy();
+            // don't keep stale pointer
+            m_currentView = NULL;
         }
-        else
-            event.Veto();
     }
-    else
-        event.Veto();
 }
 
 // ----------------------------------------------------------------------------
-// Default parent frame
+// wxDocChildFrameAnyBase
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxDocParentFrame, wxFrame)
-    EVT_MENU(wxID_EXIT, wxDocParentFrame::OnExit)
-    EVT_MENU_RANGE(wxID_FILE1, wxID_FILE9, wxDocParentFrame::OnMRUFile)
-    EVT_CLOSE(wxDocParentFrame::OnCloseWindow)
-END_EVENT_TABLE()
-
-wxDocParentFrame::wxDocParentFrame(wxDocManager *manager,
-                                   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_docManager = manager;
-}
-
-void wxDocParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
-{
-    Close();
-}
-
-void wxDocParentFrame::OnMRUFile(wxCommandEvent& event)
+bool wxDocChildFrameAnyBase::CloseView(wxCloseEvent& event)
 {
-    int n = event.GetSelection() - wxID_FILE1;  // the index in MRU list
-    wxString filename(m_docManager->GetHistoryFile(n));
-    if ( !filename.IsEmpty() )
+    if ( m_childView )
     {
-        // verify that the file exists before doing anything else
-        if ( wxFile::Exists(filename) )
+        // notice that we must call wxView::Close() and OnClose() called from
+        // it in any case, even if we know that we are going to close anyhow
+        if ( !m_childView->Close(false) && event.CanVeto() )
         {
-            // try to open it
-            (void)m_docManager->CreateDocument(filename, wxDOC_SILENT);
+            event.Veto();
+            return false;
         }
-        else
-        {
-            // remove the bogus filename from the MRU list and notify the user
-            // about it
-            m_docManager->RemoveFileFromHistory(n);
 
-            wxLogError(_("The file '%s' doesn't exist and couldn't be opened.\n"
-                         "It has been also removed from the MRU files list."),
-                       filename.c_str());
-        }
+        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);
+        wxDELETE(m_childView);
     }
+
+    m_childDocument = NULL;
+
+    return true;
 }
 
-// Extend event processing to search the view's event table
-bool wxDocParentFrame::ProcessEvent(wxEvent& event)
+// ----------------------------------------------------------------------------
+// wxDocParentFrameAnyBase
+// ----------------------------------------------------------------------------
+
+#if wxUSE_PRINTING_ARCHITECTURE
+
+namespace
 {
-    // Try the document manager, then do default processing
-    if (!m_docManager || !m_docManager->ProcessEvent(event))
-        return wxEvtHandler::ProcessEvent(event);
-    else
-        return TRUE;
-}
 
-// Define the behaviour for the frame closing
-// - must delete all frames except for the main one.
-void wxDocParentFrame::OnCloseWindow(wxCloseEvent& event)
+wxString GetAppropriateTitle(const wxView *view, const wxString& titleGiven)
 {
-    if (m_docManager->Clear(!event.CanVeto()))
+    wxString title(titleGiven);
+    if ( title.empty() )
     {
-        this->Destroy();
+        if ( view && view->GetDocument() )
+            title = view->GetDocument()->GetUserReadableName();
+        else
+            title = _("Printout");
     }
-    else
-        event.Veto();
+
+    return title;
 }
 
-#if wxUSE_PRINTING_ARCHITECTURE
+} // anonymous namespace
 
 wxDocPrintout::wxDocPrintout(wxView *view, const wxString& title)
-             : wxPrintout(title)
+             : wxPrintout(GetAppropriateTitle(view, title))
 {
     m_printoutView = view;
 }
@@ -1660,8 +2062,10 @@ bool wxDocPrintout::OnPrintPage(int WXUNUSED(page))
     // Get the logical pixels per inch of screen and printer
     int ppiScreenX, ppiScreenY;
     GetPPIScreen(&ppiScreenX, &ppiScreenY);
+    wxUnusedVar(ppiScreenY);
     int ppiPrinterX, ppiPrinterY;
     GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);
+    wxUnusedVar(ppiPrinterY);
 
     // This scales the DC so that the printout roughly represents the
     // the screen scaling. The text point size _should_ be the right size
@@ -1676,6 +2080,7 @@ bool wxDocPrintout::OnPrintPage(int WXUNUSED(page))
     int w, h;
     dc->GetSize(&w, &h);
     GetPageSizePixels(&pageWidth, &pageHeight);
+    wxUnusedVar(pageHeight);
 
     // If printer pageWidth == current DC width, then this doesn't
     // change. But w might be the preview bitmap width, so scale down.
@@ -1686,7 +2091,7 @@ bool wxDocPrintout::OnPrintPage(int WXUNUSED(page))
     {
         m_printoutView->OnDraw(dc);
     }
-    return TRUE;
+    return true;
 }
 
 bool wxDocPrintout::HasPage(int pageNum)
@@ -1697,12 +2102,13 @@ bool wxDocPrintout::HasPage(int pageNum)
 bool wxDocPrintout::OnBeginDocument(int startPage, int endPage)
 {
     if (!wxPrintout::OnBeginDocument(startPage, endPage))
-        return FALSE;
+        return false;
 
-    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;
@@ -1713,485 +2119,126 @@ void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, in
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
 // ----------------------------------------------------------------------------
-// Command processing framework
+// Permits compatibility with existing file formats and functions that
+// manipulate files directly
 // ----------------------------------------------------------------------------
 
-wxCommand::wxCommand(bool canUndoIt, const wxString& name)
-{
-    m_canUndo = canUndoIt;
-    m_commandName = name;
-}
-
-wxCommand::~wxCommand()
-{
-}
-
-// Command processor
-wxCommandProcessor::wxCommandProcessor(int maxCommands)
-{
-    m_maxNoCommands = maxCommands;
-    m_currentCommand = (wxNode *) NULL;
-    m_commandEditMenu = (wxMenu *) NULL;
-}
-
-wxCommandProcessor::~wxCommandProcessor()
-{
-    ClearCommands();
-}
+#if wxUSE_STD_IOSTREAM
 
-// Pass a command to the processor. The processor calls Do();
-// if successful, is appended to the command history unless
-// storeIt is FALSE.
-bool wxCommandProcessor::Submit(wxCommand *command, bool storeIt)
+bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream)
 {
-    bool success = command->Do();
-    if (success && storeIt)
-    {
-        if (m_commands.Number() == m_maxNoCommands)
-        {
-            wxNode *firstNode = m_commands.First();
-            wxCommand *firstCommand = (wxCommand *)firstNode->Data();
-            delete firstCommand;
-            delete firstNode;
-        }
-
-        // Correct a bug: we must chop off the current 'branch'
-        // so that we're at the end of the command list.
-        if (!m_currentCommand)
-            ClearCommands();
-        else
-        {
-            wxNode *node = m_currentCommand->Next();
-            while (node)
-            {
-                wxNode *next = node->Next();
-                delete (wxCommand *)node->Data();
-                delete node;
-                node = next;
-            }
-        }
-
-        m_commands.Append(command);
-        m_currentCommand = m_commands.Last();
-        SetMenuStrings();
-    }
-    return success;
-}
+#if wxUSE_FFILE
+    wxFFile file(filename, wxT("rb"));
+#elif wxUSE_FILE
+    wxFile file(filename, wxFile::read);
+#endif
+    if ( !file.IsOpened() )
+        return false;
 
-bool wxCommandProcessor::Undo()
-{
-    if (m_currentCommand)
-    {
-        wxCommand *command = (wxCommand *)m_currentCommand->Data();
-        if (command->CanUndo())
-        {
-            bool success = command->Undo();
-            if (success)
-            {
-                m_currentCommand = m_currentCommand->Previous();
-                SetMenuStrings();
-                return TRUE;
-            }
-        }
-    }
-    return FALSE;
-}
+    char buf[4096];
 
-bool wxCommandProcessor::Redo()
-{
-    wxCommand *redoCommand = (wxCommand *) NULL;
-    wxNode *redoNode = (wxNode *) NULL;
-    if (m_currentCommand && m_currentCommand->Next())
-    {
-        redoCommand = (wxCommand *)m_currentCommand->Next()->Data();
-        redoNode = m_currentCommand->Next();
-    }
-    else
+    size_t nRead;
+    do
     {
-        if (m_commands.Number() > 0)
-        {
-            redoCommand = (wxCommand *)m_commands.First()->Data();
-            redoNode = m_commands.First();
-        }
-    }
+        nRead = file.Read(buf, WXSIZEOF(buf));
+        if ( file.Error() )
+            return false;
 
-    if (redoCommand)
-    {
-        bool success = redoCommand->Do();
-        if (success)
-        {
-            m_currentCommand = redoNode;
-            SetMenuStrings();
-            return TRUE;
-        }
+        stream.write(buf, nRead);
+        if ( !stream )
+            return false;
     }
-    return FALSE;
-}
+    while ( !file.Eof() );
 
-bool wxCommandProcessor::CanUndo() const
-{
-    if (m_currentCommand)
-        return ((wxCommand *)m_currentCommand->Data())->CanUndo();
-    return FALSE;
+    return true;
 }
 
-bool wxCommandProcessor::CanRedo() const
+bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename)
 {
-    if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->Next() == (wxNode*) NULL))
-        return FALSE;
-
-    if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->Next() != (wxNode*) NULL))
-        return TRUE;
-
-    if ((m_currentCommand == (wxNode*) NULL) && (m_commands.Number() > 0))
-        return TRUE;
-
-    return FALSE;
-}
-
-void wxCommandProcessor::Initialize()
-{
-    m_currentCommand = m_commands.Last();
-    SetMenuStrings();
-}
+#if wxUSE_FFILE
+    wxFFile file(filename, wxT("wb"));
+#elif wxUSE_FILE
+    wxFile file(filename, wxFile::write);
+#endif
+    if ( !file.IsOpened() )
+        return false;
 
-void wxCommandProcessor::SetMenuStrings()
-{
-    if (m_commandEditMenu)
+    char buf[4096];
+    do
     {
-        wxString buf;
-        if (m_currentCommand)
-        {
-            wxCommand *command = (wxCommand *)m_currentCommand->Data();
-            wxString commandName(command->GetName());
-            if (commandName == wxT("")) commandName = _("Unnamed command");
-            bool canUndo = command->CanUndo();
-            if (canUndo)
-                buf = wxString(_("&Undo ")) + commandName;
-            else
-                buf = wxString(_("Can't &Undo ")) + commandName;
-
-            m_commandEditMenu->SetLabel(wxID_UNDO, buf);
-            m_commandEditMenu->Enable(wxID_UNDO, canUndo);
-
-            // We can redo, if we're not at the end of the history.
-            if (m_currentCommand->Next())
-            {
-                wxCommand *redoCommand = (wxCommand *)m_currentCommand->Next()->Data();
-                wxString redoCommandName(redoCommand->GetName());
-                if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command");
-                buf = wxString(_("&Redo ")) + redoCommandName;
-                m_commandEditMenu->SetLabel(wxID_REDO, buf);
-                m_commandEditMenu->Enable(wxID_REDO, TRUE);
-            }
-            else
-            {
-                m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo"));
-                m_commandEditMenu->Enable(wxID_REDO, FALSE);
-            }
-        }
-        else
+        stream.read(buf, WXSIZEOF(buf));
+        if ( !stream.bad() ) // fail may be set on EOF, don't use operator!()
         {
-            m_commandEditMenu->SetLabel(wxID_UNDO, _("&Undo"));
-            m_commandEditMenu->Enable(wxID_UNDO, FALSE);
-
-            if (m_commands.Number() == 0)
-            {
-                m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo"));
-                m_commandEditMenu->Enable(wxID_REDO, FALSE);
-            }
-            else
-            {
-                // currentCommand is NULL but there are commands: this means that
-                // we've undone to the start of the list, but can redo the first.
-                wxCommand *redoCommand = (wxCommand *)m_commands.First()->Data();
-                wxString redoCommandName(redoCommand->GetName());
-                if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command");
-                buf = wxString(_("&Redo ")) + redoCommandName;
-                m_commandEditMenu->SetLabel(wxID_REDO, buf);
-                m_commandEditMenu->Enable(wxID_REDO, TRUE);
-            }
+            if ( !file.Write(buf, stream.gcount()) )
+                return false;
         }
     }
-}
+    while ( !stream.eof() );
 
-void wxCommandProcessor::ClearCommands()
-{
-    wxNode *node = m_commands.First();
-    while (node)
-    {
-        wxCommand *command = (wxCommand *)node->Data();
-        delete command;
-        delete node;
-        node = m_commands.First();
-    }
-    m_currentCommand = (wxNode *) NULL;
+    return true;
 }
 
-// ----------------------------------------------------------------------------
-// File history processor
-// ----------------------------------------------------------------------------
+#else // !wxUSE_STD_IOSTREAM
 
-wxFileHistory::wxFileHistory(int maxFiles)
+bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream)
 {
-    m_fileMaxFiles = maxFiles;
-    m_fileHistoryN = 0;
-    m_fileHistory = new wxChar *[m_fileMaxFiles];
-}
+#if wxUSE_FFILE
+    wxFFile file(filename, wxT("rb"));
+#elif wxUSE_FILE
+    wxFile file(filename, wxFile::read);
+#endif
+    if ( !file.IsOpened() )
+        return false;
 
-wxFileHistory::~wxFileHistory()
-{
-    int i;
-    for (i = 0; i < m_fileHistoryN; i++)
-        delete[] m_fileHistory[i];
-    delete[] m_fileHistory;
-}
+    char buf[4096];
 
-// File history management
-void wxFileHistory::AddFileToHistory(const wxString& file)
-{
-    int i;
-    // Check we don't already have this file
-    for (i = 0; i < m_fileHistoryN; i++)
+    size_t nRead;
+    do
     {
-        if (m_fileHistory[i] && wxString(m_fileHistory[i]) == file)
-            return;
-    }
-
-    // Add to the project file history:
-    // Move existing files (if any) down so we can insert file at beginning.
+        nRead = file.Read(buf, WXSIZEOF(buf));
+        if ( file.Error() )
+            return false;
 
-    // First delete filename that has popped off the end of the array (if any)
-    if (m_fileHistoryN == m_fileMaxFiles)
-    {
-        delete[] m_fileHistory[m_fileMaxFiles-1];
-        m_fileHistory[m_fileMaxFiles-1] = (wxChar *) NULL;
-    }
-    if (m_fileHistoryN < m_fileMaxFiles)
-    {
-        wxNode* node = m_fileMenus.First();
-        while (node)
-        {
-            wxMenu* menu = (wxMenu*) node->Data();
-            if (m_fileHistoryN == 0)
-                menu->AppendSeparator();
-            menu->Append(wxID_FILE1+m_fileHistoryN, _("[EMPTY]"));
-            node = node->Next();
-        }
-        m_fileHistoryN ++;
+        stream.Write(buf, nRead);
+        if ( !stream )
+            return false;
     }
-    // Shuffle filenames down
-    for (i = (m_fileHistoryN-1); i > 0; i--)
-    {
-        m_fileHistory[i] = m_fileHistory[i-1];
-    }
-    m_fileHistory[0] = copystring(file);
+    while ( !file.Eof() );
 
-    for (i = 0; i < m_fileHistoryN; i++)
-        if (m_fileHistory[i])
-        {
-            wxString buf;
-            buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]);
-            wxNode* node = m_fileMenus.First();
-            while (node)
-            {
-                wxMenu* menu = (wxMenu*) node->Data();
-                menu->SetLabel(wxID_FILE1+i, buf);
-                node = node->Next();
-            }
-        }
+    return true;
 }
 
-void wxFileHistory::RemoveFileFromHistory(int i)
+bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename)
 {
-    wxCHECK_RET( i < m_fileHistoryN,
-                 wxT("invalid index in wxFileHistory::RemoveFileFromHistory") );
+#if wxUSE_FFILE
+    wxFFile file(filename, wxT("wb"));
+#elif wxUSE_FILE
+    wxFile file(filename, wxFile::write);
+#endif
+    if ( !file.IsOpened() )
+        return false;
 
-    wxNode* node = m_fileMenus.First();
-    while ( node )
+    char buf[4096];
+    for ( ;; )
     {
-        wxMenu* menu = (wxMenu*) node->Data();
-
-        // delete the element from the array (could use memmove() too...)
-        delete [] m_fileHistory[i];
+        stream.Read(buf, WXSIZEOF(buf));
 
-        int j;
-        for ( j = i; j < m_fileHistoryN - 1; j++ )
-        {
-            m_fileHistory[j] = m_fileHistory[j + 1];
-        }
-
-        // shuffle filenames up
-        wxString buf;
-        for ( j = i; j < m_fileHistoryN - 1; j++ )
+        const size_t nRead = stream.LastRead();
+        if ( !nRead )
         {
-            buf.Printf(s_MRUEntryFormat, j + 1, m_fileHistory[j]);
-            menu->SetLabel(wxID_FILE1 + j, buf);
-        }
-
-        node = node->Next();
-
-        // delete the last menu item which is unused now
-        menu->Delete(wxID_FILE1 + m_fileHistoryN - 1);
-
-        // delete the last separator too if no more files are left
-        if ( m_fileHistoryN == 1 )
-        {
-            wxMenuItemList::Node *node = menu->GetMenuItems().GetLast();
-            if ( node )
-            {
-                wxMenuItem *menuItem = node->GetData();
-                if ( menuItem->IsSeparator() )
-                {
-                    menu->Delete(menuItem);
-                }
-                //else: should we search backwards for the last separator?
-            }
-            //else: menu is empty somehow
-        }
-    }
-
-    m_fileHistoryN--;
-}
+            if ( stream.Eof() )
+                break;
 
-wxString wxFileHistory::GetHistoryFile(int i) const
-{
-    wxString s;
-    if ( i < m_fileHistoryN )
-    {
-        s = m_fileHistory[i];
-    }
-    else
-    {
-        wxFAIL_MSG( wxT("bad index in wxFileHistory::GetHistoryFile") );
-    }
-
-    return s;
-}
-
-void wxFileHistory::UseMenu(wxMenu *menu)
-{
-    if (!m_fileMenus.Member(menu))
-        m_fileMenus.Append(menu);
-}
-
-void wxFileHistory::RemoveMenu(wxMenu *menu)
-{
-    m_fileMenus.DeleteObject(menu);
-}
-
-#if wxUSE_CONFIG
-void wxFileHistory::Load(wxConfigBase& config)
-{
-    m_fileHistoryN = 0;
-    wxString buf;
-    buf.Printf(wxT("file%d"), m_fileHistoryN+1);
-    wxString historyFile;
-    while ((m_fileHistoryN <= m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != wxT("")))
-    {
-        m_fileHistory[m_fileHistoryN] = copystring((const wxChar*) historyFile);
-        m_fileHistoryN ++;
-        buf.Printf(wxT("file%d"), m_fileHistoryN+1);
-        historyFile = wxT("");
-    }
-    AddFilesToMenu();
-}
-
-void wxFileHistory::Save(wxConfigBase& config)
-{
-    int i;
-    for (i = 0; i < m_fileHistoryN; i++)
-    {
-        wxString buf;
-        buf.Printf(wxT("file%d"), i+1);
-        config.Write(buf, wxString(m_fileHistory[i]));
-    }
-}
-#endif // wxUSE_CONFIG
-
-void wxFileHistory::AddFilesToMenu()
-{
-    if (m_fileHistoryN > 0)
-    {
-        wxNode* node = m_fileMenus.First();
-        while (node)
-        {
-            wxMenu* menu = (wxMenu*) node->Data();
-            menu->AppendSeparator();
-            int i;
-            for (i = 0; i < m_fileHistoryN; i++)
-            {
-                if (m_fileHistory[i])
-                {
-                    wxString buf;
-                    buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]);
-                    menu->Append(wxID_FILE1+i, buf);
-                }
-            }
-            node = node->Next();
+            return false;
         }
-    }
-}
 
-void wxFileHistory::AddFilesToMenu(wxMenu* menu)
-{
-    if (m_fileHistoryN > 0)
-    {
-        menu->AppendSeparator();
-        int i;
-        for (i = 0; i < m_fileHistoryN; i++)
-        {
-            if (m_fileHistory[i])
-            {
-                wxString buf;
-                buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]);
-                menu->Append(wxID_FILE1+i, buf);
-            }
-        }
+        if ( !file.Write(buf, nRead) )
+            return false;
     }
-}
-
-// ----------------------------------------------------------------------------
-// Permits compatibility with existing file formats and functions that
-// manipulate files directly
-// ----------------------------------------------------------------------------
 
-#if wxUSE_STD_IOSTREAM
-bool wxTransferFileToStream(const wxString& filename, ostream& stream)
-{
-    FILE *fd1;
-    int ch;
-
-    if ((fd1 = fopen (filename.fn_str(), "rb")) == NULL)
-        return FALSE;
-
-    while ((ch = getc (fd1)) != EOF)
-        stream << (unsigned char)ch;
-
-    fclose (fd1);
-    return TRUE;
+    return true;
 }
 
-bool wxTransferStreamToFile(istream& stream, const wxString& filename)
-{
-    FILE *fd1;
-    int ch;
-
-    if ((fd1 = fopen (filename.fn_str(), "wb")) == NULL)
-    {
-        return FALSE;
-    }
-
-    while (!stream.eof())
-    {
-        ch = stream.get();
-        if (!stream.eof())
-            putc (ch, fd1);
-    }
-    fclose (fd1);
-    return TRUE;
-}
-#endif
+#endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM
 
 #endif // wxUSE_DOC_VIEW_ARCHITECTURE
-