Include more information in assert in wxNumberFormatter.

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 2ab0f4cd24503c7ea0344a52205b6d84f466d6c2..86d1783490db08f66d384bde644ce2ca7aae9da0 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -1,1952 +1,2171 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        docview.cpp
+// Name:        src/common/docview.cpp

 // Purpose:     Document/view classes
 // Author:      Julian Smart
 // Purpose:     Document/view classes
 // Author:      Julian Smart

-// Modified by:
+// Modified by: Vadim Zeitlin

 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "docview.h"
-#endif
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/defs.h"
+    #pragma hdrstop

 #endif
 
 #if wxUSE_DOC_VIEW_ARCHITECTURE
 
 #endif
 
 #if wxUSE_DOC_VIEW_ARCHITECTURE
 

+#include "wx/docview.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#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>
+    #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/filedlg.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/msgdlg.h"
+    #include "wx/mdi.h"
+    #include "wx/choicdlg.h"

 #endif
 
 #endif
 

-#ifdef __WXGTK__
-#include "wx/mdi.h"
+#if wxUSE_PRINTING_ARCHITECTURE
+    #include "wx/prntbase.h"
+    #include "wx/printdlg.h"

 #endif
 
 #endif
 

-#include "wx/msgdlg.h"
-#include "wx/choicdlg.h"
-#include "wx/docview.h"
-#include "wx/printdlg.h"
-#include "wx/generic/prntdlgg.h"
-#include "wx/generic/printps.h"

 #include "wx/confbase.h"
 #include "wx/confbase.h"

-
-#include <stdio.h>
-#include <string.h>
-
-#if wxUSE_IOSTREAMH
-#include <iostream.h>
+#include "wx/filename.h"
+#include "wx/file.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"
+    #include "wx/beforestd.h"
+    #if wxUSE_IOSTREAMH
+        #include <fstream.h>
+    #else
+        #include <fstream>
+    #endif
+    #include "wx/afterstd.h"

 #else
 #else

-#include <iostream>
+    #include "wx/wfstream.h"

 #endif
 
 #endif
 

-#include "fstream.h"
+typedef wxVector<wxDocTemplate *> wxDocTemplates;
+
+// ----------------------------------------------------------------------------
+// wxWidgets macros
+// ----------------------------------------------------------------------------

 
 

-#if !USE_SHARED_LIBRARY

 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)
 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
 #if wxUSE_PRINTING_ARCHITECTURE

-IMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout)
-#endif
-IMPLEMENT_CLASS(wxCommand, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxCommandProcessor, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
-// IMPLEMENT_DYNAMIC_CLASS(wxPrintInfo, wxObject)
+    IMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout)

 #endif
 
 #endif
 

-/*
- * Definition of wxDocument
- */
+// ============================================================================
+// implementation
+// ============================================================================

 
 

-wxDocument::wxDocument(wxDocument *parent)
+// ----------------------------------------------------------------------------
+// private helpers
+// ----------------------------------------------------------------------------
+
+namespace

 {
 {

-  m_documentModified=FALSE;
-  m_documentFile="";
-  m_documentTitle="";
-  m_documentParent=parent;
-  m_documentTemplate = (wxDocTemplate *) NULL;
-  m_documentTypeName = "";
-  m_savedYet = FALSE;
+
+wxString FindExtension(const wxString& path)
+{
+    wxString ext;
+    wxFileName::SplitPath(path, NULL, NULL, &ext);
+
+    // VZ: extensions are considered not case sensitive - is this really a good
+    //     idea?
+    return ext.MakeLower();

 }
 
 }
 

-bool wxDocument::DeleteContents(void)
+} // anonymous namespace
+
+// ----------------------------------------------------------------------------
+// Definition of wxDocument
+// ----------------------------------------------------------------------------
+
+wxDocument::wxDocument(wxDocument *parent)

 {
 {

-  return TRUE;
+    m_documentModified = false;
+    m_documentParent = parent;
+    m_documentTemplate = NULL;
+    m_commandProcessor = NULL;
+    m_savedYet = false;

 }
 
 }
 

-wxDocument::~wxDocument(void)
+bool wxDocument::DeleteContents()

 {
 {

-  DeleteContents();
+    return true;
+}

 
 

-  if (m_commandProcessor)
+wxDocument::~wxDocument()
+{

     delete m_commandProcessor;
 
     delete m_commandProcessor;
 

-  GetDocumentManager()->RemoveDocument(this);
+    if (GetDocumentManager())
+        GetDocumentManager()->RemoveDocument(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, we've called destructors higher up.
-//  DeleteAllViews();
+    // 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,
+    // we've called destructors higher up.
+    //DeleteAllViews();

 }
 }

-       
-bool wxDocument::Close(void)
+
+bool wxDocument::Close()

 {
 {

-  if (OnSaveModified())
+    if ( !OnSaveModified() )
+        return false;
+

     return OnCloseDocument();
     return OnCloseDocument();

-  else
-    return FALSE;

 }
 }

-       
-bool wxDocument::OnCloseDocument(void)
+
+bool wxDocument::OnCloseDocument()
+{
+    // Tell all views that we're about to close
+    NotifyClosing();
+    DeleteContents();
+    Modify(false);
+    return true;
+}
+
+// Note that this implicitly deletes the document when the last view is
+// deleted.
+bool wxDocument::DeleteAllViews()

 {
 {

-  DeleteContents();
-  Modify(FALSE);
-  return TRUE;
+    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 *)*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();
+
+            bool isLastOne = m_documentViews.size() == 1;
+
+            // 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;

 }
 
 }
 

-// Note that this implicitly deletes the document when
-// the last view is deleted.
-bool wxDocument::DeleteAllViews(void)
+wxView *wxDocument::GetFirstView() const

 {
 {

-  wxNode *node = m_documentViews.First();
-  while (node)
-  {
-    wxView *view = (wxView *)node->Data();
-    if (!view->Close())
-      return FALSE;
+    if ( m_documentViews.empty() )
+        return NULL;

 
 

-    wxNode *next = node->Next();
-      
-    delete view; // Deletes node implicitly
-    node = next;
-  }
-  return TRUE;
+    return static_cast<wxView *>(m_documentViews.GetFirst()->GetData());

 }
 
 }
 

-wxView *wxDocument::GetFirstView(void) const
+void wxDocument::Modify(bool mod)

 {
 {

-  if (m_documentViews.Number() == 0)
-    return (wxView *) NULL;
-  return (wxView *)m_documentViews.First()->Data();
+    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(void) const
+wxDocManager *wxDocument::GetDocumentManager() const

 {
 {

-  return m_documentTemplate->GetDocumentManager();
+    return m_documentTemplate ? m_documentTemplate->GetDocumentManager() : NULL;

 }
 
 }
 

-bool wxDocument::OnNewDocument(void)
+bool wxDocument::OnNewDocument()

 {
 {

-  if (!OnSaveModified())
-    return FALSE;
-    
-  if (OnCloseDocument()==FALSE) return FALSE;
-  DeleteContents();
-  Modify(FALSE);
-  SetDocumentSaved(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
+
+    SetDocumentSaved(false);

 
 

-  wxString name;
-  GetDocumentManager()->MakeDefaultName(name);
-  SetTitle(name);
-  SetFilename(name, TRUE);
+    const wxString name = GetDocumentManager()->MakeNewDocumentName();
+    SetTitle(name);
+    SetFilename(name, true);

 
 

-  return TRUE;
+    return true;

 }
 
 }
 

-bool wxDocument::Save(void)
+bool wxDocument::Save()

 {
 {

-  bool ret = FALSE;
+    if ( AlreadySaved() )
+        return true;

 
 

-  if (!IsModified()) return TRUE;
-  if (m_documentFile == "" || !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(void)
+
+bool wxDocument::SaveAs()

 {
 {

-  wxDocTemplate *docTemplate = GetDocumentTemplate();
-  if (!docTemplate)
-    return FALSE;
-  
-  char *tmp = wxFileSelector(_("Save as"), docTemplate->GetDirectory(), GetFilename(),
-    docTemplate->GetDefaultExtension(), docTemplate->GetFileFilter(),
-    wxSAVE|wxOVERWRITE_PROMPT, GetDocumentWindow());
-    
-  if (!tmp)
-    return FALSE;
-  else
-  {
-    wxString fileName(tmp);
-    wxString path("");
-    wxString name("");
-    wxString ext("");
-    wxSplitPath(fileName, & path, & name, & ext);
+    wxDocTemplate *docTemplate = GetDocumentTemplate();
+    if (!docTemplate)
+        return false;
+
+#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('|');
+
+                filter << t->GetDescription()
+                       << wxT(" (") << t->GetFileFilter() << wxT(") |")
+                       << t->GetFileFilter();
+            }
+
+            node = node->GetNext();
+        }
+    }
+#else
+    wxString filter = docTemplate->GetFileFilter() ;
+#endif

 
 

-    if (ext.IsEmpty() || ext == "")
+    wxString defaultDir = docTemplate->GetDirectory();
+    if ( defaultDir.empty() )

     {
     {

-        fileName += ".";
-        fileName += docTemplate->GetDefaultExtension();
+        defaultDir = wxPathOnly(GetFilename());
+        if ( defaultDir.empty() )
+            defaultDir = GetDocumentManager()->GetLastDirectory();

     }
 
     }
 

-    SetFilename(fileName);
+    wxString fileName = wxFileSelector(_("Save As"),
+            defaultDir,
+            wxFileNameFromPath(GetFilename()),
+            docTemplate->GetDefaultExtension(),
+            filter,
+            wxFD_SAVE | wxFD_OVERWRITE_PROMPT,
+            GetDocumentWindow());
+
+    if (fileName.empty())
+        return false; // cancelled by user
+
+    // Files that were not saved correctly are not added to the FileHistory.
+    if (!OnSaveDocument(fileName))
+        return false;
+

     SetTitle(wxFileNameFromPath(fileName));
     SetTitle(wxFileNameFromPath(fileName));

-    
-    GetDocumentManager()->AddFileToHistory(fileName);
+    SetFilename(fileName, true);    // will call OnChangeFileName automatically

 
 

-    // Notify the views that the filename has changed
-    wxNode *node = m_documentViews.First();
-    while (node)
+    // 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);

     }
     }

-  }
-  return OnSaveDocument(m_documentFile);
+    //else: the user will probably not be able to open the file again, so we
+    //      could warn about the wrong file-extension here
+
+    return true;

 }
 }

-       
+

 bool wxDocument::OnSaveDocument(const wxString& file)
 {
 bool wxDocument::OnSaveDocument(const wxString& file)
 {

-  if (file == "")
-    return FALSE;
-
-  wxString msgTitle;
-  if (wxTheApp->GetAppName() != "")
-    msgTitle = wxTheApp->GetAppName();
-  else
-    msgTitle = wxString(_("File error"));
-
-  ofstream store(file);
-  if (store.fail() || store.bad())
-  {
-    (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,
-      GetDocumentWindow());
-    // Saving error
-    return FALSE;
-  }
-  if (SaveObject(store)==FALSE)
-  {
-    (void)wxMessageBox(_("Sorry, could not save this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
-      GetDocumentWindow());
-    // Saving error
-    return FALSE;
-  }
-  Modify(FALSE);
-  SetFilename(file);
-  return TRUE;
-}
-       
+    if ( !file )
+        return false;
+
+    if ( !DoSaveDocument(file) )
+        return false;
+
+    Modify(false);
+    SetFilename(file);
+    SetDocumentSaved(true);
+#if defined( __WXOSX_MAC__ ) && wxOSX_USE_CARBON
+    wxFileName fn(file) ;
+    fn.MacSetDefaultTypeAndCreator() ;
+#endif
+    return true;
+}
+

 bool wxDocument::OnOpenDocument(const wxString& file)
 {
 bool wxDocument::OnOpenDocument(const wxString& file)
 {

-  if (!OnSaveModified())
-    return FALSE;
+    // notice that there is no need to check the modified flag here for the
+    // reasons explained in OnNewDocument()
+
+    if ( !DoOpenDocument(file) )
+        return false;

 
 

-  wxString msgTitle;
-  if (wxTheApp->GetAppName() != "")
-    msgTitle = wxTheApp->GetAppName();
-  else
-    msgTitle = wxString(_("File error"));
+    SetFilename(file, true);

 
 

-  ifstream store(file);
-  if (store.fail() || store.bad())
-  {
-    (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
-     GetDocumentWindow());
-    return FALSE;
-  }
-  if (LoadObject(store)==FALSE)
-  {
-    (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
-      GetDocumentWindow());
-    return FALSE;
-  }
-  SetFilename(file, TRUE);
-  Modify(FALSE);
-  m_savedYet = TRUE;
+    // stretching the logic a little this does make sense because the document
+    // had been saved into the file we just loaded it from, it just could have
+    // happened during a previous program execution, it's just that the name of
+    // this method is a bit unfortunate, it should probably have been called
+    // HasAssociatedFileName()
+    SetDocumentSaved(true);

 
 

-  UpdateAllViews();
-  
-  return TRUE;
+    UpdateAllViews();
+
+    return true;

 }
 }

-       
-istream& wxDocument::LoadObject(istream& stream)
-{
-//  wxObject::LoadObject(stream);

 
 

-  return stream;
+#if wxUSE_STD_IOSTREAM
+wxSTD istream& wxDocument::LoadObject(wxSTD istream& stream)
+#else
+wxInputStream& wxDocument::LoadObject(wxInputStream& stream)
+#endif
+{
+    return stream;

 }
 
 }
 

-ostream& wxDocument::SaveObject(ostream& stream)
+#if wxUSE_STD_IOSTREAM
+wxSTD ostream& wxDocument::SaveObject(wxSTD ostream& stream)
+#else
+wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream)
+#endif

 {
 {

-//  wxObject::SaveObject(stream);
-  
-  return stream;
+    return stream;

 }
 
 }
 

-bool wxDocument::Revert(void)
+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
 }
 
 
 // Get title, or filename if no title, else unnamed

