Add missing WXK constants for the control keys

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 11d6bca96d17631d078784eb03f53a22d11893c3..8ed6b129aaf1deb94fd699058af14ef691ef78c4 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -60,6 +60,7 @@
 #include "wx/vector.h"
 #include "wx/scopedarray.h"
 #include "wx/scopedptr.h"
 #include "wx/vector.h"
 #include "wx/scopedarray.h"
 #include "wx/scopedptr.h"

+#include "wx/scopeguard.h"

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


@@ -92,8 +93,6 @@ IMPLEMENT_CLASS(wxDocParentFrame, wxFrame)
     IMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout)
 #endif
 
     IMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout)
 #endif
 

-IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -115,18 +114,6 @@ wxString FindExtension(const wxString& path)
     return ext.MakeLower();
 }
 
     return ext.MakeLower();
 }
 

-// return the string used for the MRU list items in the menu
-//
-// NB: the index n is 0-based, as usual, but the strings start from 1
-wxString GetMRUEntryLabel(int n, const wxString& path)
-{
-    // we need to quote '&' characters which are used for mnemonics
-    wxString pathInMenu(path);
-    pathInMenu.Replace("&", "&&");
-
-    return wxString::Format("&%d %s", n + 1, pathInMenu);
-}
-

 } // anonymous namespace
 
 // ----------------------------------------------------------------------------
 } // anonymous namespace
 
 // ----------------------------------------------------------------------------


@@ -136,8 +123,12 @@ wxString GetMRUEntryLabel(int n, const wxString& path)
 wxDocument::wxDocument(wxDocument *parent)
 {
     m_documentModified = false;
 wxDocument::wxDocument(wxDocument *parent)
 {
     m_documentModified = false;

-    m_documentParent = parent;

     m_documentTemplate = NULL;
     m_documentTemplate = NULL;

+
+    m_documentParent = parent;
+    if ( parent )
+        parent->m_childDocuments.push_back(this);
+

     m_commandProcessor = NULL;
     m_savedYet = false;
 }
     m_commandProcessor = NULL;
     m_savedYet = false;
 }


@@ -149,13 +140,14 @@ bool wxDocument::DeleteContents()
 
 wxDocument::~wxDocument()
 {
 
 wxDocument::~wxDocument()
 {

-    DeleteContents();
-

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

+    if ( m_documentParent )
+        m_documentParent->m_childDocuments.remove(this);
+

     // Not safe to do here, since it'll invoke virtual view functions
     // expecting to see valid derived objects: and by the time we get here,
     // we've called destructors higher up.
     // 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.


@@ -167,6 +159,40 @@ bool wxDocument::Close()
     if ( !OnSaveModified() )
         return false;
 
     if ( !OnSaveModified() )
         return false;
 

+    // When the parent document closes, its children must be closed as well as
+    // they can't exist without the parent.
+
+    // As usual, first check if all children can be closed.
+    DocsList::const_iterator it = m_childDocuments.begin();
+    for ( DocsList::const_iterator end = m_childDocuments.end(); it != end; ++it )
+    {
+        if ( !(*it)->OnSaveModified() )
+        {
+            // Leave the parent document opened if a child can't close.
+            return false;
+        }
+    }
+
+    // Now that they all did, do close them: as m_childDocuments is modified as
+    // we iterate over it, don't use the usual for-style iteration here.
+    while ( !m_childDocuments.empty() )
+    {
+        wxDocument * const childDoc = m_childDocuments.front();
+
+        // This will call OnSaveModified() once again but it shouldn't do
+        // anything as the document was just saved or marked as not needing to
+        // be saved by the call to OnSaveModified() that returned true above.
+        if ( !childDoc->Close() )
+        {
+            wxFAIL_MSG( "Closing the child document unexpectedly failed "
+                        "after its OnSaveModified() returned true" );
+        }
+
+        // Delete the child document by deleting all its views.
+        childDoc->DeleteAllViews();
+    }
+
+

     return OnCloseDocument();
 }
 
     return OnCloseDocument();
 }
 


@@ -233,8 +259,26 @@ wxView *wxDocument::GetFirstView() const
     return static_cast<wxView *>(m_documentViews.GetFirst()->GetData());
 }
 
     return static_cast<wxView *>(m_documentViews.GetFirst()->GetData());
 }
 

+void wxDocument::Modify(bool mod)
+{
+    if (mod != m_documentModified)
+    {
+        m_documentModified = mod;
+
+        // Allow views to append asterix to the title
+        wxView* view = GetFirstView();
+        if (view) view->OnChangeFilename();
+    }
+}
+

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

+    // For child documents we use the same document manager as the parent, even
+    // though we don't have our own template (as children are not opened/saved
+    // directly).
+    if ( m_documentParent )
+        return m_documentParent->GetDocumentManager();
+

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


@@ -327,15 +371,6 @@ bool wxDocument::SaveAs()
     if (fileName.empty())
         return false; // cancelled by user
 
     if (fileName.empty())
         return false; // cancelled by user
 

-    wxString ext;
-    wxFileName::SplitPath(fileName, NULL, NULL, &ext);
-
-    if (ext.empty())
-    {
-        fileName += wxT(".");
-        fileName += docTemplate->GetDefaultExtension();
-    }
-

     // Files that were not saved correctly are not added to the FileHistory.
     if (!OnSaveDocument(fileName))
         return false;
     // Files that were not saved correctly are not added to the FileHistory.
     if (!OnSaveDocument(fileName))
         return false;


@@ -343,16 +378,16 @@ bool wxDocument::SaveAs()
     SetTitle(wxFileNameFromPath(fileName));
     SetFilename(fileName, true);    // will call OnChangeFileName automatically
 
     SetTitle(wxFileNameFromPath(fileName));
     SetFilename(fileName, true);    // will call OnChangeFileName automatically
 

-   // A file that doesn't use the default extension of its document template
-   // cannot be opened via the FileHistory, so we do not add it.
-   if (docTemplate->FileMatchesTemplate(fileName))
-   {
-       GetDocumentManager()->AddFileToHistory(fileName);
-   }
-   //else: the user will probably not be able to open the file again, so we
-   //      could warn about the wrong file-extension here
+    // A file that doesn't use the default extension of its document template
+    // cannot be opened via the FileHistory, so we do not add it.
+    if (docTemplate->FileMatchesTemplate(fileName))
+    {
+        GetDocumentManager()->AddFileToHistory(fileName);
+    }
+    //else: the user will probably not be able to open the file again, so we
+    //      could warn about the wrong file-extension here

 
 

-   return true;
+    return true;

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


@@ -363,6 +398,9 @@ bool wxDocument::OnSaveDocument(const wxString& file)
     if ( !DoSaveDocument(file) )
         return false;
 
     if ( !DoSaveDocument(file) )
         return false;
 

+    if ( m_commandProcessor )
+        m_commandProcessor->MarkAsSaved();
+

     Modify(false);
     SetFilename(file);
     SetDocumentSaved(true);
     Modify(false);
     SetFilename(file);
     SetDocumentSaved(true);


@@ -415,7 +453,22 @@ wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream)
 
 bool wxDocument::Revert()
 {
 
 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;

 }
 
 
 }
 
 