+#if WXWIN_COMPATIBILITY_2_8

 bool wxDocument::GetPrintableName(wxString& buf) const
 {
 bool wxDocument::GetPrintableName(wxString& buf) const
 {

-  if (m_documentTitle != "")
-  {
-    buf = m_documentTitle;
-    return TRUE;
-  }
-  else if (m_documentFile != "")
-  {
-    buf = wxFileNameFromPath(m_documentFile);
-    return TRUE;
-  }
-  else
-  {
-    buf = _("unnamed");
-    return TRUE;
-  }
+    // this function can not 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

 
 

-wxWindow *wxDocument::GetDocumentWindow(void) const
+wxString wxDocument::GetUserReadableName() const

 {
 {

-  wxView *view = GetFirstView();
-  if (view)
-    return view->GetFrame();
-  else
-    return wxTheApp->GetTopWindow();
+#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();

 }
 
 }
 

-wxCommandProcessor *wxDocument::OnCreateCommandProcessor(void)
+wxString wxDocument::DoGetUserReadableName() const

 {
 {

-  return new wxCommandProcessor;
+    if ( !m_documentTitle.empty() )
+        return m_documentTitle;
+
+    if ( !m_documentFile.empty() )
+        return wxFileNameFromPath(m_documentFile);
+
+    return _("unnamed");

 }
 
 }
 

-// TRUE if safe to close
-bool wxDocument::OnSaveModified(void)
+wxWindow *wxDocument::GetDocumentWindow() const

 {
 {

-  if (IsModified())
-  {
-    char buf[400];
-    wxString title;
-    GetPrintableName(title);
+    wxView * const view = GetFirstView();

 
 

-    wxString msgTitle;
-    if (wxTheApp->GetAppName() != "")
-      msgTitle = wxTheApp->GetAppName();
-    else
-      msgTitle = wxString(_("Warning"));
+    return view ? view->GetFrame() : wxTheApp->GetTopWindow();
+}
+
+wxCommandProcessor *wxDocument::OnCreateCommandProcessor()
+{
+    return new wxCommandProcessor;
+}

 
 

-    sprintf(buf, _("Do you want to save changes to document %s?"), (const char *)title);
-    int res = wxMessageBox(buf, msgTitle, wxYES_NO|wxCANCEL|wxICON_QUESTION,
-      GetDocumentWindow());
-    if (res == wxNO)
+// true if safe to close
+bool wxDocument::OnSaveModified()
+{
+    if ( IsModified() )

     {
     {

-      Modify(FALSE);
-      return TRUE;
+        switch ( wxMessageBox
+                 (
+                    wxString::Format
+                    (
+                     _("Do you want to save changes to %s?"),
+                     GetUserReadableName()
+                    ),
+                    wxTheApp->GetAppDisplayName(),
+                    wxYES_NO | wxCANCEL | wxICON_QUESTION | wxCENTRE
+                 ) )
+        {
+            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))
 {
 }
 
 bool wxDocument::Draw(wxDC& WXUNUSED(context))
 {

-  return TRUE;
+    return true;

 }
 
 bool wxDocument::AddView(wxView *view)
 {
 }
 
 bool wxDocument::AddView(wxView *view)
 {

-  if (!m_documentViews.Member(view))
-  {
-    m_documentViews.Append(view);
-    OnChangedViewList();
-  }
-  return TRUE;
+    if ( !m_documentViews.Member(view) )
+    {
+        m_documentViews.Append(view);
+        OnChangedViewList();
+    }
+    return true;

 }
 
 bool wxDocument::RemoveView(wxView *view)
 {
 }
 
 bool wxDocument::RemoveView(wxView *view)
 {

-  (void)m_documentViews.DeleteObject(view);
-  OnChangedViewList();
-  return TRUE;
+    (void)m_documentViews.DeleteObject(view);
+    OnChangedViewList();
+    return true;

 }
 
 bool wxDocument::OnCreate(const wxString& WXUNUSED(path), long flags)
 {
 }
 
 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.
 // The default implementation deletes the document if
 // there are no more views.
 }
 
 // Called after a view is added or removed.
 // The default implementation deletes the document if
 // there are no more views.

-void wxDocument::OnChangedViewList(void)
+void wxDocument::OnChangedViewList()
+{
+    if ( m_documentViews.empty() && OnSaveModified() )
+        delete this;
+}
+
+void wxDocument::UpdateAllViews(wxView *sender, wxObject *hint)

 {
 {

-  if (m_documentViews.Number() == 0)
-  {
-    if (OnSaveModified())
+    wxList::compatibility_iterator node = m_documentViews.GetFirst();
+    while (node)

     {
     {

-      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();
-  while (node)
-  {
-    wxView *view = (wxView *)node->Data();
-    view->OnUpdate(sender, hint);
-    node = node->Next();
-  }
+    wxList::compatibility_iterator node = m_documentViews.GetFirst();
+    while (node)
+    {
+        wxView *view = (wxView *)node->GetData();
+        view->OnClosingDocument();
+        node = node->GetNext();
+    }

 }
 
 void wxDocument::SetFilename(const wxString& filename, bool notifyViews)
 {
 }
 
 void wxDocument::SetFilename(const wxString& filename, bool notifyViews)
 {

-  m_documentFile = filename;
-  if ( notifyViews )
-  {
-    // Notify the views that the filename has changed
-    wxNode *node = m_documentViews.First();
-    while (node)
+    m_documentFile = filename;
+    OnChangeFilename(notifyViews);
+}
+
+void wxDocument::OnChangeFilename(bool notifyViews)
+{
+    if ( notifyViews )
+    {
+        // Notify the views that the filename has changed
+        wxList::compatibility_iterator node = m_documentViews.GetFirst();
+        while (node)
+        {
+            wxView *view = (wxView *)node->GetData();
+            view->OnChangeFilename();
+            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

     {
     {

-      wxView *view = (wxView *)node->Data();
-      view->OnChangeFilename();
-      node = node->Next();
+        wxLogError(_("Failed to read document from the file \"%s\"."), file);
+        return false;

     }
     }

-  }
+
+    return true;

 }
 
 
 }
 
 

-/*
- * Document view
- */
- 
-wxView::wxView(wxDocument *doc)
+// ----------------------------------------------------------------------------
+// Document view
+// ----------------------------------------------------------------------------
+
+wxView::wxView()
+{
+    m_viewDocument = NULL;
+
+    m_viewFrame = NULL;
+
+    m_docChildFrame = NULL;
+}
+
+wxView::~wxView()

 {
 {

-  SetDocument(doc);
-  
-  m_viewTypeName = "";
-  m_viewFrame = (wxFrame *) NULL;
+    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);

 }
 
 }
 

-wxView::~wxView(void)
+void wxView::SetDocChildFrame(wxDocChildFrameAnyBase *docChildFrame)

 {
 {

-  GetDocumentManager()->ActivateView(this, FALSE, TRUE);
-  m_viewDocument->RemoveView(this);
+    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))

 {
 }
 
 void wxView::OnPrint(wxDC *dc, wxObject *WXUNUSED(info))
 {
 {
 }
 
 void wxView::OnPrint(wxDC *dc, wxObject *WXUNUSED(info))
 {

-  OnDraw(dc);
+    OnDraw(dc);

 }
 
 void wxView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
 {
 }
 
 }
 
 void wxView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
 {
 }
 

-void wxView::OnChangeFilename(void)
+void wxView::OnChangeFilename()

 {
 {

-  if (GetFrame() && GetDocument())
-  {
-    wxString name;
-    GetDocument()->GetPrintableName(name);
+    // 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;

 
 

-    GetFrame()->SetTitle(name);
-  }
+    wxDocument *doc = GetDocument();
+    if (!doc) return;
+
+    wxString label = doc->GetUserReadableName();
+    if (doc->IsModified())
+    {
+       label += "*";
+    }
+    win->SetLabel(label);

 }
 
 void wxView::SetDocument(wxDocument *doc)
 {
 }
 
 void wxView::SetDocument(wxDocument *doc)
 {

-  m_viewDocument = doc;
-  if (doc)
-    doc->AddView(this);
+    m_viewDocument = doc;
+    if (doc)
+        doc->AddView(this);

 }
 
 bool wxView::Close(bool deleteWindow)
 {
 }
 
 bool wxView::Close(bool deleteWindow)
 {

-  if (OnClose(deleteWindow))
-    return TRUE;
-  else
-    return FALSE;
+    return OnClose(deleteWindow);

 }
 
 void wxView::Activate(bool activate)
 {
 }
 
 void wxView::Activate(bool activate)
 {

-  if (GetDocumentManager())
-  {
-    OnActivateView(activate, this, GetDocumentManager()->GetCurrentView());
-    GetDocumentManager()->ActivateView(this, activate);
-  }
+    if (GetDocument() && GetDocumentManager())
+    {
+        OnActivateView(activate, this, GetDocumentManager()->GetCurrentView());
+        GetDocumentManager()->ActivateView(this, activate);
+    }

 }
 
 bool wxView::OnClose(bool WXUNUSED(deleteWindow))
 {
 }
 
 bool wxView::OnClose(bool WXUNUSED(deleteWindow))
 {

-  return GetDocument() ? GetDocument()->Close() : TRUE;
+    return GetDocument() ? GetDocument()->Close() : true;

 }
 
 #if wxUSE_PRINTING_ARCHITECTURE
 }
 
 #if wxUSE_PRINTING_ARCHITECTURE

-wxPrintout *wxView::OnCreatePrintout(void)
+wxPrintout *wxView::OnCreatePrintout()

 {
 {

-  return new wxDocPrintout(this);
+    return new wxDocPrintout(this);

 }
 }

-#endif
+#endif // wxUSE_PRINTING_ARCHITECTURE

 
 

+// ----------------------------------------------------------------------------
+// wxDocTemplate
+// ----------------------------------------------------------------------------

 
 

-/*
- * wxDocTemplate
- */
-
-wxDocTemplate::wxDocTemplate(wxDocManager *manager, const wxString& descr,
-  const wxString& filter, const wxString& dir, const wxString& ext,
-  const wxString& docTypeName, const wxString& viewTypeName,
-  wxClassInfo *docClassInfo, wxClassInfo *viewClassInfo, long flags)
+wxDocTemplate::wxDocTemplate(wxDocManager *manager,
+                             const wxString& descr,
+                             const wxString& filter,
+                             const wxString& dir,
+                             const wxString& ext,
+                             const wxString& docTypeName,
+                             const wxString& viewTypeName,
+                             wxClassInfo *docClassInfo,
+                             wxClassInfo *viewClassInfo,
+                             long flags)

 {
 {

-  m_documentManager = manager;
-  m_flags = flags;
-  m_description = descr;
-  m_directory = dir;
-  m_defaultExt = ext;
-  m_fileFilter = filter;
-  m_flags = flags;
-  m_docTypeName = docTypeName;
-  m_viewTypeName = viewTypeName;
-  m_documentManager->AssociateTemplate(this);
+    m_documentManager = manager;
+    m_description = descr;
+    m_directory = dir;
+    m_defaultExt = ext;
+    m_fileFilter = filter;
+    m_flags = flags;
+    m_docTypeName = docTypeName;
+    m_viewTypeName = viewTypeName;
+    m_documentManager->AssociateTemplate(this);

 
 

-  m_docClassInfo = docClassInfo;
-  m_viewClassInfo = viewClassInfo;
+    m_docClassInfo = docClassInfo;
+    m_viewClassInfo = viewClassInfo;

 }
 
 }
 

-wxDocTemplate::~wxDocTemplate(void)
+wxDocTemplate::~wxDocTemplate()

 {
 {

-  m_documentManager->DisassociateTemplate(this);
+    m_documentManager->DisassociateTemplate(this);

 }
 }

-  
-// Tries to dynamically construct an object of the right
-// class.
+
+// Tries to dynamically construct an object of the right class.

 wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags)
 {
 wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags)
 {

-  if (!m_docClassInfo)
-    return (wxDocument *) NULL;
-  wxDocument *doc = (wxDocument *)m_docClassInfo->CreateObject();
-  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;
-  }
+    // 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 true;
+
+    if (GetDocumentManager()->GetDocuments().Member(doc))
+        doc->DeleteAllViews();
+    return false;

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

-  if (!m_viewClassInfo)
-    return (wxView *) NULL;
-  wxView *view = (wxView *)m_viewClassInfo->CreateObject();
-  view->SetDocument(doc);
-  if (view->OnCreate(doc, flags))
-  {
-    return view;
-  }
-  else
-  {
-    delete view;
-    return (wxView *) NULL;
-  }
+    wxScopedPtr<wxView> view(DoCreateView());
+    if ( !view )
+        return NULL;
+
+    view->SetDocument(doc);
+    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
+// ----------------------------------------------------------------------------
+

 BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
     EVT_MENU(wxID_OPEN, wxDocManager::OnFileOpen)
     EVT_MENU(wxID_CLOSE, wxDocManager::OnFileClose)
 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)
     EVT_MENU(wxID_SAVEAS, wxDocManager::OnFileSaveAs)
     EVT_MENU(wxID_UNDO, wxDocManager::OnUndo)
     EVT_MENU(wxID_REDO, wxDocManager::OnRedo)
     EVT_MENU(wxID_REVERT, wxDocManager::OnFileRevert)
     EVT_MENU(wxID_NEW, wxDocManager::OnFileNew)
     EVT_MENU(wxID_SAVE, wxDocManager::OnFileSave)
     EVT_MENU(wxID_SAVEAS, wxDocManager::OnFileSaveAs)
     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::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)
+    EVT_UPDATE_UI(wxID_SAVEAS, wxDocManager::OnUpdateDisableIfNoDoc)
+    EVT_UPDATE_UI(wxID_UNDO, wxDocManager::OnUpdateUndo)
+    EVT_UPDATE_UI(wxID_REDO, wxDocManager::OnUpdateRedo)
+
+#if wxUSE_PRINTING_ARCHITECTURE

     EVT_MENU(wxID_PRINT, wxDocManager::OnPrint)
     EVT_MENU(wxID_PRINT, wxDocManager::OnPrint)

-    EVT_MENU(wxID_PRINT_SETUP, wxDocManager::OnPrintSetup)

     EVT_MENU(wxID_PREVIEW, wxDocManager::OnPreview)
     EVT_MENU(wxID_PREVIEW, wxDocManager::OnPreview)

+    EVT_MENU(wxID_PRINT_SETUP, wxDocManager::OnPageSetup)
+
+    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()
 
 END_EVENT_TABLE()
 

-wxDocManager::wxDocManager(long flags, bool initialize)
+wxDocManager* wxDocManager::sm_docManager = NULL;
+
+wxDocManager::wxDocManager(long WXUNUSED(flags), bool initialize)

 {
 {

-  m_defaultDocumentNameCounter = 1;
-  m_flags = flags;
-  m_currentView = (wxView *) NULL;
-  m_maxDocsOpen = 10000;
-  m_fileHistory = (wxFileHistory *) NULL;
-  if (initialize)
-    Initialize();
+    sm_docManager = this;
+
+    m_defaultDocumentNameCounter = 1;
+    m_currentView = NULL;
+    m_maxDocsOpen = INT_MAX;
+    m_fileHistory = NULL;
+    if ( initialize )
+        Initialize();

 }
 
 }
 

-wxDocManager::~wxDocManager(void)
+wxDocManager::~wxDocManager()

 {
 {

-  Clear();
-  if (m_fileHistory)
+    Clear();

     delete m_fileHistory;
     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 removed (deleted)
+    // Implicitly deletes the document when
+    // the last view is deleted

     doc->DeleteAllViews();
 
     doc->DeleteAllViews();
 

-    // Check document is deleted
+    // Check we're really deleted

     if (m_docs.Member(doc))
     if (m_docs.Member(doc))

-      delete doc;
-
-    // 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 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();
+
+        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;
+    }
+    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;
         delete templ;
         node = next;

-  }
-  return TRUE;
+    }
+    return true;
+}
+
+bool wxDocManager::Initialize()
+{
+    m_fileHistory = OnCreateFileHistory();
+    return true;

 }
 
 }
 

-bool wxDocManager::Initialize(void)
+wxString wxDocManager::GetLastDirectory() const

 {
 {

-  m_fileHistory = OnCreateFileHistory();
-  return TRUE;
+    // 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(void)
+wxFileHistory *wxDocManager::OnCreateFileHistory()

 {
 {

-  return new wxFileHistory;
+    return new wxFileHistory;

 }
 
 void wxDocManager::OnFileClose(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void wxDocManager::OnFileClose(wxCommandEvent& WXUNUSED(event))
 {

-  wxDocument *doc = GetCurrentDocument();
-  if (!doc)
-    return;
-  if (doc->Close())
-  {
-    doc->DeleteAllViews();
-    if (m_docs.Member(doc))
-      delete doc;
-  }
+    wxDocument *doc = GetCurrentDocument();
+    if (doc)
+        CloseDocument(doc);
+}
+
+void wxDocManager::OnFileCloseAll(wxCommandEvent& WXUNUSED(event))
+{
+    CloseDocuments(false);

 }
 
 void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event))
 {

-  CreateDocument(wxString(""), wxDOC_NEW);
+    CreateNewDocument();

 }
 
 void wxDocManager::OnFileOpen(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void wxDocManager::OnFileOpen(wxCommandEvent& WXUNUSED(event))
 {

-  CreateDocument(wxString(""), 0);
+    if ( !CreateDocument("") )
+    {
+        OnOpenFileFailure();
+    }

 }
 
 void wxDocManager::OnFileRevert(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void wxDocManager::OnFileRevert(wxCommandEvent& WXUNUSED(event))
 {

-  wxDocument *doc = GetCurrentDocument();
-  if (!doc)
-    return;
-  doc->Revert();
+    wxDocument *doc = GetCurrentDocument();
+    if (!doc)
+        return;
+    doc->Revert();

 }
 
 void wxDocManager::OnFileSave(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void wxDocManager::OnFileSave(wxCommandEvent& WXUNUSED(event))
 {

-  wxDocument *doc = GetCurrentDocument();
-  if (!doc)
-    return;
-  doc->Save();
+    wxDocument *doc = GetCurrentDocument();
+    if (!doc)
+        return;
+    doc->Save();

 }
 
 void wxDocManager::OnFileSaveAs(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void wxDocManager::OnFileSaveAs(wxCommandEvent& WXUNUSED(event))
 {

-  wxDocument *doc = GetCurrentDocument();
-  if (!doc)
-    return;
-  doc->SaveAs();
+    wxDocument *doc = GetCurrentDocument();
+    if (!doc)
+        return;
+    doc->SaveAs();

 }
 
 }
 

-void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
+void wxDocManager::OnMRUFile(wxCommandEvent& event)

 {
 {

-  wxView *view = GetCurrentView();
-  if (!view)
-    return;
-
-  wxPrintout *printout = view->OnCreatePrintout();
-  if (printout)
-  {
-    // TODO: trouble about this is that it pulls in the postscript
-    // code unecessarily
-#ifdef __WXMSW__
-    if ( wxTheApp->GetPrintMode() == wxPRINT_WINDOWS )
+    // 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()) )

     {
     {

-      wxWindowsPrinter printer;
-      printer.Print(view->GetFrame(), printout, TRUE);
+        DoOpenMRUFile(id - wxID_FILE1);

     }
     else
     }
     else

-#endif

     {
     {

-      wxPostScriptPrinter printer;
-      printer.Print(view->GetFrame(), printout, TRUE);
+        event.Skip();

     }
     }

-
-    delete printout;
-  }

 }
 
 }
 

-void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
+void wxDocManager::DoOpenMRUFile(unsigned n)

 {
 {

-  wxWindow *parentWin = wxTheApp->GetTopWindow();
-  wxView *view = GetCurrentView();
-  if (view)
-    parentWin = view->GetFrame();
+    wxString filename(GetHistoryFile(n));
+    if ( filename.empty() )
+        return;

 
 

-  wxPrintData data;
+    wxString errMsg; // must contain exactly one "%s" if non-empty
+    if ( wxFile::Exists(filename) )
+    {
+        // try to open it
+        if ( CreateDocument(filename, wxDOC_SILENT) )
+            return;

 
 

-#ifdef __WXMSW__
-  if ( wxTheApp->GetPrintMode() == wxPRINT_WINDOWS )
-  {
-    wxPrintDialog printerDialog(parentWin, & data);
-    printerDialog.GetPrintData().SetSetupDialog(TRUE);
-    printerDialog.ShowModal();
-  }
-  else
-#endif
-  {
-    wxGenericPrintDialog printerDialog(parentWin, & data);
-    printerDialog.GetPrintData().SetSetupDialog(TRUE);
-    printerDialog.ShowModal();
-  }
-}
+        errMsg = _("The file '%s' couldn't be opened.");
+    }
+    else // file doesn't exist
+    {
+        errMsg = _("The file '%s' doesn't exist and couldn't be opened.");
+    }

 
 

-void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
-{
-  wxView *view = GetCurrentView();
-  if (!view)
-    return;
-
-  wxPrintout *printout = view->OnCreatePrintout();
-  if (printout)
-  {
-    // Pass two printout objects: for preview, and possible printing.
-    wxPrintPreviewBase *preview = (wxPrintPreviewBase *) NULL;
-#ifdef __WXMSW__
-    if ( wxTheApp->GetPrintMode() == wxPRINT_WINDOWS )
-        preview = new wxWindowsPrintPreview(printout, view->OnCreatePrintout());
-    else
-#endif
-       preview = new wxPostScriptPrintPreview(printout, view->OnCreatePrintout());

 
 

-    wxPreviewFrame *frame = new wxPreviewFrame(preview, (wxFrame *)wxTheApp->GetTopWindow(), _("Print Preview"),
-               wxPoint(100, 100), wxSize(600, 650));
-    frame->Centre(wxBOTH);
-    frame->Initialize();
-    frame->Show(TRUE);
-  }
-}
+    wxASSERT_MSG( !errMsg.empty(), "should have an error message" );

 
 

-void wxDocManager::OnUndo(wxCommandEvent& WXUNUSED(event))
-{
-  wxDocument *doc = GetCurrentDocument();
-  if (!doc)
-    return;
-  if (doc->GetCommandProcessor())
-    doc->GetCommandProcessor()->Undo();
-}
+    // remove the file which we can't open from the MRU list
+    RemoveFileFromHistory(n);

 
 

-void wxDocManager::OnRedo(wxCommandEvent& WXUNUSED(event))
-{
-  wxDocument *doc = GetCurrentDocument();
-  if (!doc)
-    return;
-  if (doc->GetCommandProcessor())
-    doc->GetCommandProcessor()->Redo();
+    // and tell the user about it
+    wxLogError(errMsg + '\n' +
+               _("It has been removed from the most recently used files list."),
+               filename);

 }
 
 }
 

-wxView *wxDocManager::GetCurrentView(void) const
-{
-    if (m_currentView)
-        return m_currentView;
-    if (m_docs.Number() == 1)
-    {
-        wxDocument* doc = (wxDocument*) m_docs.First()->Data();
-        return doc->GetFirstView();
-    }
-    return (wxView *) NULL;
-}
+#if wxUSE_PRINTING_ARCHITECTURE

 
 

-// Extend event processing to search the view's event table
-bool wxDocManager::ProcessEvent(wxEvent& event)
+void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))

 {
 {

-    wxView* view = GetCurrentView();
-    if (view)
-    {
-        if (view->ProcessEvent(event))
-            return TRUE;
-    }
-    return wxEvtHandler::ProcessEvent(event);
-}
+    wxView *view = GetActiveView();
+    if (!view)
+        return;

 
 

-wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
-{
-  wxDocTemplate **templates = new wxDocTemplate *[m_templates.Number()];
-  int i;
-  int n = 0;
-  for (i = 0; i < m_templates.Number(); i++)
-  {
-    wxDocTemplate *temp = (wxDocTemplate *)(m_templates.Nth(i)->Data());
-    if (temp->IsVisible())
-    {
-      templates[n] = temp;
-      n ++;
-    }
-  }
-  if (n == 0)
-  {
-    delete[] templates;
-    return (wxDocument *) NULL;
-  }
-
-  // If we've reached the max number of docs, close the
-  // first one.
-  if (GetDocuments().Number() >= m_maxDocsOpen)
-  {
-    wxDocument *doc = (wxDocument *)GetDocuments().First()->Data();
-    if (doc->Close())
+    wxPrintout *printout = view->OnCreatePrintout();
+    if (printout)

     {
     {

-      // Implicitly deletes the document when
-      // the last view is deleted
-      doc->DeleteAllViews();
+        wxPrintDialogData printDialogData(m_pageSetupDialogData.GetPrintData());
+        wxPrinter printer(&printDialogData);
+        printer.Print(view->GetFrame(), printout, true);

 
 

-      // Check we're really deleted
-      if (m_docs.Member(doc))
-        delete doc;
-    }
-    else
-      return (wxDocument *) NULL;
-  }
-  
-  // New document: user chooses a template, unless there's only one.
-  if (flags & wxDOC_NEW)
-  {
-    if (n == 1)
-    {
-      wxDocTemplate *temp = templates[0];
-      delete[] templates;
-      wxDocument *newDoc = temp->CreateDocument(path, flags);
-      if (newDoc)
-      {
-        newDoc->SetDocumentName(temp->GetDocumentName());
-        newDoc->SetDocumentTemplate(temp);
-        newDoc->OnNewDocument();
-      }
-      return newDoc;
+        delete printout;

     }
     }

+}

 
 

-    wxDocTemplate *temp = SelectDocumentType(templates, n);
-    delete[] templates;
-    if (temp)
+void wxDocManager::OnPageSetup(wxCommandEvent& WXUNUSED(event))
+{
+    wxPageSetupDialog dlg(wxTheApp->GetTopWindow(), &m_pageSetupDialogData);
+    if ( dlg.ShowModal() == wxID_OK )

     {
     {

-      wxDocument *newDoc = temp->CreateDocument(path, flags);
-      if (newDoc)
-      {
-        newDoc->SetDocumentName(temp->GetDocumentName());
-        newDoc->SetDocumentTemplate(temp);
-        newDoc->OnNewDocument();
-      }
-      return newDoc;
+        m_pageSetupDialogData = dlg.GetPageSetupData();

     }
     }

-    else
-      return (wxDocument *) NULL;
-  }
+}

 
 

-  // Existing document
-  wxDocTemplate *temp = (wxDocTemplate *) NULL;
+wxPreviewFrame* wxDocManager::CreatePreviewFrame(wxPrintPreviewBase* preview,
+                                                 wxWindow *parent,
+                                                 const wxString& title)
+{
+    return new wxPreviewFrame(preview, parent, title);
+}

 
 

-  wxString path2("");
-  if (path != "")
-    path2 = path;
+void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
+{
+    wxBusyCursor busy;
+    wxView *view = GetActiveView();
+    if (!view)
+        return;

 
 

-  if (flags & wxDOC_SILENT)
-    temp = FindTemplateForPath(path2);
-  else
-    temp = SelectDocumentPath(templates, n, path2, flags);
+    wxPrintout *printout = view->OnCreatePrintout();
+    if (printout)
+    {
+        wxPrintDialogData printDialogData(m_pageSetupDialogData.GetPrintData());
+
+        // Pass two printout objects: for preview, and possible printing.
+        wxPrintPreviewBase *
+            preview = new wxPrintPreview(printout,
+                                         view->OnCreatePrintout(),
+                                         &printDialogData);
+        if ( !preview->Ok() )
+        {
+            delete preview;
+            wxLogError(_("Print preview creation failed."));
+            return;
+        }

 
 

-  delete[] templates;
+        wxPreviewFrame* frame = CreatePreviewFrame(preview,
+                                                   wxTheApp->GetTopWindow(),
+                                                   _("Print Preview"));
+        wxCHECK_RET( frame, "should create a print preview frame" );

 
 

-  if (temp)
-  {
-    wxDocument *newDoc = temp->CreateDocument(path2, flags);
-    if (newDoc)
-    {
-      newDoc->SetDocumentName(temp->GetDocumentName());
-      newDoc->SetDocumentTemplate(temp);
-      if (!newDoc->OnOpenDocument(path2))
-      {
-        delete newDoc;
-        return (wxDocument *) NULL;
-      }
-      AddFileToHistory(path2);
+        frame->Centre(wxBOTH);
+        frame->Initialize();
+        frame->Show(true);

     }
     }

-    return newDoc;
-  }
-  else
-    return (wxDocument *) NULL;

 }
 }

+#endif // wxUSE_PRINTING_ARCHITECTURE

 
 

-wxView *wxDocManager::CreateView(wxDocument *doc, long flags)
+void wxDocManager::OnUndo(wxCommandEvent& event)

 {
 {

-  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())
+    wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor();
+    if ( !cmdproc )

     {
     {

-      if (temp->GetDocumentName() == doc->GetDocumentName())
-      {
-        templates[n] = temp;
-        n ++;
-      }
+        event.Skip();
+        return;

     }
     }

-  }
-  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;
-  }
-  
-  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;
-}

 
 

-// Not yet implemented
-void wxDocManager::DeleteTemplate(wxDocTemplate *WXUNUSED(temp), long WXUNUSED(flags))
-{
+    cmdproc->Undo();

 }
 
 }
 

-// Not yet implemented
-bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc))
+void wxDocManager::OnRedo(wxCommandEvent& event)

 {
 {

-  return FALSE;
+    wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor();
+    if ( !cmdproc )
+    {
+        event.Skip();
+        return;
+    }
+
+    cmdproc->Redo();

 }
 
 }
 

-wxDocument *wxDocManager::GetCurrentDocument(void) const
+// Handlers for UI update commands
+
+void wxDocManager::OnUpdateFileOpen(wxUpdateUIEvent& event)

 {
 {

-  if (m_currentView)
-    return m_currentView->GetDocument();
-  else
-    return (wxDocument *) NULL;
+    // CreateDocument() (which is called from OnFileOpen) may succeed
+    // only when there is at least a template:
+    event.Enable( GetTemplates().GetCount()>0 );

 }
 
 }
 

-// Make a default document name
-bool wxDocManager::MakeDefaultName(wxString& name)
+void wxDocManager::OnUpdateDisableIfNoDoc(wxUpdateUIEvent& event)

 {
 {

-  char buf[256];
-  sprintf(buf, _("unnamed%d"), m_defaultDocumentNameCounter);
-  m_defaultDocumentNameCounter ++;
-  name = buf;
-  return TRUE;
+    event.Enable( GetCurrentDocument() != NULL );

 }
 
 }
 

-// Not yet implemented
-wxDocTemplate *wxDocManager::MatchTemplate(const wxString& WXUNUSED(path))
+void wxDocManager::OnUpdateFileRevert(wxUpdateUIEvent& event)

 {
 {

-  return (wxDocTemplate *) NULL;
+    wxDocument* doc = GetCurrentDocument();
+    event.Enable(doc && doc->IsModified() && doc->GetDocumentSaved());

 }
 
 }
 

-// File history management
-void wxDocManager::AddFileToHistory(const wxString& file)
+void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event)

 {
 {

-  if (m_fileHistory)
-    m_fileHistory->AddFileToHistory(file);
+    // CreateDocument() (which is called from OnFileNew) may succeed
+    // only when there is at least a template:
+    event.Enable( GetTemplates().GetCount()>0 );

 }
 
 }
 