@@ -423,7 +476,7 @@ bool wxDocument::Revert()
 #if WXWIN_COMPATIBILITY_2_8
 bool wxDocument::GetPrintableName(wxString& buf) const
 {
 #if WXWIN_COMPATIBILITY_2_8
 bool wxDocument::GetPrintableName(wxString& buf) const
 {

-    // this function can not only be overridden by the user code but also
+    // this function cannot only be overridden by the user code but also

     // called by it so we need to ensure that we return the same thing as
     // GetUserReadableName() but we can't call it because this would result in
     // an infinite recursion, hence we use the helper DoGetUserReadableName()
     // 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()


@@ -648,7 +701,8 @@ wxView::wxView()
 
 wxView::~wxView()
 {
 
 wxView::~wxView()
 {

-    GetDocumentManager()->ActivateView(this, false);
+    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
 
     // reset our frame view first, before removing it from the document as
     // SetView(NULL) is a simple call while RemoveView() may result in user


@@ -684,7 +738,7 @@ void wxView::SetDocChildFrame(wxDocChildFrameAnyBase *docChildFrame)
 bool wxView::TryBefore(wxEvent& event)
 {
     wxDocument * const doc = GetDocument();
 bool wxView::TryBefore(wxEvent& event)
 {
     wxDocument * const doc = GetDocument();

-    return doc && doc->ProcessEventHere(event);
+    return doc && doc->ProcessEventLocally(event);

 }
 
 void wxView::OnActivateView(bool WXUNUSED(activate),
 }
 
 void wxView::OnActivateView(bool WXUNUSED(activate),


@@ -713,7 +767,12 @@ void wxView::OnChangeFilename()
     wxDocument *doc = GetDocument();
     if (!doc) return;
 
     wxDocument *doc = GetDocument();
     if (!doc) return;
 

-    win->SetLabel(doc->GetUserReadableName());
+    wxString label = doc->GetUserReadableName();
+    if (doc->IsModified())
+    {
+       label += "*";
+    }
+    win->SetLabel(label);

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


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

+    wxScopeGuard g = wxMakeObjGuard(*doc, &wxDocument::DeleteAllViews);
+

     doc->SetFilename(path);
     doc->SetDocumentTemplate(this);
     GetDocumentManager()->AddDocument(doc);
     doc->SetCommandProcessor(doc->OnCreateCommandProcessor());
 
     doc->SetFilename(path);
     doc->SetDocumentTemplate(this);
     GetDocumentManager()->AddDocument(doc);
     doc->SetCommandProcessor(doc->OnCreateCommandProcessor());
 

-    if (doc->OnCreate(path, flags))
-        return true;
+    if ( !doc->OnCreate(path, flags) )
+        return false;

 
 

-    if (GetDocumentManager()->GetDocuments().Member(doc))
-        doc->DeleteAllViews();
-    return false;
+    g.Dismiss(); // no need to call DeleteAllViews() anymore
+
+    return true;

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


@@ -876,31 +937,37 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
     EVT_MENU(wxID_UNDO, wxDocManager::OnUndo)
     EVT_MENU(wxID_REDO, wxDocManager::OnRedo)
 
     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_OPEN, wxDocManager::OnUpdateFileOpen)
     EVT_UPDATE_UI(wxID_CLOSE, wxDocManager::OnUpdateDisableIfNoDoc)
     EVT_UPDATE_UI(wxID_CLOSE_ALL, wxDocManager::OnUpdateDisableIfNoDoc)

-    EVT_UPDATE_UI(wxID_REVERT, 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_NEW, wxDocManager::OnUpdateFileNew)
     EVT_UPDATE_UI(wxID_SAVE, wxDocManager::OnUpdateFileSave)

-    EVT_UPDATE_UI(wxID_SAVEAS, wxDocManager::OnUpdateDisableIfNoDoc)
+    EVT_UPDATE_UI(wxID_SAVEAS, wxDocManager::OnUpdateFileSaveAs)

     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_PREVIEW, wxDocManager::OnPreview)
     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_PREVIEW, wxDocManager::OnPreview)

+    EVT_MENU(wxID_PRINT_SETUP, wxDocManager::OnPageSetup)

 
     EVT_UPDATE_UI(wxID_PRINT, wxDocManager::OnUpdateDisableIfNoDoc)
     EVT_UPDATE_UI(wxID_PREVIEW, wxDocManager::OnUpdateDisableIfNoDoc)
 
     EVT_UPDATE_UI(wxID_PRINT, wxDocManager::OnUpdateDisableIfNoDoc)
     EVT_UPDATE_UI(wxID_PREVIEW, wxDocManager::OnUpdateDisableIfNoDoc)

-#endif
+    // NB: we keep "Print setup" menu item always enabled as it can be used
+    //     even without an active document
+#endif // wxUSE_PRINTING_ARCHITECTURE

 END_EVENT_TABLE()
 
 wxDocManager* wxDocManager::sm_docManager = NULL;
 
 wxDocManager::wxDocManager(long WXUNUSED(flags), bool initialize)
 {
 END_EVENT_TABLE()
 
 wxDocManager* wxDocManager::sm_docManager = NULL;
 
 wxDocManager::wxDocManager(long WXUNUSED(flags), bool initialize)
 {

-    wxASSERT_MSG( !sm_docManager, "multiple wxDocManagers not allowed" );
-

     sm_docManager = this;
 
     m_defaultDocumentNameCounter = 1;
     sm_docManager = this;
 
     m_defaultDocumentNameCounter = 1;


@@ -980,12 +1047,35 @@ bool wxDocManager::Initialize()
 
 wxString wxDocManager::GetLastDirectory() const
 {
 
 wxString wxDocManager::GetLastDirectory() const
 {

-    // use the system-dependent default location for the document files if
-    // we're being opened for the first time
+    // if we haven't determined the last used directory yet, do it now

     if ( m_lastDirectory.empty() )
     {
     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);
         wxDocManager * const self = const_cast<wxDocManager *>(this);

-        self->m_lastDirectory = wxStandardPaths::Get().GetAppDocumentsDir();
+
+        // 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;
     }
 
     return m_lastDirectory;


@@ -999,14 +1089,8 @@ wxFileHistory *wxDocManager::OnCreateFileHistory()
 void wxDocManager::OnFileClose(wxCommandEvent& WXUNUSED(event))
 {
     wxDocument *doc = GetCurrentDocument();
 void wxDocManager::OnFileClose(wxCommandEvent& WXUNUSED(event))
 {
     wxDocument *doc = GetCurrentDocument();

-    if (!doc)
-        return;
-    if (doc->Close())
-    {
-        doc->DeleteAllViews();
-        if (m_docs.Member(doc))
-            delete doc;
-    }
+    if (doc)
+        CloseDocument(doc);

 }
 
 void wxDocManager::OnFileCloseAll(wxCommandEvent& WXUNUSED(event))
 }
 
 void wxDocManager::OnFileCloseAll(wxCommandEvent& WXUNUSED(event))


@@ -1051,9 +1135,58 @@ void wxDocManager::OnFileSaveAs(wxCommandEvent& WXUNUSED(event))
     doc->SaveAs();
 }
 
     doc->SaveAs();
 }
 

-void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
+void wxDocManager::OnMRUFile(wxCommandEvent& event)
+{
+    // Check if the id is in the range assigned to MRU list entries.
+    const int id = event.GetId();
+    if ( id >= wxID_FILE1 &&
+            id < wxID_FILE1 + static_cast<int>(m_fileHistory->GetCount()) )
+    {
+        DoOpenMRUFile(id - wxID_FILE1);
+    }
+    else
+    {
+        event.Skip();
+    }
+}
+
+void wxDocManager::DoOpenMRUFile(unsigned n)

 {
 {

+    wxString filename(GetHistoryFile(n));
+    if ( filename.empty() )
+        return;
+
+    wxString errMsg; // must contain exactly one "%s" if non-empty
+    if ( wxFile::Exists(filename) )
+    {
+        // Try to open it but don't give an error if it failed: this could be
+        // normal, e.g. because the user cancelled opening it, and we don't
+        // have any useful information to put in the error message anyhow, so
+        // we assume that in case of an error the appropriate message had been
+        // already logged.
+        (void)CreateDocument(filename, wxDOC_SILENT);
+    }
+    else // file doesn't exist
+    {
+        OnMRUFileNotExist(n, filename);
+    }
+}
+
+void wxDocManager::OnMRUFileNotExist(unsigned n, const wxString& filename)
+{
+    // remove the file which we can't open from the MRU list
+    RemoveFileFromHistory(n);
+
+    // and tell the user about it
+    wxLogError(_("The file '%s' doesn't exist and couldn't be opened.\n"
+                 "It has been removed from the most recently used files list."),
+               filename);
+}
+

 #if wxUSE_PRINTING_ARCHITECTURE
 #if wxUSE_PRINTING_ARCHITECTURE

+
+void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
+{

     wxView *view = GetActiveView();
     if (!view)
         return;
     wxView *view = GetActiveView();
     if (!view)
         return;


@@ -1061,17 +1194,33 @@ void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
     wxPrintout *printout = view->OnCreatePrintout();
     if (printout)
     {
     wxPrintout *printout = view->OnCreatePrintout();
     if (printout)
     {

-        wxPrinter printer;
+        wxPrintDialogData printDialogData(m_pageSetupDialogData.GetPrintData());
+        wxPrinter printer(&printDialogData);

         printer.Print(view->GetFrame(), printout, true);
 
         delete printout;
     }
         printer.Print(view->GetFrame(), printout, true);
 
         delete printout;
     }

-#endif // wxUSE_PRINTING_ARCHITECTURE
+}
+
+void wxDocManager::OnPageSetup(wxCommandEvent& WXUNUSED(event))
+{
+    wxPageSetupDialog dlg(wxTheApp->GetTopWindow(), &m_pageSetupDialogData);
+    if ( dlg.ShowModal() == wxID_OK )
+    {
+        m_pageSetupDialogData = dlg.GetPageSetupData();
+    }
+}
+
+wxPreviewFrame* wxDocManager::CreatePreviewFrame(wxPrintPreviewBase* preview,
+                                                 wxWindow *parent,
+                                                 const wxString& title)
+{
+    return new wxPreviewFrame(preview, parent, title);

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

-#if wxUSE_PRINTING_ARCHITECTURE
+    wxBusyCursor busy;

     wxView *view = GetActiveView();
     if (!view)
         return;
     wxView *view = GetActiveView();
     if (!view)
         return;


@@ -1079,25 +1228,31 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
     wxPrintout *printout = view->OnCreatePrintout();
     if (printout)
     {
     wxPrintout *printout = view->OnCreatePrintout();
     if (printout)
     {

+        wxPrintDialogData printDialogData(m_pageSetupDialogData.GetPrintData());
+

         // Pass two printout objects: for preview, and possible printing.
         wxPrintPreviewBase *
         // Pass two printout objects: for preview, and possible printing.
         wxPrintPreviewBase *

-            preview = new wxPrintPreview(printout, view->OnCreatePrintout());
-        if ( !preview->Ok() )
+            preview = new wxPrintPreview(printout,
+                                         view->OnCreatePrintout(),
+                                         &printDialogData);
+        if ( !preview->IsOk() )

         {
             delete preview;
             wxLogError(_("Print preview creation failed."));
             return;
         }
 
         {
             delete preview;
             wxLogError(_("Print preview creation failed."));
             return;
         }
 

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

         frame->Centre(wxBOTH);
         frame->Initialize();
         frame->Show(true);
     }
         frame->Centre(wxBOTH);
         frame->Initialize();
         frame->Show(true);
     }

-#endif // wxUSE_PRINTING_ARCHITECTURE

 }
 }

+#endif // wxUSE_PRINTING_ARCHITECTURE

 
 void wxDocManager::OnUndo(wxCommandEvent& event)
 {
 
 void wxDocManager::OnUndo(wxCommandEvent& event)
 {


@@ -1137,6 +1292,12 @@ void wxDocManager::OnUpdateDisableIfNoDoc(wxUpdateUIEvent& event)
     event.Enable( GetCurrentDocument() != NULL );
 }
 
     event.Enable( GetCurrentDocument() != NULL );
 }
 

+void wxDocManager::OnUpdateFileRevert(wxUpdateUIEvent& event)
+{
+    wxDocument* doc = GetCurrentDocument();
+    event.Enable(doc && doc->IsModified() && doc->GetDocumentSaved());
+}
+

 void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event)
 {
     // CreateDocument() (which is called from OnFileNew) may succeed
 void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event)
 {
     // CreateDocument() (which is called from OnFileNew) may succeed


@@ -1147,7 +1308,13 @@ void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event)
 void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event)
 {
     wxDocument * const doc = GetCurrentDocument();
 void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event)
 {
     wxDocument * const doc = GetCurrentDocument();

-    event.Enable( doc && !doc->AlreadySaved() );
+    event.Enable( doc && !doc->IsChildDocument() && !doc->AlreadySaved() );
+}
+
+void wxDocManager::OnUpdateFileSaveAs(wxUpdateUIEvent& event)
+{
+    wxDocument * const doc = GetCurrentDocument();
+    event.Enable( doc && !doc->IsChildDocument() );

 }
 
 void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event)
 }
 
 void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event)


@@ -1155,10 +1322,14 @@ void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event)
     wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor();
     if ( !cmdproc )
     {
     wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor();
     if ( !cmdproc )
     {

-        event.Enable(false);
+        // If we don't have any document at all, the menu item should really be
+        // disabled.
+        if ( !GetCurrentDocument() )
+            event.Enable(false);
+        else // But if we do have it, it might handle wxID_UNDO on its own
+            event.Skip();

         return;
     }
         return;
     }

-

     event.Enable(cmdproc->CanUndo());
     cmdproc->SetMenuStrings();
 }
     event.Enable(cmdproc->CanUndo());
     cmdproc->SetMenuStrings();
 }


@@ -1168,10 +1339,13 @@ void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event)
     wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor();
     if ( !cmdproc )
     {
     wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor();
     if ( !cmdproc )
     {

-        event.Enable(false);
+        // Use same logic as in OnUpdateUndo() above.
+        if ( !GetCurrentDocument() )
+            event.Enable(false);
+        else
+            event.Skip();

         return;
     }
         return;
     }

-

     event.Enable(cmdproc->CanRedo());
     cmdproc->SetMenuStrings();
 }
     event.Enable(cmdproc->CanRedo());
     cmdproc->SetMenuStrings();
 }


@@ -1203,7 +1377,7 @@ wxView *wxDocManager::GetActiveView() const
 bool wxDocManager::TryBefore(wxEvent& event)
 {
     wxView * const view = GetActiveView();
 bool wxDocManager::TryBefore(wxEvent& event)
 {
     wxView * const view = GetActiveView();

-    return view && view->ProcessEventHere(event);
+    return view && view->ProcessEventLocally(event);

 }
 
 namespace
 }
 
 namespace