-wxString wxDocManager::GetHistoryFile(int i) const
+void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event)

 {
 {

-  if (m_fileHistory)
-    return wxString(m_fileHistory->GetHistoryFile(i));
-  else
-    return wxString("");
+    wxDocument * const doc = GetCurrentDocument();
+    event.Enable( doc && !doc->AlreadySaved() );

 }
 
 }
 

-void wxDocManager::FileHistoryUseMenu(wxMenu *menu)
+void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event)

 {
 {

-  if (m_fileHistory)
-    m_fileHistory->UseMenu(menu);
+    wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor();
+    if ( !cmdproc )
+    {
+        event.Enable(false);
+        return;
+    }
+
+    event.Enable(cmdproc->CanUndo());
+    cmdproc->SetMenuStrings();

 }
 
 }
 

-void wxDocManager::FileHistoryRemoveMenu(wxMenu *menu)
+void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event)

 {
 {

-  if (m_fileHistory)
-    m_fileHistory->RemoveMenu(menu);
+    wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor();
+    if ( !cmdproc )
+    {
+        event.Enable(false);
+        return;
+    }
+
+    event.Enable(cmdproc->CanRedo());
+    cmdproc->SetMenuStrings();

 }
 
 }
 

-void wxDocManager::FileHistoryLoad(wxConfigBase& config)
+wxView *wxDocManager::GetActiveView() const

 {
 {

-  if (m_fileHistory)
-    m_fileHistory->Load(config);
+    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::FileHistorySave(wxConfigBase& config)
+bool wxDocManager::TryBefore(wxEvent& event)

 {
 {

-  if (m_fileHistory)
-    m_fileHistory->Save(config);
+    wxView * const view = GetActiveView();
+    return view && view->ProcessEventLocally(event);

 }
 
 }
 

-void wxDocManager::FileHistoryAddFilesToMenu(wxMenu* menu)
+namespace

 {
 {

-  if (m_fileHistory)
-    m_fileHistory->AddFilesToMenu(menu);
-}

 
 

-void wxDocManager::FileHistoryAddFilesToMenu()
+// helper function: return only the visible templates
+wxDocTemplates GetVisibleTemplates(const wxList& allTemplates)

 {
 {

-  if (m_fileHistory)
-    m_fileHistory->AddFilesToMenu();
+    // select only the visible templates
+    const size_t totalNumTemplates = allTemplates.GetCount();
+    wxDocTemplates templates;
+    if ( totalNumTemplates )
+    {
+        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 templates;

 }
 
 }
 

-int wxDocManager::GetNoHistoryFiles(void) const
+} // anonymous namespace
+
+void wxDocManager::ActivateDocument(wxDocument *doc)

 {
 {

-  if (m_fileHistory)
-    return m_fileHistory->GetNoHistoryFiles();
-  else
-    return 0;
+    wxView * const view = doc->GetFirstView();
+    if ( !view )
+        return;
+
+    view->Activate(true);
+    if ( wxWindow *win = view->GetFrame() )
+        win->SetFocus();

 }
 
 }
 

-static char *FindExtension(char *path)
+wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)

 {
 {

-  static char ext[10];
-  int len = strlen(path);
-  if (path)
-  {
-    int i = 0;
-    for (i = (len-1); i > 0; i --)
-      if (path[i] == '.')
-        break;
-    if (path[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 )

     {
     {

-      int j;
-      for (j = i+1; j < len; j++)
-        ext[(int)(j-(i+1))] = (char)wxToLower(path[j]); // NOTE Should not use tolower under UNIX
-      ext[j-(i+1)] = 0;
-      return ext;
+        // no templates can be used, can't create document
+        return NULL;

     }
     }

-    else
-      return (char *) NULL;
-  }
-  else return (char *) NULL;
-}

 
 
 
 

-// Given a path, try to find a matching template. Won't
-// always work, of course.
-wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path)
-{
-  char *theExt = FindExtension((char *)(const char *)path);
-  if (!theExt)
-    return (wxDocTemplate *) NULL;
-  wxDocTemplate *theTemplate = (wxDocTemplate *) NULL;
-
-  if (m_templates.Number() == 1)
-    return (wxDocTemplate *)m_templates.First()->Data();
+    // 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 )
+    {
+        wxASSERT_MSG( !path.empty(),
+                      "using empty path with wxDOC_SILENT doesn't make sense" );

 
 

-  // Find the template which this extension corresponds to
-  int i;
-  for (i = 0; i < m_templates.Number(); i++)
-  {
-    wxDocTemplate *temp = (wxDocTemplate *)m_templates.Nth(i)->Data();
-    if (strcmp(temp->GetDefaultExtension(), theExt) == 0)
+        temp = FindTemplateForPath(path);
+        if ( !temp )
+        {
+            wxLogWarning(_("The format of file '%s' couldn't be determined."),
+                         path);
+        }
+    }
+    else // not silent, ask the user

     {
     {

-      theTemplate = temp;
-      break;
+        // 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
+            temp = SelectDocumentPath(&templates[0], numTemplates, path, flags);

     }
     }

-  }
-  return theTemplate;
-}

 
 

-// 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.
-wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
-    int noTemplates, wxString& path, long WXUNUSED(flags), bool WXUNUSED(save))
-{
-  // We can only have multiple filters in Windows
-#ifdef __WXMSW__
-  char *descrBuf = new char[1000];
-  descrBuf[0] = 0;
-  int i;
-  for (i = 0; i < noTemplates; i++)
-  {
-    if (templates[i]->IsVisible())
+    if ( !temp )
+        return NULL;
+
+    // check whether the document with this path is already opened
+    if ( !path.empty() )

     {
     {

-      strcat(descrBuf, templates[i]->GetDescription());
-      strcat(descrBuf, " (");
-      strcat(descrBuf, templates[i]->GetFileFilter());
-      strcat(descrBuf, ") ");
-      strcat(descrBuf, "|");
-      strcat(descrBuf, templates[i]->GetFileFilter());
-      strcat(descrBuf, "|");
+        const wxFileName fn(path);
+        for ( wxList::const_iterator i = m_docs.begin(); i != m_docs.end(); ++i )
+        {
+            wxDocument * const doc = (wxDocument*)*i;
+
+            if ( fn == doc->GetFilename() )
+            {
+                // file already open, just activate it and return
+                ActivateDocument(doc);
+                return doc;
+            }
+        }

     }
     }

-  }
-  int len = strlen(descrBuf);
-  if (len > 0)
-    // Omit final "|"
-    descrBuf[len-1] = 0;
-
-  char *pathTmp = wxFileSelector(_("Select a file"), "", "", "", descrBuf, 0, wxTheApp->GetTopWindow());
-  delete[] descrBuf;
-  if (pathTmp)
-  {
-    path = pathTmp;
-    char *theExt = FindExtension((char *)(const char *)path);
-    if (!theExt)
-      return (wxDocTemplate *) NULL;
-
-    // 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);
-    return theTemplate;
-  }
-  else
-  {
-    path = "";
-    return (wxDocTemplate *) NULL;
-  }
-#else
-  // 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;
-
-  char *pathTmp = wxFileSelector(_("Select a file"), "", "",
-     temp->GetDefaultExtension(),
-     temp->GetFileFilter(),
-     0, wxTheApp->GetTopWindow());
-
-  if (pathTmp)
-  {
-    path = pathTmp;
-    return temp;
-  }
-  else
-    return (wxDocTemplate *) NULL;
-#endif
-}

 
 

-wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
-    int noTemplates)
-{
-  char **strings = new char *[noTemplates];
-  char **data = new char *[noTemplates];
-  int i;
-  int n = 0;
-  for (i = 0; i < noTemplates; i++)
-  {
-    if (templates[i]->IsVisible())
+
+    // 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 )

     {
     {

-      strings[n] = WXSTRINGCAST templates[i]->m_description;
-      data[n] = (char *)templates[i];
-      n ++;
+        if ( !CloseDocument((wxDocument *)GetDocuments().GetFirst()->GetData()) )
+        {
+            // can't open the new document if closing the old one failed
+            return NULL;
+        }

     }
     }

-  }
-  if (n == 0)
-  {
-    delete[] strings;
-    delete[] data;
-    return (wxDocTemplate *) NULL;
-  }
-  else if (n == 1)
-  {
-    wxDocTemplate *temp = (wxDocTemplate *)data[0];
-    delete[] strings;
-    delete[] data;
-    return temp;
-  }
-  
-  wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document template"), _("Templates"), n,
-    strings, data);
-  delete[] strings;
-  delete[] data;
-  return theTemplate;
-}

 
 

-wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
-    int noTemplates)
-{
-  char **strings = new char *[noTemplates];
-  char **data = new char *[noTemplates];
-  int i;
-  int n = 0;
-  for (i = 0; i < noTemplates; i++)
-  {
-    if (templates[i]->IsVisible() && templates[i]->GetViewName())
+
+    // do create and initialize the new document finally
+    wxDocument * const docNew = temp->CreateDocument(path, flags);
+    if ( !docNew )
+        return NULL;
+
+    docNew->SetDocumentName(temp->GetDocumentName());
+    docNew->SetDocumentTemplate(temp);
+
+    wxTRY

     {
     {

-      strings[n] = WXSTRINGCAST templates[i]->m_viewTypeName;
-      data[n] = (char *)templates[i];
-      n ++;
+        // call the appropriate function depending on whether we're creating a
+        // new file or opening an existing one
+        if ( !(flags & wxDOC_NEW ? docNew->OnNewDocument()
+                                 : docNew->OnOpenDocument(path)) )
+        {
+            docNew->DeleteAllViews();
+            return NULL;
+        }

     }
     }

-  }
-  wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document view"), _("Views"), n,
-    strings, data);
-  delete[] strings;
-  delete[] data;
-  return theTemplate;
-}
+    wxCATCH_ALL( docNew->DeleteAllViews(); throw; )

 
 

-void wxDocManager::AssociateTemplate(wxDocTemplate *temp)
-{
-  if (!m_templates.Member(temp))
-    m_templates.Append(temp);
+    // 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;

 }
 
 }
 

-void wxDocManager::DisassociateTemplate(wxDocTemplate *temp)
+wxView *wxDocManager::CreateView(wxDocument *doc, long flags)

 {
 {

-  m_templates.DeleteObject(temp);
+    wxDocTemplates templates(GetVisibleTemplates(m_templates));
+    const size_t numTemplates = templates.size();
+
+    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;

 }
 
 }
 

-// Add and remove a document from the manager's list
-void wxDocManager::AddDocument(wxDocument *doc)
+// Not yet implemented
+void
+wxDocManager::DeleteTemplate(wxDocTemplate *WXUNUSED(temp), long WXUNUSED(flags))

 {
 {

-  if (!m_docs.Member(doc))
-    m_docs.Append(doc);

 }
 
 }
 

-void wxDocManager::RemoveDocument(wxDocument *doc)
+// Not yet implemented
+bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc))

 {
 {

-  m_docs.DeleteObject(doc);
+    return false;

 }
 
 }
 

-// 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;
-  }
+wxDocument *wxDocManager::GetCurrentDocument() const
+{
+    wxView * const view = GetActiveView();
+    return view ? view->GetDocument() : NULL;

 }
 
 }
 