@@ -1235,6 +1409,17 @@ wxDocTemplates GetVisibleTemplates(const wxList& allTemplates)
 
 } // anonymous namespace
 
 
 } // anonymous namespace
 

+void wxDocManager::ActivateDocument(wxDocument *doc)
+{
+    wxView * const view = doc->GetFirstView();
+    if ( !view )
+        return;
+
+    view->Activate(true);
+    if ( wxWindow *win = view->GetFrame() )
+        win->Raise();
+}
+

 wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)
 {
     // this ought to be const but SelectDocumentType/Path() are not
 wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)
 {
     // this ought to be const but SelectDocumentType/Path() are not


@@ -1289,13 +1474,8 @@ wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)
             if ( fn == doc->GetFilename() )
             {
                 // file already open, just activate it and return
             if ( fn == doc->GetFilename() )
             {
                 // file already open, just activate it and return

-                if ( doc->GetFirstView() )
-                {
-                    ActivateView(doc->GetFirstView());
-                    if ( doc->GetDocumentWindow() )
-                        doc->GetDocumentWindow()->SetFocus();
-                    return doc;
-                }
+                ActivateDocument(doc);
+                return doc;

             }
         }
     }
             }
         }
     }


@@ -1342,6 +1522,11 @@ wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)
     if ( !(flags & wxDOC_NEW) && temp->FileMatchesTemplate(path) )
         AddFileToHistory(path);
 
     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;
 }
 
     return docNew;
 }
 