-/*
- * Default document child frame
- */
-
-BEGIN_EVENT_TABLE(wxDocChildFrame, wxFrame)
-    EVT_ACTIVATE(wxDocChildFrame::OnActivate)
-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)
+wxCommandProcessor *wxDocManager::GetCurrentCommandProcessor() const

 {
 {

-  m_childDocument = doc;
-  m_childView = view;
-  if (view)
-    view->SetFrame(this);
+    wxDocument * const doc = GetCurrentDocument();
+    return doc ? doc->GetCommandProcessor() : NULL;

 }
 
 }
 

-wxDocChildFrame::~wxDocChildFrame(void)
+// 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

 
 

-// Extend event processing to search the view's event table
-bool wxDocChildFrame::ProcessEvent(wxEvent& event)
+wxString wxDocManager::MakeNewDocumentName()

 {
 {

-    if (m_childView)
-        m_childView->Activate(TRUE);
+    wxString name;

 
 

-       if ( !m_childView || ! m_childView->ProcessEvent(event) )
+#if WXWIN_COMPATIBILITY_2_8
+    if ( !MakeDefaultName(name) )
+#endif // WXWIN_COMPATIBILITY_2_8

     {
     {

-        // 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;
+        name.Printf(_("unnamed%d"), m_defaultDocumentNameCounter);
+        m_defaultDocumentNameCounter++;

     }
     }

-       else
-               return TRUE;
-}

 
 

-void wxDocChildFrame::OnActivate(wxActivateEvent& event)
-{
-  wxFrame::OnActivate(event);
-
-  if (m_childView)
-    m_childView->Activate(event.GetActive());
+    return name;

 }
 
 }
 

-bool wxDocChildFrame::OnClose(void)
+// 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)

 {
 {

-  // Close view but don't delete the frame while doing so!
-  // ...since it will be deleted by wxWindows if we return TRUE.
-  if (m_childView)
-  {
-    bool ans = m_childView->Close(FALSE); // FALSE means don't delete associated window
-    if (ans)
+    wxString appName = wxTheApp->GetAppDisplayName();
+    wxString title;
+    if (!doc)
+        title = appName;
+    else

     {
     {

-      m_childView->Activate(FALSE);
-      delete m_childView;
-      m_childView = (wxView *) NULL;
-      m_childDocument = (wxDocument *) NULL;
+        wxString docName = doc->GetUserReadableName();
+        title = docName + wxString(_(" - ")) + appName;

     }
     }

-    
-    return ans;
-  }
-  else return TRUE;
+    return title;

 }
 
 }
 

-/*
- * Default parent frame
- */
-
-BEGIN_EVENT_TABLE(wxDocParentFrame, wxFrame)
-    EVT_MENU(wxID_EXIT, wxDocParentFrame::OnExit)
-    EVT_MENU_RANGE(wxID_FILE1, wxID_FILE9, wxDocParentFrame::OnMRUFile)
-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))
+// Not yet implemented
+wxDocTemplate *wxDocManager::MatchTemplate(const wxString& WXUNUSED(path))

 {
 {

-    Close();
+    return NULL;

 }
 
 }
 

-void wxDocParentFrame::OnMRUFile(wxCommandEvent& event)
+// File history management
+void wxDocManager::AddFileToHistory(const wxString& file)

 {
 {

-      wxString f(m_docManager->GetHistoryFile(event.GetSelection() - wxID_FILE1));
-      if (f != "")
-        (void)m_docManager->CreateDocument(f, wxDOC_SILENT);
+    if (m_fileHistory)
+        m_fileHistory->AddFileToHistory(file);

 }
 
 }
 

-// Extend event processing to search the view's event table
-bool wxDocParentFrame::ProcessEvent(wxEvent& event)
+void wxDocManager::RemoveFileFromHistory(size_t i)

 {
 {

-    // Try the document manager, then do default processing
-    if (!m_docManager || !m_docManager->ProcessEvent(event))
-        return wxEvtHandler::ProcessEvent(event);
-    else
-        return TRUE;
+    if (m_fileHistory)
+        m_fileHistory->RemoveFileFromHistory(i);

 }
 
 }
 

-// Define the behaviour for the frame closing
-// - must delete all frames except for the main one.
-bool wxDocParentFrame::OnClose(void)
+wxString wxDocManager::GetHistoryFile(size_t i) const

 {
 {

-  return m_docManager->Clear(FALSE);
-}
+    wxString histFile;

 
 

-#if wxUSE_PRINTING_ARCHITECTURE
+    if (m_fileHistory)
+        histFile = m_fileHistory->GetHistoryFile(i);

 
 

-wxDocPrintout::wxDocPrintout(wxView *view, const wxString& title):
-  wxPrintout(WXSTRINGCAST title)
-{
-  m_printoutView = view;
+    return histFile;

 }
 
 }
 

-bool wxDocPrintout::OnPrintPage(int WXUNUSED(page))
+void wxDocManager::FileHistoryUseMenu(wxMenu *menu)

 {
 {

-  wxDC *dc = GetDC();
-  
-  // Get the logical pixels per inch of screen and printer
-  int ppiScreenX, ppiScreenY;
-  GetPPIScreen(&ppiScreenX, &ppiScreenY);
-  int ppiPrinterX, ppiPrinterY;
-  GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);
-
-  // This scales the DC so that the printout roughly represents the
-  // the screen scaling. The text point size _should_ be the right size
-  // but in fact is too small for some reason. This is a detail that will
-  // need to be addressed at some point but can be fudged for the
-  // moment.
-  float scale = (float)((float)ppiPrinterX/(float)ppiScreenX);
-
-  // Now we have to check in case our real page size is reduced
-  // (e.g. because we're drawing to a print preview memory DC)
-  int pageWidth, pageHeight;
-  int w, h;
-  dc->GetSize(&w, &h);
-  GetPageSizePixels(&pageWidth, &pageHeight);
-
-  // If printer pageWidth == current DC width, then this doesn't
-  // change. But w might be the preview bitmap width, so scale down.
-  float overallScale = scale * (float)(w/(float)pageWidth);
-  dc->SetUserScale(overallScale, overallScale);
-
-  if (m_printoutView)
-  {
-    m_printoutView->OnDraw(dc);
-  }
-  return TRUE;
+    if (m_fileHistory)
+        m_fileHistory->UseMenu(menu);

 }
 
 }
 

-bool wxDocPrintout::HasPage(int pageNum)
+void wxDocManager::FileHistoryRemoveMenu(wxMenu *menu)

 {
 {

-  return (pageNum == 1);
+    if (m_fileHistory)
+        m_fileHistory->RemoveMenu(menu);

 }
 
 }
 

-bool wxDocPrintout::OnBeginDocument(int startPage, int endPage)
+#if wxUSE_CONFIG
+void wxDocManager::FileHistoryLoad(const wxConfigBase& config)

 {
 {

-  if (!wxPrintout::OnBeginDocument(startPage, endPage))
-    return FALSE;
-
-  return TRUE;
+    if (m_fileHistory)
+        m_fileHistory->Load(config);

 }
 
 }
 

-void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo)
+void wxDocManager::FileHistorySave(wxConfigBase& config)

 {
 {

-  *minPage = 1;
-  *maxPage = 1;
-  *selPageFrom = 1;
-  *selPageTo = 1;
+    if (m_fileHistory)
+        m_fileHistory->Save(config);

 }
 }

-

 #endif
 
 #endif
 

-/*
- * Command processing framework
- */
-
-wxCommand::wxCommand(bool canUndoIt, const wxString& name)
+void wxDocManager::FileHistoryAddFilesToMenu(wxMenu* menu)

 {
 {

-  m_canUndo = canUndoIt;
-  m_commandName = name;
+    if (m_fileHistory)
+        m_fileHistory->AddFilesToMenu(menu);

 }
 
 }
 

-wxCommand::~wxCommand(void)
+void wxDocManager::FileHistoryAddFilesToMenu()

 {
 {

+    if (m_fileHistory)
+        m_fileHistory->AddFilesToMenu();

 }
 
 }
 

-// Command processor
-wxCommandProcessor::wxCommandProcessor(int maxCommands)
+size_t wxDocManager::GetHistoryFilesCount() const

 {
 {

-  m_maxNoCommands = maxCommands;
-  m_currentCommand = (wxNode *) NULL;
-  m_commandEditMenu = (wxMenu *) NULL;
+    return m_fileHistory ? m_fileHistory->GetCount() : 0;

 }
 
 }
 

-wxCommandProcessor::~wxCommandProcessor(void)
+
+// Find out the document template via matching in the document file format
+// against that of the template
+wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path)

 {
 {

-  ClearCommands();
+    wxDocTemplate *theTemplate = NULL;
+
+    // Find the template which this extension corresponds to
+    for (size_t i = 0; i < m_templates.GetCount(); i++)
+    {
+        wxDocTemplate *temp = (wxDocTemplate *)m_templates.Item(i)->GetData();
+        if ( temp->FileMatchesTemplate(path) )
+        {
+            theTemplate = temp;
+            break;
+        }
+    }
+    return theTemplate;

 }
 
 }
 

-// 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)
+// Prompts user to open a file, using file specs in templates.
+// Must extend the file selector dialog or implement own; OR
+// match the extension to the template extension.
+
+wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
+                                                int noTemplates,
+                                                wxString& path,
+                                                long WXUNUSED(flags),
+                                                bool WXUNUSED(save))

 {
 {

-  bool success = command->Do();
-  if (success && storeIt)
-  {
-    if (m_commands.Number() == m_maxNoCommands)
+#ifdef wxHAS_MULTIPLE_FILEDLG_FILTERS
+    wxString descrBuf;
+
+    for (int i = 0; i < noTemplates; i++)

     {
     {

-      wxNode *firstNode = m_commands.First();
-      wxCommand *firstCommand = (wxCommand *)firstNode->Data();
-      delete firstCommand;
-      delete firstNode;
+        if (templates[i]->IsVisible())
+        {
+            // add a '|' to separate this filter from the previous one
+            if ( !descrBuf.empty() )
+                descrBuf << wxT('|');
+
+            descrBuf << templates[i]->GetDescription()
+                << wxT(" (") << templates[i]->GetFileFilter() << wxT(") |")
+                << templates[i]->GetFileFilter();
+        }

     }
     }

+#else
+    wxString descrBuf = wxT("*.*");
+    wxUnusedVar(noTemplates);
+#endif
+
+    int FilterIndex = -1;
+
+    wxString pathTmp = wxFileSelectorEx(_("Open File"),
+                                        GetLastDirectory(),
+                                        wxEmptyString,
+                                        &FilterIndex,
+                                        descrBuf,
+                                        wxFD_OPEN | wxFD_FILE_MUST_EXIST);

 
 

-    // 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();
+    wxDocTemplate *theTemplate = NULL;
+    if (!pathTmp.empty())
+    {
+        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;
+
+        // 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];
+        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
     {
     else
     {

-      wxNode *node = m_currentCommand->Next();
-      while (node)
-      {
-        wxNode *next = node->Next();
-        delete (wxCommand *)node->Data();
-        delete node;
-        node = next;
-      }
+        path.clear();

     }
     }

-    
-    m_commands.Append(command);
-    m_currentCommand = m_commands.Last();
-    SetMenuStrings();
-  }
-  return success;
+
+    return theTemplate;
+}
+
+wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
+                                                int noTemplates, bool sort)
+{
+    wxArrayString strings;
+    wxScopedArray<wxDocTemplate *> data(new wxDocTemplate *[noTemplates]);
+    int i;
+    int n = 0;
+
+    for (i = 0; i < noTemplates; i++)
+    {
+        if (templates[i]->IsVisible())
+        {
+            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 ++;
+            }
+        }
+    }  // for
+
+    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_description)
+                    data[i] = templates[j];
+            }
+        }
+    }
+
+    wxDocTemplate *theTemplate;
+
+    switch ( n )
+    {
+        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()
+                          );
+    }
+
+    return theTemplate;

 }
 
 }
 

-bool wxCommandProcessor::Undo(void)
+wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
+                                            int noTemplates, bool sort)

 {
 {

-  if (m_currentCommand)
-  {
-    wxCommand *command = (wxCommand *)m_currentCommand->Data();
-    if (command->CanUndo())
+    wxArrayString strings;
+    wxScopedArray<wxDocTemplate *> data(new wxDocTemplate *[noTemplates]);
+    int i;
+    int n = 0;
+
+    for (i = 0; i < noTemplates; i++)

     {
     {

-      bool success = command->Undo();
-      if (success)
-      {
-        m_currentCommand = m_currentCommand->Previous();
-        SetMenuStrings();
-        return TRUE;
-      }
+        wxDocTemplate *templ = templates[i];
+        if ( templ->IsVisible() && !templ->GetViewName().empty() )
+        {
+            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 ++;
+            }
+        }

     }
     }

-  }
-  return FALSE;
-}
-
-bool wxCommandProcessor::Redo(void)
-{
-  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
-  {
-    if (m_commands.Number() > 0)
+
+    if (sort)

     {
     {

-      redoCommand = (wxCommand *)m_commands.First()->Data();
-      redoNode = m_commands.First();
+        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];
+            }
+        }

     }
     }

-  }

 
 

-  if (redoCommand)
-  {
-    bool success = redoCommand->Do();
-    if (success)
+    wxDocTemplate *theTemplate;
+
+    // the same logic as above
+    switch ( n )

     {
     {

-      m_currentCommand = redoNode;
-      SetMenuStrings();
-      return TRUE;
+        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 FALSE;
+
+    return theTemplate;

 }
 
 }
 

-bool wxCommandProcessor::CanUndo(void) const
+void wxDocManager::AssociateTemplate(wxDocTemplate *temp)

 {
 {

-  if (m_currentCommand)
-    return ((wxCommand *)m_currentCommand->Data())->CanUndo();
-  return FALSE;
+    if (!m_templates.Member(temp))
+        m_templates.Append(temp);

 }
 
 }
 

-bool wxCommandProcessor::CanRedo(void) const
+void wxDocManager::DisassociateTemplate(wxDocTemplate *temp)

 {
 {

-    if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->Next() == (wxNode*) NULL))
-        return FALSE;
+    m_templates.DeleteObject(temp);
+}

 
 

-    if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->Next() != (wxNode*) NULL))
-        return TRUE;
+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;
+   }

 
 

-    if ((m_currentCommand == (wxNode*) NULL) && (m_commands.Number() > 0))
-        return TRUE;
+   return NULL;
+}

 
 

-    return FALSE;
+// Add and remove a document from the manager's list
+void wxDocManager::AddDocument(wxDocument *doc)
+{
+    if (!m_docs.Member(doc))
+        m_docs.Append(doc);

 }
 
 }
 

-void wxCommandProcessor::Initialize(void)
+void wxDocManager::RemoveDocument(wxDocument *doc)

 {
 {

-  m_currentCommand = m_commands.Last();
-  SetMenuStrings();
+    m_docs.DeleteObject(doc);

 }
 
 }
 

-void wxCommandProcessor::SetMenuStrings(void)
+// 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)

 {
 {

-  if (m_commandEditMenu)
-  {
-    wxString buf;
-    if (m_currentCommand)
+    if ( activate )

     {
     {

-      wxCommand *command = (wxCommand *)m_currentCommand->Data();
-      wxString commandName(command->GetName());
-      if (commandName == "") 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 == "") 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);
-      }
+        m_currentView = view;

     }
     }