@@ -1562,7 +1747,8 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
                                         GetLastDirectory(),
                                         wxEmptyString,
                                         &FilterIndex,
                                         GetLastDirectory(),
                                         wxEmptyString,
                                         &FilterIndex,

-                                        descrBuf);
+                                        descrBuf,
+                                        wxFD_OPEN | wxFD_FILE_MUST_EXIST);

 
     wxDocTemplate *theTemplate = NULL;
     if (!pathTmp.empty())
 
     wxDocTemplate *theTemplate = NULL;
     if (!pathTmp.empty())


@@ -1775,6 +1961,20 @@ void wxDocManager::DisassociateTemplate(wxDocTemplate *temp)
     m_templates.DeleteObject(temp);
 }
 
     m_templates.DeleteObject(temp);
 }
 

+wxDocTemplate* wxDocManager::FindTemplate(const wxClassInfo* classinfo)
+{
+   for ( wxList::compatibility_iterator node = m_templates.GetFirst();
+         node;
+         node = node->GetNext() )
+   {
+      wxDocTemplate* t = wxStaticCast(node->GetData(), wxDocTemplate);
+      if ( t->GetDocClassInfo() == classinfo )
+         return t;
+   }
+
+   return NULL;
+}
+

 // Add and remove a document from the manager's list
 void wxDocManager::AddDocument(wxDocument *doc)
 {
 // Add and remove a document from the manager's list
 void wxDocManager::AddDocument(wxDocument *doc)
 {


@@ -1813,7 +2013,9 @@ bool wxDocChildFrameAnyBase::CloseView(wxCloseEvent& event)
 {
     if ( m_childView )
     {
 {
     if ( m_childView )
     {

-        if ( event.CanVeto() && !m_childView->Close(false) )
+        // 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;
         {
             event.Veto();
             return false;


@@ -1827,8 +2029,7 @@ bool wxDocChildFrameAnyBase::CloseView(wxCloseEvent& event)
         // deleted directly not by us as indicated by its doc child frame
         // pointer still being set
         m_childView->SetDocChildFrame(NULL);
         // deleted directly not by us as indicated by its doc child frame
         // pointer still being set
         m_childView->SetDocChildFrame(NULL);

-        delete m_childView;
-        m_childView = NULL;
+        wxDELETE(m_childView);

     }
 
     m_childDocument = NULL;
     }
 
     m_childDocument = NULL;


@@ -1837,109 +2038,32 @@ bool wxDocChildFrameAnyBase::CloseView(wxCloseEvent& event)
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// Default parent frame
+// wxDocParentFrameAnyBase

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-BEGIN_EVENT_TABLE(wxDocParentFrame, wxFrame)
-    EVT_MENU(wxID_EXIT, wxDocParentFrame::OnExit)
-    EVT_MENU_RANGE(wxID_FILE1, wxID_FILE9, wxDocParentFrame::OnMRUFile)
-    EVT_CLOSE(wxDocParentFrame::OnCloseWindow)
-END_EVENT_TABLE()
-
-wxDocParentFrame::wxDocParentFrame()
-{
-    m_docManager = NULL;
-}
-
-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;
-}
-
-bool wxDocParentFrame::Create(wxDocManager *manager,
-                              wxFrame *frame,
-                              wxWindowID id,
-                              const wxString& title,
-                              const wxPoint& pos,
-                              const wxSize& size,
-                              long style,
-                              const wxString& name)
-{
-    m_docManager = manager;
-    return base_type::Create(frame, id, title, pos, size, style, name);
-}
+#if wxUSE_PRINTING_ARCHITECTURE

 
 

-void wxDocParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
+namespace

 {
 {

-    Close();
-}

 
 

-void wxDocParentFrame::OnMRUFile(wxCommandEvent& event)
+wxString GetAppropriateTitle(const wxView *view, const wxString& titleGiven)

 {
 {

-    int n = event.GetId() - wxID_FILE1;  // the index in MRU list
-    wxString filename(m_docManager->GetHistoryFile(n));
-    if ( filename.empty() )
-        return;
-
-    wxString errMsg; // must contain exactly one "%s" if non-empty
-    if ( wxFile::Exists(filename) )
-    {
-        // try to open it
-        if ( m_docManager->CreateDocument(filename, wxDOC_SILENT) )
-            return;
-
-        errMsg = _("The file '%s' couldn't be opened.");
-    }
-    else // file doesn't exist
+    wxString title(titleGiven);
+    if ( title.empty() )

     {
     {

-        errMsg = _("The file '%s' doesn't exist and couldn't be opened.");
+        if ( view && view->GetDocument() )
+            title = view->GetDocument()->GetUserReadableName();
+        else
+            title = _("Printout");

     }
 
     }
 

-
-    wxASSERT_MSG( !errMsg.empty(), "should have an error message" );
-
-    // remove the file which we can't open from the MRU list
-    m_docManager->RemoveFileFromHistory(n);
-
-    // and tell the user about it
-    wxLogError(errMsg + '\n' +
-               _("It has been removed from the most recently used files list."),
-               filename);
-}
-
-// Extend event processing to search the view's event table
-bool wxDocParentFrame::TryBefore(wxEvent& event)
-{
-    if ( m_docManager && m_docManager->ProcessEventHere(event) )
-        return true;
-
-    return wxFrame::TryBefore(event);
-}
-
-// Define the behaviour for the frame closing
-// - must delete all frames except for the main one.
-void wxDocParentFrame::OnCloseWindow(wxCloseEvent& event)
-{
-    if (m_docManager->Clear(!event.CanVeto()))
-    {
-        Destroy();
-    }
-    else
-        event.Veto();
+    return title;

 }
 
 }
 

-#if wxUSE_PRINTING_ARCHITECTURE
+} // anonymous namespace

 
 wxDocPrintout::wxDocPrintout(wxView *view, const wxString& title)
 
 wxDocPrintout::wxDocPrintout(wxView *view, const wxString& title)

-             : wxPrintout(title)
+             : wxPrintout(GetAppropriateTitle(view, title))

 {
     m_printoutView = view;
 }
 {
     m_printoutView = view;
 }


@@ -2007,203 +2131,6 @@ void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage,
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
 

-// ----------------------------------------------------------------------------
-// File history (a.k.a. MRU, most recently used, files list)
-// ----------------------------------------------------------------------------
-
-wxFileHistory::wxFileHistory(size_t maxFiles, wxWindowID idBase)
-{
-    m_fileMaxFiles = maxFiles;
-    m_idBase = idBase;
-}
-
-void wxFileHistory::AddFileToHistory(const wxString& file)
-{
-    // check if we don't already have this file
-    const wxFileName fnNew(file);
-    size_t i,
-           numFiles = m_fileHistory.size();
-    for ( i = 0; i < numFiles; i++ )
-    {
-        if ( fnNew == m_fileHistory[i] )
-        {
-            // we do have it, move it to the top of the history
-            RemoveFileFromHistory(i);
-            numFiles--;
-            break;
-        }
-    }
-
-    // if we already have a full history, delete the one at the end
-    if ( numFiles == m_fileMaxFiles )
-    {
-        RemoveFileFromHistory(--numFiles);
-    }
-
-    // add a new menu item to all file menus (they will be updated below)
-    for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst();
-        node;
-        node = node->GetNext() )
-    {
-        wxMenu * const menu = (wxMenu *)node->GetData();
-
-        if ( !numFiles && menu->GetMenuItemCount() )
-            menu->AppendSeparator();
-
-        // label doesn't matter, it will be set below anyhow, but it can't
-        // be empty (this is supposed to indicate a stock item)
-        menu->Append(m_idBase + numFiles, " ");
-    }
-
-    // insert the new file in the beginning of the file history
-    m_fileHistory.insert(m_fileHistory.begin(), file);
-    numFiles++;
-
-    // update the labels in all menus
-    for ( i = 0; i < numFiles; i++ )
-    {
-        // if in same directory just show the filename; otherwise the full path
-        const wxFileName fnOld(m_fileHistory[i]);
-
-        wxString pathInMenu;
-        if ( fnOld.GetPath() == fnNew.GetPath() )
-        {
-            pathInMenu = fnOld.GetFullName();
-        }
-        else // file in different directory
-        {
-            // absolute path; could also set relative path
-            pathInMenu = m_fileHistory[i];
-        }
-
-        for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst();
-              node;
-              node = node->GetNext() )
-        {
-            wxMenu * const menu = (wxMenu *)node->GetData();
-
-            menu->SetLabel(m_idBase + i, GetMRUEntryLabel(i, pathInMenu));
-        }
-    }
-}
-
-void wxFileHistory::RemoveFileFromHistory(size_t i)
-{
-    size_t numFiles = m_fileHistory.size();
-    wxCHECK_RET( i < numFiles,
-                 wxT("invalid index in wxFileHistory::RemoveFileFromHistory") );
-
-    // delete the element from the array
-    m_fileHistory.RemoveAt(i);
-    numFiles--;
-
-    for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        wxMenu * const menu = (wxMenu *) node->GetData();
-
-        // shift filenames up
-        for ( size_t j = i; j < numFiles; j++ )
-        {
-            menu->SetLabel(m_idBase + j, GetMRUEntryLabel(j, m_fileHistory[j]));
-        }
-
-        // delete the last menu item which is unused now
-        const wxWindowID lastItemId = m_idBase + numFiles;
-        if ( menu->FindItem(lastItemId) )
-            menu->Delete(lastItemId);
-
-        // delete the last separator too if no more files are left
-        if ( m_fileHistory.empty() )
-        {
-            const wxMenuItemList::compatibility_iterator
-                nodeLast = menu->GetMenuItems().GetLast();
-            if ( nodeLast )
-            {
-                wxMenuItem * const lastMenuItem = nodeLast->GetData();
-                if ( lastMenuItem->IsSeparator() )
-                    menu->Delete(lastMenuItem);
-            }
-            //else: menu is empty somehow
-        }
-    }
-}
-
-void wxFileHistory::UseMenu(wxMenu *menu)
-{
-    if ( !m_fileMenus.Member(menu) )
-        m_fileMenus.Append(menu);
-}
-
-void wxFileHistory::RemoveMenu(wxMenu *menu)
-{
-    m_fileMenus.DeleteObject(menu);
-}
-
-#if wxUSE_CONFIG
-void wxFileHistory::Load(const wxConfigBase& config)
-{
-    m_fileHistory.Clear();
-
-    wxString buf;
-    buf.Printf(wxT("file%d"), 1);
-
-    wxString historyFile;
-    while ((m_fileHistory.GetCount() < m_fileMaxFiles) &&
-           config.Read(buf, &historyFile) && !historyFile.empty())
-    {
-        m_fileHistory.Add(historyFile);
-
-        buf.Printf(wxT("file%d"), (int)m_fileHistory.GetCount()+1);
-        historyFile = wxEmptyString;
-    }
-
-    AddFilesToMenu();
-}
-
-void wxFileHistory::Save(wxConfigBase& config)
-{
-    size_t i;
-    for (i = 0; i < m_fileMaxFiles; i++)
-    {
-        wxString buf;
-        buf.Printf(wxT("file%d"), (int)i+1);
-        if (i < m_fileHistory.GetCount())
-            config.Write(buf, wxString(m_fileHistory[i]));
-        else
-            config.Write(buf, wxEmptyString);
-    }
-}
-#endif // wxUSE_CONFIG
-
-void wxFileHistory::AddFilesToMenu()
-{
-    if ( m_fileHistory.empty() )
-        return;
-
-    for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        AddFilesToMenu((wxMenu *) node->GetData());
-    }
-}
-
-void wxFileHistory::AddFilesToMenu(wxMenu* menu)
-{
-    if ( m_fileHistory.empty() )
-        return;
-
-    if ( menu->GetMenuItemCount() )
-        menu->AppendSeparator();
-
-    for ( size_t i = 0; i < m_fileHistory.GetCount(); i++ )
-    {
-        menu->Append(m_idBase + i, GetMRUEntryLabel(i, m_fileHistory[i]));
-    }
-}
-

 // ----------------------------------------------------------------------------
 // Permits compatibility with existing file formats and functions that
 // manipulate files directly
 // ----------------------------------------------------------------------------
 // Permits compatibility with existing file formats and functions that
 // manipulate files directly


@@ -2213,7 +2140,11 @@ void wxFileHistory::AddFilesToMenu(wxMenu* menu)
 
 bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream)
 {
 
 bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream)
 {

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

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


@@ -2237,7 +2168,11 @@ bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream)
 
 bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename)
 {
 
 bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename)
 {

-    wxFFile file(filename, _T("wb"));
+#if wxUSE_FFILE
+    wxFFile file(filename, wxT("wb"));
+#elif wxUSE_FILE
+    wxFile file(filename, wxFile::write);
+#endif

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


@@ -2260,7 +2195,11 @@ bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename)
 
 bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream)
 {
 
 bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream)
 {

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

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


@@ -2284,7 +2223,11 @@ bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream)
 
 bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename)
 {
 
 bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename)
 {

-    wxFFile file(filename, _T("wb"));
+#if wxUSE_FFILE
+    wxFFile file(filename, wxT("wb"));
+#elif wxUSE_FILE
+    wxFile file(filename, wxFile::write);
+#endif

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