-    else
+    else // deactivate

     {
     {

-      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) redoCommandName = _("Unnamed command");
-        buf = wxString(_("&Redo ")) + redoCommandName;
-        m_commandEditMenu->SetLabel(wxID_REDO, buf);
-        m_commandEditMenu->Enable(wxID_REDO, TRUE);
-      }
+        if ( m_currentView == view )
+        {
+            // don't keep stale pointer
+            m_currentView = NULL;
+        }

     }
     }

-  }

 }
 
 }
 

-void wxCommandProcessor::ClearCommands(void)
+// ----------------------------------------------------------------------------
+// wxDocChildFrameAnyBase
+// ----------------------------------------------------------------------------
+
+bool wxDocChildFrameAnyBase::CloseView(wxCloseEvent& event)

 {
 {

-  wxNode *node = m_commands.First();
-  while (node)
-  {
-    wxCommand *command = (wxCommand *)node->Data();
-    delete command;
-    delete node;
-    node = m_commands.First();
-  }
-  m_currentCommand = (wxNode *) NULL;
-}
+    if ( m_childView )
+    {
+        // 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() )
+        {
+            event.Veto();
+            return false;
+        }

 
 

+        m_childView->Activate(false);

 
 

-/*
- * File history processor
- */
+        // 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);
+    }

 
 

-wxFileHistory::wxFileHistory(int maxFiles)
-{
-  m_fileMaxFiles = maxFiles;
-  m_fileHistoryN = 0;
-  m_fileHistory = new char *[m_fileMaxFiles];
+    m_childDocument = NULL;
+
+    return true;

 }
 
 }
 

-wxFileHistory::~wxFileHistory(void)
+// ----------------------------------------------------------------------------
+// wxDocParentFrameAnyBase
+// ----------------------------------------------------------------------------
+
+#if wxUSE_PRINTING_ARCHITECTURE
+
+wxDocPrintout::wxDocPrintout(wxView *view, const wxString& title)
+             : wxPrintout(title)

 {
 {

-  int i;
-  for (i = 0; i < m_fileHistoryN; i++)
-    delete[] m_fileHistory[i];
-  delete[] m_fileHistory;
+    m_printoutView = view;

 }
 
 }
 

-// 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++)
-  {
-      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.
-  
-  // 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] = (char *) 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 ++;
-  }
-  // Shuffle filenames down
-  for (i = (m_fileHistoryN-1); i > 0; i--)
-  {
-    m_fileHistory[i] = m_fileHistory[i-1];
-  }
-  m_fileHistory[0] = copystring(file);
-
-  for (i = 0; i < m_fileHistoryN; i++)
-    if (m_fileHistory[i])
+bool wxDocPrintout::OnPrintPage(int WXUNUSED(page))
+{
+    wxDC *dc = GetDC();
+
+    // 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
+    // but in fact is too small for some reason. This is a detail that will
+    // need to be addressed at some point but can be fudged for the
+    // moment.
+    float scale = (float)((float)ppiPrinterX/(float)ppiScreenX);
+
+    // Now we have to check in case our real page size is reduced
+    // (e.g. because we're drawing to a print preview memory DC)
+    int pageWidth, pageHeight;
+    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.
+    float overallScale = scale * (float)(w/(float)pageWidth);
+    dc->SetUserScale(overallScale, overallScale);
+
+    if (m_printoutView)

     {
     {

-      char buf[400];
-      sprintf(buf, "&%d %s", 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();
-      }
+        m_printoutView->OnDraw(dc);

     }
     }

+    return true;

 }
 
 }
 

-wxString wxFileHistory::GetHistoryFile(int i) const
+bool wxDocPrintout::HasPage(int pageNum)

 {
 {

-  if (i < m_fileHistoryN)
-    return wxString(m_fileHistory[i]);
-  else
-    return wxString("");
+    return (pageNum == 1);

 }
 
 }
 

-void wxFileHistory::UseMenu(wxMenu *menu)
+bool wxDocPrintout::OnBeginDocument(int startPage, int endPage)

 {
 {

-  if (!m_fileMenus.Member(menu))
-    m_fileMenus.Append(menu);
-}
+    if (!wxPrintout::OnBeginDocument(startPage, endPage))
+        return false;

 
 

-void wxFileHistory::RemoveMenu(wxMenu *menu)
-{
-  m_fileMenus.DeleteObject(menu);
+    return true;

 }
 
 }
 

-void wxFileHistory::Load(wxConfigBase& config)
+void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage,
+                                int *selPageFrom, int *selPageTo)

 {
 {

-  m_fileHistoryN = 0;
-  char buf[400];
-  sprintf(buf, "file%d", m_fileHistoryN+1);
-  wxString historyFile("");
-  while ((m_fileHistoryN <= m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != ""))
-  {
-    m_fileHistory[m_fileHistoryN] = copystring((const char*) historyFile);
-    m_fileHistoryN ++;
-    sprintf(buf, "file%d", m_fileHistoryN+1);
-    historyFile = "";
-  }
-  AddFilesToMenu();
+    *minPage = 1;
+    *maxPage = 1;
+    *selPageFrom = 1;
+    *selPageTo = 1;

 }
 
 }
 

-void wxFileHistory::Save(wxConfigBase& config)
-{
-  int i;
-  for (i = 0; i < m_fileHistoryN; i++)
-  {
-    wxString buf;
-    buf.Printf("file%d", i+1);
-    config.Write(buf, wxString(m_fileHistory[i]));
-  }
-}
+#endif // wxUSE_PRINTING_ARCHITECTURE
+
+// ----------------------------------------------------------------------------
+// Permits compatibility with existing file formats and functions that
+// manipulate files directly
+// ----------------------------------------------------------------------------
+
+#if wxUSE_STD_IOSTREAM

 
 

-void wxFileHistory::AddFilesToMenu()
+bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream)

 {
 {

-    if (m_fileHistoryN > 0)
+#if wxUSE_FFILE
+    wxFFile file(filename, wxT("rb"));
+#elif wxUSE_FILE
+    wxFile file(filename, wxFile::read);
+#endif
+    if ( !file.IsOpened() )
+        return false;
+
+    char buf[4096];
+
+    size_t nRead;
+    do

     {
     {

-        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("&%d %s", i+1, m_fileHistory[i]);
-                    menu->Append(wxID_FILE1+i, buf);
-                }
-            }
-            node = node->Next();
-        }
+        nRead = file.Read(buf, WXSIZEOF(buf));
+        if ( file.Error() )
+            return false;
+
+        stream.write(buf, nRead);
+        if ( !stream )
+            return false;

     }
     }

+    while ( !file.Eof() );
+
+    return true;

 }
 
 }
 

-void wxFileHistory::AddFilesToMenu(wxMenu* menu)
+bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename)

 {
 {

-    if (m_fileHistoryN > 0)
+#if wxUSE_FFILE
+    wxFFile file(filename, wxT("wb"));
+#elif wxUSE_FILE
+    wxFile file(filename, wxFile::write);
+#endif
+    if ( !file.IsOpened() )
+        return false;
+
+    char buf[4096];
+    do

     {
     {

-        menu->AppendSeparator();
-        int i;
-        for (i = 0; i < m_fileHistoryN; i++)
+        stream.read(buf, WXSIZEOF(buf));
+        if ( !stream.bad() ) // fail may be set on EOF, don't use operator!()

         {
         {

-            if (m_fileHistory[i])
-            {
-                wxString buf;
-                buf.Printf("&%d %s", i+1, m_fileHistory[i]);
-                menu->Append(wxID_FILE1+i, buf);
-            }
+            if ( !file.Write(buf, stream.gcount()) )
+                return false;

         }
     }
         }
     }

-}
-
-#if 0
-/*
- * wxPrintInfo
- */
+    while ( !stream.eof() );

 
 

-wxPrintInfo::wxPrintInfo(void)
-{
-  pageNumber = 1;
+    return true;

 }
 
 }
 

-wxPrintInfo::~wxPrintInfo(void)
+#else // !wxUSE_STD_IOSTREAM
+
+bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream)

 {
 {

-}
+#if wxUSE_FFILE
+    wxFFile file(filename, wxT("rb"));
+#elif wxUSE_FILE
+    wxFile file(filename, wxFile::read);

 #endif
 #endif

+    if ( !file.IsOpened() )
+        return false;

 
 

-/*
- * Permits compatibility with existing file formats and functions
- * that manipulate files directly
- */
- 
-bool wxTransferFileToStream(const wxString& filename, ostream& stream)
-{
-  FILE *fd1;
-  int ch;
+    char buf[4096];

 
 

-  if ((fd1 = fopen (WXSTRINGCAST filename, "rb")) == NULL)
-    return FALSE;
+    size_t nRead;
+    do
+    {
+        nRead = file.Read(buf, WXSIZEOF(buf));
+        if ( file.Error() )
+            return false;

 
 

-  while ((ch = getc (fd1)) != EOF)
-    stream << (unsigned char)ch;
+        stream.Write(buf, nRead);
+        if ( !stream )
+            return false;
+    }
+    while ( !file.Eof() );

 
 

-  fclose (fd1);
-  return TRUE;
+    return true;

 }
 
 }
 

-bool wxTransferStreamToFile(istream& stream, const wxString& filename)
+bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename)

 {
 {

-  FILE *fd1;
-  int ch;
+#if wxUSE_FFILE
+    wxFFile file(filename, wxT("wb"));
+#elif wxUSE_FILE
+    wxFile file(filename, wxFile::write);
+#endif
+    if ( !file.IsOpened() )
+        return false;

 
 

-  if ((fd1 = fopen (WXSTRINGCAST filename, "wb")) == NULL)
+    char buf[4096];
+    for ( ;; )

     {
     {

-      return FALSE;
+        stream.Read(buf, WXSIZEOF(buf));
+
+        const size_t nRead = stream.LastRead();
+        if ( !nRead )
+        {
+            if ( stream.Eof() )
+                break;
+
+            return false;
+        }
+
+        if ( !file.Write(buf, nRead) )
+            return false;

     }
 
     }
 

-  while (!stream.eof())
-  {
-    ch = stream.get();
-    if (!stream.eof())
-      putc (ch, fd1);
-  }
-  fclose (fd1);
-  return TRUE;
+    return true;

 }
 
 }
 

-#endif
-  // End wxUSE_DOC_VIEW_ARCHITECTURE
+#endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM
+
+#endif // wxUSE_DOC_VIEW_ARCHITECTURE