don't test sei.hInstApp in DoLaunchDefaultBrowser(), just look at ShellExecuteEx...

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index c158c432432ff8b2dd7ad8373ad65a80d39d9829..dbc0e56630a52eafa239d146b0078c43cd9319e7 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -2,7 +2,7 @@
 // Name:        src/common/docview.cpp
 // Purpose:     Document/view classes
 // Author:      Julian Smart
 // Name:        src/common/docview.cpp
 // Purpose:     Document/view classes
 // Author:      Julian Smart

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

 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart


@@ -17,70 +17,64 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "docview.h"
-#endif
-

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

-#endif
-
-#include "wx/ffile.h"
-
-#ifdef __WXMAC__
-    #include "wx/filename.h"
-#endif
-
-#ifdef __WXGTK__
+    #include "wx/msgdlg.h"

     #include "wx/mdi.h"
     #include "wx/mdi.h"

+    #include "wx/choicdlg.h"

 #endif
 
 #if wxUSE_PRINTING_ARCHITECTURE
 #endif
 
 #if wxUSE_PRINTING_ARCHITECTURE

-  #include "wx/prntbase.h"
-  #include "wx/printdlg.h"
+    #include "wx/prntbase.h"
+    #include "wx/printdlg.h"

 #endif
 
 #endif
 

-#include "wx/msgdlg.h"
-#include "wx/choicdlg.h"
-#include "wx/docview.h"

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

+#include "wx/filename.h"

 #include "wx/file.h"
 #include "wx/file.h"

+#include "wx/ffile.h"

 #include "wx/cmdproc.h"
 #include "wx/cmdproc.h"

-
-#include <stdio.h>
-#include <string.h>
+#include "wx/tokenzr.h"
+#include "wx/filename.h"
+#include "wx/vector.h"

 
 #if wxUSE_STD_IOSTREAM
 
 #if wxUSE_STD_IOSTREAM

-  #include "wx/ioswrap.h"
-  #if wxUSE_IOSTREAMH
-    #include <fstream.h>
-  #else
-    #include <fstream>
-  #endif
+    #include "wx/ioswrap.h"
+    #include "wx/beforestd.h"
+    #if wxUSE_IOSTREAMH
+        #include <fstream.h>
+    #else
+        #include <fstream>
+    #endif
+    #include "wx/afterstd.h"

 #else
 #else

-  #include "wx/wfstream.h"
+    #include "wx/wfstream.h"

 #endif
 
 #endif
 

+typedef wxVector<wxDocTemplate *> wxDocTemplates;
+

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

-// wxWindows macros
+// wxWidgets macros

 // ----------------------------------------------------------------------------
 
 IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)


@@ -96,28 +90,25 @@ IMPLEMENT_CLASS(wxDocParentFrame, wxFrame)
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
 

-// ----------------------------------------------------------------------------
-// function prototypes
-// ----------------------------------------------------------------------------
-
-static inline wxString FindExtension(const wxChar *path);
-static wxWindow* wxFindSuitableParent(void);
-
-// ----------------------------------------------------------------------------
-// local constants
-// ----------------------------------------------------------------------------
-
-static const wxChar *s_MRUEntryFormat = wxT("&%d %s");
-

 // ============================================================================
 // implementation
 // ============================================================================
 
 // ----------------------------------------------------------------------------
 // ============================================================================
 // implementation
 // ============================================================================
 
 // ----------------------------------------------------------------------------

-// local functions
+// private helpers

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

-static wxString FindExtension(const wxChar *path)
+namespace
+{
+
+wxWindow *wxFindSuitableParent()
+{
+    wxWindow * const win = wxGetTopLevelParent(wxWindow::FindFocus());
+
+    return win ? win : wxTheApp->GetTopWindow();
+}
+
+wxString FindExtension(const wxString& path)

 {
     wxString ext;
     wxSplitPath(path, NULL, NULL, &ext);
 {
     wxString ext;
     wxSplitPath(path, NULL, NULL, &ext);


@@ -127,22 +118,36 @@ static wxString FindExtension(const wxChar *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
+

 // ----------------------------------------------------------------------------
 // Definition of wxDocument
 // ----------------------------------------------------------------------------
 
 wxDocument::wxDocument(wxDocument *parent)
 {
 // ----------------------------------------------------------------------------
 // Definition of wxDocument
 // ----------------------------------------------------------------------------
 
 wxDocument::wxDocument(wxDocument *parent)
 {

-    m_documentModified = FALSE;
+    m_documentModified = false;

     m_documentParent = parent;
     m_documentParent = parent;

-    m_documentTemplate = (wxDocTemplate *) NULL;
-    m_commandProcessor = (wxCommandProcessor*) NULL;
-    m_savedYet = FALSE;
+    m_documentTemplate = NULL;
+    m_commandProcessor = NULL;
+    m_savedYet = false;

 }
 
 bool wxDocument::DeleteContents()
 {
 }
 
 bool wxDocument::DeleteContents()
 {

-    return TRUE;
+    return true;

 }
 
 wxDocument::~wxDocument()
 }
 
 wxDocument::~wxDocument()


@@ -166,7 +171,7 @@ bool wxDocument::Close()
     if (OnSaveModified())
         return OnCloseDocument();
     else
     if (OnSaveModified())
         return OnCloseDocument();
     else

-        return FALSE;
+        return false;

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


@@ -174,8 +179,8 @@ bool wxDocument::OnCloseDocument()
     // Tell all views that we're about to close
     NotifyClosing();
     DeleteContents();
     // Tell all views that we're about to close
     NotifyClosing();
     DeleteContents();

-    Modify(FALSE);
-    return TRUE;
+    Modify(false);
+    return true;

 }
 
 // Note that this implicitly deletes the document when the last view is
 }
 
 // Note that this implicitly deletes the document when the last view is


@@ -184,60 +189,78 @@ bool wxDocument::DeleteAllViews()
 {
     wxDocManager* manager = GetDocumentManager();
 
 {
     wxDocManager* manager = GetDocumentManager();
 

-    wxList::compatibility_iterator node = m_documentViews.GetFirst();
-    while (node)
+    // first check if all views agree to be closed
+    const wxList::iterator end = m_documentViews.end();
+    for ( wxList::iterator i = m_documentViews.begin(); i != end; ++i )

     {
     {

-        wxView *view = (wxView *)node->GetData();
-        if (!view->Close())
-            return FALSE;
+        wxView *view = (wxView *)*i;
+        if ( !view->Close() )
+            return false;
+    }

 
 

-        wxList::compatibility_iterator next = node->GetNext();
+    // 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();

 
 

-        delete view; // Deletes node implicitly
-        node = next;
+            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;
+        }

     }
     }

-    // If we haven't yet deleted the document (for example
-    // if there were no views) then delete it.
-    if (manager && manager->GetDocuments().Member(this))
-        delete this;

 
 

-    return TRUE;
+    return true;

 }
 
 wxView *wxDocument::GetFirstView() const
 {
     if (m_documentViews.GetCount() == 0)
 }
 
 wxView *wxDocument::GetFirstView() const
 {
     if (m_documentViews.GetCount() == 0)

-        return (wxView *) NULL;
+        return NULL;

     return (wxView *)m_documentViews.GetFirst()->GetData();
 }
 
 wxDocManager *wxDocument::GetDocumentManager() const
 {
     return (wxView *)m_documentViews.GetFirst()->GetData();
 }
 
 wxDocManager *wxDocument::GetDocumentManager() const
 {

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

 }
 
 bool wxDocument::OnNewDocument()
 {
 }
 
 bool wxDocument::OnNewDocument()
 {

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

 
 

-    if (OnCloseDocument()==FALSE) return FALSE;

     DeleteContents();
     DeleteContents();

-    Modify(FALSE);
-    SetDocumentSaved(FALSE);
+    Modify(false);
+    SetDocumentSaved(false);

 
 

-    wxString name;
-    GetDocumentManager()->MakeDefaultName(name);
+    const wxString name = GetDocumentManager()->MakeNewDocumentName();

     SetTitle(name);
     SetTitle(name);

-    SetFilename(name, TRUE);
+    SetFilename(name, true);

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxDocument::Save()
 {
 }
 
 bool wxDocument::Save()
 {

-    if (!IsModified() && m_savedYet)
-        return TRUE;
+    if ( AlreadySaved() )
+        return true;

 
     if ( m_documentFile.empty() || !m_savedYet )
         return SaveAs();
 
     if ( m_documentFile.empty() || !m_savedYet )
         return SaveAs();


@@ -249,24 +272,59 @@ bool wxDocument::SaveAs()
 {
     wxDocTemplate *docTemplate = GetDocumentTemplate();
     if (!docTemplate)
 {
     wxDocTemplate *docTemplate = GetDocumentTemplate();
     if (!docTemplate)

-        return FALSE;
+        return false;
+
+#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__)
+    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
+    wxString defaultDir = docTemplate->GetDirectory();
+    if (defaultDir.IsEmpty())
+        defaultDir = wxPathOnly(GetFilename());

 
 

-    wxString tmp = wxFileSelector(_("Save as"),
-            docTemplate->GetDirectory(),
+    wxString tmp = wxFileSelector(_("Save As"),
+            defaultDir,

             wxFileNameFromPath(GetFilename()),
             docTemplate->GetDefaultExtension(),
             wxFileNameFromPath(GetFilename()),
             docTemplate->GetDefaultExtension(),

-            docTemplate->GetFileFilter(),
-            wxSAVE | wxOVERWRITE_PROMPT,
+            filter,
+            wxFD_SAVE | wxFD_OVERWRITE_PROMPT,

             GetDocumentWindow());
 
             GetDocumentWindow());
 

-    if (tmp.IsEmpty())
-        return FALSE;
+    if (tmp.empty())
+        return false;

 
     wxString fileName(tmp);
     wxString path, name, ext;
     wxSplitPath(fileName, & path, & name, & ext);
 
 
     wxString fileName(tmp);
     wxString path, name, ext;
     wxSplitPath(fileName, & path, & name, & ext);
 

-    if (ext.IsEmpty() || ext == wxT(""))
+    if (ext.empty())

     {
         fileName += wxT(".");
         fileName += docTemplate->GetDefaultExtension();
     {
         fileName += wxT(".");
         fileName += docTemplate->GetDefaultExtension();


@@ -286,7 +344,7 @@ bool wxDocument::SaveAs()
 
     // Files that were not saved correctly are not added to the FileHistory.
     if (!OnSaveDocument(m_documentFile))
 
     // Files that were not saved correctly are not added to the FileHistory.
     if (!OnSaveDocument(m_documentFile))

-        return FALSE;
+        return false;

 
    // A file that doesn't use the default extension of its document template cannot be opened
    // via the FileHistory, so we do not add it.
 
    // A file that doesn't use the default extension of its document template cannot be opened
    // via the FileHistory, so we do not add it.


@@ -299,93 +357,42 @@ bool wxDocument::SaveAs()
        // The user will probably not be able to open the file again, so
        // we could warn about the wrong file-extension here.
    }
        // 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)
 {
     if ( !file )
 }
 
 bool wxDocument::OnSaveDocument(const wxString& file)
 {
     if ( !file )

-        return FALSE;
+        return false;

 
 

-    wxString msgTitle;
-    if (wxTheApp->GetAppName() != wxT(""))
-        msgTitle = wxTheApp->GetAppName();
-    else
-        msgTitle = wxString(_("File error"));
+    if ( !DoSaveDocument(file) )
+        return false;

 
 

-#if wxUSE_STD_IOSTREAM
-    wxSTD ofstream store(file.mb_str());
-    if (store.fail() || store.bad())
-#else
-    wxFileOutputStream store(file);
-    if (store.GetLastError() != wxSTREAM_NO_ERROR)
-#endif
-    {
-        (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,
-                           GetDocumentWindow());
-        // Saving error
-        return FALSE;
-    }
-    if (!SaveObject(store))
-    {
-        (void)wxMessageBox(_("Sorry, could not save this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
-                           GetDocumentWindow());
-        // Saving error
-        return FALSE;
-    }
-    Modify(FALSE);
+    Modify(false);

     SetFilename(file);
     SetFilename(file);

-    SetDocumentSaved(TRUE);
-#ifdef __WXMAC__
+    SetDocumentSaved(true);
+#if defined( __WXOSX_MAC__ ) && wxOSX_USE_CARBON

     wxFileName fn(file) ;
     fn.MacSetDefaultTypeAndCreator() ;
 #endif
     wxFileName fn(file) ;
     fn.MacSetDefaultTypeAndCreator() ;
 #endif

-    return TRUE;
+    return true;

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

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

 
 

-    wxString msgTitle;
-    if (wxTheApp->GetAppName() != wxT(""))
-        msgTitle = wxTheApp->GetAppName();
-    else
-        msgTitle = wxString(_("File error"));
+    if ( !DoOpenDocument(file) )
+        return false;

 
 

-#if wxUSE_STD_IOSTREAM
-    wxSTD ifstream store(file.mb_str());
-    if (store.fail() || store.bad())
-#else
-    wxFileInputStream store(file);
-    if (store.GetLastError() != wxSTREAM_NO_ERROR)
-#endif
-    {
-        (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
-                           GetDocumentWindow());
-        return FALSE;
-    }
-#if wxUSE_STD_IOSTREAM
-    LoadObject(store);
-    if ( !store && !store.eof() )
-#else
-    int res = LoadObject(store).GetLastError();
-    if ((res != wxSTREAM_NO_ERROR) &&
-        (res != wxSTREAM_EOF))
-#endif
-    {
-        (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
-                           GetDocumentWindow());
-        return FALSE;
-    }
-    SetFilename(file, TRUE);
-    Modify(FALSE);
-    m_savedYet = TRUE;
+    SetFilename(file, true);
+    Modify(false);
+    m_savedYet = true;

 
     UpdateAllViews();
 
 
     UpdateAllViews();
 

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM


@@ -408,28 +415,46 @@ wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream)
 
 bool wxDocument::Revert()
 {
 
 bool wxDocument::Revert()
 {

-    return FALSE;
+    return false;

 }
 
 
 // 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 != wxT(""))
-    {
-        buf = m_documentTitle;
-        return TRUE;
-    }
-    else if (m_documentFile != wxT(""))
-    {
-        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
+
+wxString wxDocument::GetUserReadableName() const
+{
+#if WXWIN_COMPATIBILITY_2_8
+    // we need to call the old virtual function to ensure that the overridden
+    // version of it is still called
+    wxString name;
+    if ( GetPrintableName(name) )
+        return name;
+#endif // WXWIN_COMPATIBILITY_2_8
+
+    return DoGetUserReadableName();
+}
+
+wxString wxDocument::DoGetUserReadableName() const
+{
+    if ( !m_documentTitle.empty() )
+        return m_documentTitle;
+
+    if ( !m_documentFile.empty() )
+        return wxFileNameFromPath(m_documentFile);
+
+    return _("unnamed");

 }
 
 wxWindow *wxDocument::GetDocumentWindow() const
 }
 
 wxWindow *wxDocument::GetDocumentWindow() const


@@ -446,67 +471,63 @@ wxCommandProcessor *wxDocument::OnCreateCommandProcessor()
     return new wxCommandProcessor;
 }
 
     return new wxCommandProcessor;
 }
 

-// TRUE if safe to close
+// true if safe to close

 bool wxDocument::OnSaveModified()
 {
 bool wxDocument::OnSaveModified()
 {

-    if (IsModified())
-    {
-        wxString title;
-        GetPrintableName(title);
-
-        wxString msgTitle;
-        if (wxTheApp->GetAppName() != wxT(""))
-            msgTitle = wxTheApp->GetAppName();
-        else
-            msgTitle = wxString(_("Warning"));
-
-        wxString prompt;
-        prompt.Printf(_("Do you want to save changes to document %s?"),
-                (const wxChar *)title);
-        int res = wxMessageBox(prompt, msgTitle,
-                wxYES_NO|wxCANCEL|wxICON_QUESTION,
-                GetDocumentWindow());
-        if (res == wxNO)
+    if ( IsModified() )
+    {
+        switch ( wxMessageBox
+                 (
+                    wxString::Format
+                    (
+                     _("Do you want to save changes to document %s?"),
+                     GetUserReadableName()
+                    ),
+                    wxTheApp->GetAppDisplayName(),
+                    wxYES_NO | wxCANCEL | wxICON_QUESTION,
+                    GetDocumentWindow()
+                 ) )

         {
         {

-            Modify(FALSE);
-            return TRUE;
+            case wxNO:
+                Modify(false);
+                break;
+
+            case wxYES:
+                return Save();
+
+            case wxCANCEL:
+                return false;

         }
         }

-        else if (res == wxYES)
-            return Save();
-        else if (res == wxCANCEL)
-            return FALSE;

     }
     }

-    return TRUE;
+
+    return true;

 }
 
 bool wxDocument::Draw(wxDC& WXUNUSED(context))
 {
 }
 
 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))
+    if ( !m_documentViews.Member(view) )

     {
         m_documentViews.Append(view);
         OnChangedViewList();
     }
     {
         m_documentViews.Append(view);
         OnChangedViewList();
     }

-    return TRUE;
+    return true;

 }
 
 bool wxDocument::RemoveView(wxView *view)
 {
     (void)m_documentViews.DeleteObject(view);
     OnChangedViewList();
 }
 
 bool wxDocument::RemoveView(wxView *view)
 {
     (void)m_documentViews.DeleteObject(view);
     OnChangedViewList();

-    return TRUE;
+    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.
 }
 
 // Called after a view is added or removed.


@@ -514,13 +535,8 @@ bool wxDocument::OnCreate(const wxString& WXUNUSED(path), long flags)
 // there are no more views.
 void wxDocument::OnChangedViewList()
 {
 // there are no more views.
 void wxDocument::OnChangedViewList()
 {

-    if (m_documentViews.GetCount() == 0)
-    {
-        if (OnSaveModified())
-        {
-            delete this;
-        }
-    }
+    if ( m_documentViews.empty() && OnSaveModified() )
+        delete this;

 }
 
 void wxDocument::UpdateAllViews(wxView *sender, wxObject *hint)
 }
 
 void wxDocument::UpdateAllViews(wxView *sender, wxObject *hint)


@@ -562,30 +578,80 @@ void wxDocument::SetFilename(const wxString& filename, bool notifyViews)
     }
 }
 
     }
 }
 

+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)
+#endif
+    {
+        wxLogError(_("File \"%s\" could not be opened for reading."), file);
+        return false;
+    }
+
+#if wxUSE_STD_IOSTREAM
+    LoadObject(store);
+    if ( !store )
+#else
+    int res = LoadObject(store).GetLastError();
+    if ( res != wxSTREAM_NO_ERROR && res != wxSTREAM_EOF )
+#endif
+    {
+        wxLogError(_("Failed to read document from the file \"%s\"."), file);
+        return false;
+    }
+
+    return true;
+}
+
+

 // ----------------------------------------------------------------------------
 // Document view
 // ----------------------------------------------------------------------------
 
 wxView::wxView()
 {
 // ----------------------------------------------------------------------------
 // Document view
 // ----------------------------------------------------------------------------
 
 wxView::wxView()
 {

-    m_viewDocument = (wxDocument*) NULL;
+    m_viewDocument = NULL;

 
 

-    m_viewFrame = (wxFrame *) NULL;
+    m_viewFrame = NULL;

 }
 
 wxView::~wxView()
 {
 }
 
 wxView::~wxView()
 {

-    GetDocumentManager()->ActivateView(this, FALSE);
+    GetDocumentManager()->ActivateView(this, false);

     m_viewDocument->RemoveView(this);
 }
 
     m_viewDocument->RemoveView(this);
 }
 

-// Extend event processing to search the document's event table
-bool wxView::ProcessEvent(wxEvent& event)
+bool wxView::TryValidator(wxEvent& event)

 {
 {

-    if ( !GetDocument() || !GetDocument()->ProcessEvent(event) )
-        return wxEvtHandler::ProcessEvent(event);
-
-    return TRUE;
+    wxDocument * const doc = GetDocument();
+    return doc && doc->ProcessEventHere(event);

 }
 
 void wxView::OnActivateView(bool WXUNUSED(activate), wxView *WXUNUSED(activeView), wxView *WXUNUSED(deactiveView))
 }
 
 void wxView::OnActivateView(bool WXUNUSED(activate), wxView *WXUNUSED(activeView), wxView *WXUNUSED(deactiveView))


@@ -603,14 +669,16 @@ void wxView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
 
 void wxView::OnChangeFilename()
 {
 
 void wxView::OnChangeFilename()
 {

-    if (GetFrame() && GetDocument())
-    {
-        wxString title;
+    // GetFrame can return wxWindow rather than wxTopLevelWindow due to
+    // generic MDI implementation so use SetLabel rather than SetTitle.
+    // It should cause SetTitle() for top level windows.
+    wxWindow *win = GetFrame();
+    if (!win) return;

 
 

-        GetDocument()->GetPrintableName(title);
+    wxDocument *doc = GetDocument();
+    if (!doc) return;

 
 

-        GetFrame()->SetTitle(title);
-    }
+    win->SetLabel(doc->GetUserReadableName());

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


@@ -622,10 +690,7 @@ void wxView::SetDocument(wxDocument *doc)
 
 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)


@@ -639,7 +704,7 @@ void wxView::Activate(bool 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


@@ -686,29 +751,38 @@ wxDocTemplate::~wxDocTemplate()
 // Tries to dynamically construct an object of the right class.
 wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags)
 {
 // Tries to dynamically construct an object of the right class.
 wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags)
 {

-    if (!m_docClassInfo)
-        return (wxDocument *) NULL;
-    wxDocument *doc = (wxDocument *)m_docClassInfo->CreateObject();
+    wxDocument * const doc = DoCreateDocument();
+
+    // VZ: this code doesn't delete doc if InitDocument() (i.e. doc->OnCreate())
+    //     fails, is this intentional?
+
+    return doc && InitDocument(doc, path, flags) ? doc : NULL;
+}
+
+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))
     doc->SetFilename(path);
     doc->SetDocumentTemplate(this);
     GetDocumentManager()->AddDocument(doc);
     doc->SetCommandProcessor(doc->OnCreateCommandProcessor());
 
     if (doc->OnCreate(path, flags))

-        return doc;
+        return true;

     else
     {
         if (GetDocumentManager()->GetDocuments().Member(doc))
             doc->DeleteAllViews();
     else
     {
         if (GetDocumentManager()->GetDocuments().Member(doc))
             doc->DeleteAllViews();

-        return (wxDocument *) NULL;
+        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();
+    wxView *view = DoCreateView();
+    if ( view == NULL )
+        return NULL;
+

     view->SetDocument(doc);
     if (view->OnCreate(doc, flags))
     {
     view->SetDocument(doc);
     if (view->OnCreate(doc, flags))
     {


@@ -717,7 +791,7 @@ wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags)
     else
     {
         delete view;
     else
     {
         delete view;

-        return (wxView *) NULL;
+        return NULL;

     }
 }
 
     }
 }
 


@@ -725,9 +799,36 @@ wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags)
 // that of the template
 bool wxDocTemplate::FileMatchesTemplate(const wxString& path)
 {
 // 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));
 }
 
     return GetDefaultExtension().IsSameAs(FindExtension(path));
 }
 

+wxDocument *wxDocTemplate::DoCreateDocument()
+{
+    if (!m_docClassInfo)
+        return NULL;
+
+    return (wxDocument *)m_docClassInfo->CreateObject();
+}
+
+wxView *wxDocTemplate::DoCreateView()
+{
+    if (!m_viewClassInfo)
+        return NULL;
+
+    return (wxView *)m_viewClassInfo->CreateObject();
+}
+

 // ----------------------------------------------------------------------------
 // wxDocManager
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxDocManager
 // ----------------------------------------------------------------------------


@@ -744,46 +845,45 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
     EVT_MENU(wxID_REDO, wxDocManager::OnRedo)
 
     EVT_UPDATE_UI(wxID_OPEN, wxDocManager::OnUpdateFileOpen)
     EVT_MENU(wxID_REDO, wxDocManager::OnRedo)
 
     EVT_UPDATE_UI(wxID_OPEN, wxDocManager::OnUpdateFileOpen)

-    EVT_UPDATE_UI(wxID_CLOSE, wxDocManager::OnUpdateFileClose)
-    EVT_UPDATE_UI(wxID_CLOSE_ALL, wxDocManager::OnUpdateFileClose)
-    EVT_UPDATE_UI(wxID_REVERT, wxDocManager::OnUpdateFileRevert)
+    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_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::OnUpdateFileSaveAs)
+    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_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_SETUP, wxDocManager::OnPrintSetup)

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

-    EVT_UPDATE_UI(wxID_PRINT, wxDocManager::OnUpdatePrint)
-    EVT_UPDATE_UI(wxID_PRINT_SETUP, wxDocManager::OnUpdatePrintSetup)
-    EVT_UPDATE_UI(wxID_PREVIEW, wxDocManager::OnUpdatePreview)
+    EVT_UPDATE_UI(wxID_PRINT, wxDocManager::OnUpdateDisableIfNoDoc)
+    EVT_UPDATE_UI(wxID_PREVIEW, wxDocManager::OnUpdateDisableIfNoDoc)

 #endif
 END_EVENT_TABLE()
 
 #endif
 END_EVENT_TABLE()
 

-wxDocManager* wxDocManager::sm_docManager = (wxDocManager*) NULL;
+wxDocManager* wxDocManager::sm_docManager = NULL;

 
 

-wxDocManager::wxDocManager(long flags, bool initialize)
+wxDocManager::wxDocManager(long WXUNUSED(flags), bool initialize)

 {
 {

+    wxASSERT_MSG( !sm_docManager, "multiple wxDocManagers not allowed" );
+
+    sm_docManager = this;
+

     m_defaultDocumentNameCounter = 1;
     m_defaultDocumentNameCounter = 1;

-    m_flags = flags;
-    m_currentView = (wxView *) NULL;
-    m_maxDocsOpen = 10000;
-    m_fileHistory = (wxFileHistory *) NULL;
-    if (initialize)
+    m_currentView = NULL;
+    m_maxDocsOpen = INT_MAX;
+    m_fileHistory = NULL;
+    if ( initialize )

         Initialize();
         Initialize();

-    sm_docManager = this;

 }
 
 wxDocManager::~wxDocManager()
 {
     Clear();
 }
 
 wxDocManager::~wxDocManager()
 {
     Clear();

-    if (m_fileHistory)
-        delete m_fileHistory;
-    sm_docManager = (wxDocManager*) NULL;
+    delete m_fileHistory;
+    sm_docManager = NULL;

 }
 
 // closes the specified document
 }
 
 // closes the specified document


@@ -799,9 +899,9 @@ bool wxDocManager::CloseDocument(wxDocument* doc, bool force)
         if (m_docs.Member(doc))
             delete doc;
 
         if (m_docs.Member(doc))
             delete doc;
 

-        return TRUE;
+        return true;

     }
     }

-    return FALSE;
+    return false;

 }
 
 bool wxDocManager::CloseDocuments(bool force)
 }
 
 bool wxDocManager::CloseDocuments(bool force)


@@ -811,22 +911,24 @@ bool wxDocManager::CloseDocuments(bool force)
     {
         wxDocument *doc = (wxDocument *)node->GetData();
         wxList::compatibility_iterator next = node->GetNext();
     {
         wxDocument *doc = (wxDocument *)node->GetData();
         wxList::compatibility_iterator next = node->GetNext();

-        
+

         if (!CloseDocument(doc, force))
         if (!CloseDocument(doc, force))

-            return FALSE;
+            return false;

 
         // This assumes that documents are not connected in
         // any way, i.e. deleting one document does NOT
         // delete another.
         node = next;
     }
 
         // This assumes that documents are not connected in
         // any way, i.e. deleting one document does NOT
         // delete another.
         node = next;
     }

-    return TRUE;
+    return true;

 }
 
 bool wxDocManager::Clear(bool force)
 {
     if (!CloseDocuments(force))
 }
 
 bool wxDocManager::Clear(bool force)
 {
     if (!CloseDocuments(force))

-        return FALSE;
+        return false;
+
+    m_currentView = NULL;

 
     wxList::compatibility_iterator node = m_templates.GetFirst();
     while (node)
 
     wxList::compatibility_iterator node = m_templates.GetFirst();
     while (node)


@@ -836,13 +938,13 @@ bool wxDocManager::Clear(bool force)
         delete templ;
         node = next;
     }
         delete templ;
         node = next;
     }

-    return TRUE;
+    return true;

 }
 
 bool wxDocManager::Initialize()
 {
     m_fileHistory = OnCreateFileHistory();
 }
 
 bool wxDocManager::Initialize()
 {
     m_fileHistory = OnCreateFileHistory();

-    return TRUE;
+    return true;

 }
 
 wxFileHistory *wxDocManager::OnCreateFileHistory()
 }
 
 wxFileHistory *wxDocManager::OnCreateFileHistory()


@@ -865,17 +967,17 @@ void wxDocManager::OnFileClose(wxCommandEvent& WXUNUSED(event))
 
 void wxDocManager::OnFileCloseAll(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxDocManager::OnFileCloseAll(wxCommandEvent& WXUNUSED(event))
 {

-    CloseDocuments(FALSE);
+    CloseDocuments(false);

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

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

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

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

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


@@ -916,29 +1018,13 @@ void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
     if (printout)
     {
         wxPrinter printer;
     if (printout)
     {
         wxPrinter printer;

-        printer.Print(view->GetFrame(), printout, TRUE);
+        printer.Print(view->GetFrame(), printout, true);

 
         delete printout;
     }
 #endif // wxUSE_PRINTING_ARCHITECTURE
 }
 
 
         delete printout;
     }
 #endif // wxUSE_PRINTING_ARCHITECTURE
 }
 

-void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
-{
-#if wxUSE_PRINTING_ARCHITECTURE
-    wxWindow *parentWin = wxTheApp->GetTopWindow();
-    wxView *view = GetCurrentView();
-    if (view)
-        parentWin = view->GetFrame();
-
-    wxPrintDialogData data;
-
-    wxPrintDialog printerDialog(parentWin, &data);
-    printerDialog.GetPrintDialogData().SetSetupDialog(TRUE);
-    printerDialog.ShowModal();
-#endif // wxUSE_PRINTING_ARCHITECTURE
-}
-

 void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_PRINTING_ARCHITECTURE
 void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_PRINTING_ARCHITECTURE


@@ -950,14 +1036,19 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
     if (printout)
     {
         // Pass two printout objects: for preview, and possible printing.
     if (printout)
     {
         // Pass two printout objects: for preview, and possible printing.

-        wxPrintPreviewBase *preview = (wxPrintPreviewBase *) NULL;
-        preview = new wxPrintPreview(printout, view->OnCreatePrintout());
+        wxPrintPreviewBase *preview = new wxPrintPreview(printout, view->OnCreatePrintout());
+        if ( !preview->Ok() )
+        {
+            delete preview;
+            wxMessageBox( _("Sorry, print preview needs a printer to be installed.") );
+            return;
+        }

 
         wxPreviewFrame *frame = new wxPreviewFrame(preview, (wxFrame *)wxTheApp->GetTopWindow(), _("Print Preview"),
                 wxPoint(100, 100), wxSize(600, 650));
         frame->Centre(wxBOTH);
         frame->Initialize();
 
         wxPreviewFrame *frame = new wxPreviewFrame(preview, (wxFrame *)wxTheApp->GetTopWindow(), _("Print Preview"),
                 wxPoint(100, 100), wxSize(600, 650));
         frame->Centre(wxBOTH);
         frame->Initialize();

-        frame->Show(TRUE);
+        frame->Show(true);

     }
 #endif // wxUSE_PRINTING_ARCHITECTURE
 }
     }
 #endif // wxUSE_PRINTING_ARCHITECTURE
 }


@@ -988,43 +1079,30 @@ void wxDocManager::OnRedo(wxCommandEvent& event)
 
 void wxDocManager::OnUpdateFileOpen(wxUpdateUIEvent& event)
 {
 
 void wxDocManager::OnUpdateFileOpen(wxUpdateUIEvent& event)
 {

-    event.Enable( TRUE );
+    event.Enable( true );

 }
 
 }
 

-void wxDocManager::OnUpdateFileClose(wxUpdateUIEvent& event)
+void wxDocManager::OnUpdateDisableIfNoDoc(wxUpdateUIEvent& event)

 {
 {

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

 }
 
 void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event)
 {
 }
 
 void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event)
 {

-    event.Enable( TRUE );
+    event.Enable( true );

 }
 
 void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event)
 {
 }
 
 void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event)
 {

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

 }
 
 void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event)
 {
     wxDocument *doc = GetCurrentDocument();
     if (!doc)
 }
 
 void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event)
 {
     wxDocument *doc = GetCurrentDocument();
     if (!doc)

-        event.Enable(FALSE);
+        event.Enable(false);

     else if (!doc->GetCommandProcessor())
         event.Skip();
     else
     else if (!doc->GetCommandProcessor())
         event.Skip();
     else


@@ -1038,7 +1116,7 @@ void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event)
 {
     wxDocument *doc = GetCurrentDocument();
     if (!doc)
 {
     wxDocument *doc = GetCurrentDocument();
     if (!doc)

-        event.Enable(FALSE);
+        event.Enable(false);

     else if (!doc->GetCommandProcessor())
         event.Skip();
     else
     else if (!doc->GetCommandProcessor())
         event.Skip();
     else


@@ -1048,23 +1126,6 @@ void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event)
     }
 }
 
     }
 }
 

-void wxDocManager::OnUpdatePrint(wxUpdateUIEvent& event)
-{
-    wxDocument *doc = GetCurrentDocument();
-    event.Enable( (doc != (wxDocument*) NULL) );
-}
-
-void wxDocManager::OnUpdatePrintSetup(wxUpdateUIEvent& event)
-{
-    event.Enable( TRUE );
-}
-
-void wxDocManager::OnUpdatePreview(wxUpdateUIEvent& event)
-{
-    wxDocument *doc = GetCurrentDocument();
-    event.Enable( (doc != (wxDocument*) NULL) );
-}
-

 wxView *wxDocManager::GetCurrentView() const
 {
     if (m_currentView)
 wxView *wxDocManager::GetCurrentView() const
 {
     if (m_currentView)


@@ -1074,215 +1135,182 @@ wxView *wxDocManager::GetCurrentView() const
         wxDocument* doc = (wxDocument*) m_docs.GetFirst()->GetData();
         return doc->GetFirstView();
     }
         wxDocument* doc = (wxDocument*) m_docs.GetFirst()->GetData();
         return doc->GetFirstView();
     }

-    return (wxView *) NULL;
+    return NULL;

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

-wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
+namespace

 {
 {

-    wxDocTemplate   **templates = new wxDocTemplate *[m_templates.GetCount()];
-    int               n = 0;

 
 

-    for (size_t i = 0; i < m_templates.GetCount(); i++)
+// helper function: return only the visible templates
+wxDocTemplates GetVisibleTemplates(const wxList& allTemplates)
+{
+    // select only the visible templates
+    const size_t totalNumTemplates = allTemplates.GetCount();
+    wxDocTemplates templates;
+    if ( totalNumTemplates )

     {
     {

-        wxDocTemplate *temp = (wxDocTemplate *)(m_templates.Item(i)->GetData());
-        if (temp->IsVisible())
+        templates.reserve(totalNumTemplates);
+
+        for ( wxList::const_iterator i = allTemplates.begin(),
+                                   end = allTemplates.end();
+              i != end;
+              ++i )

         {
         {

-            templates[n] = temp;
-            n ++;
+            wxDocTemplate * const temp = (wxDocTemplate *)*i;
+            if ( temp->IsVisible() )
+                templates.push_back(temp);

         }
     }
         }
     }

-    if (n == 0)
-    {
-        delete[] templates;
-        return (wxDocument *) NULL;
-    }

 
 

-    wxDocument* docToClose = NULL;
+    return templates;
+}

 
 

-    // If we've reached the max number of docs, close the
-    // first one.
-    if ( (int)GetDocuments().GetCount() >= m_maxDocsOpen )
+} // anonymous namespace
+
+wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)
+{
+    // 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 )

     {
     {

-        wxDocument *doc = (wxDocument *)GetDocuments().GetFirst()->GetData();
-        docToClose = doc;
+        // no templates can be used, can't create document
+        return NULL;

     }
 
     }
 

-    // New document: user chooses a template, unless there's only one.
-    if (flags & wxDOC_NEW)
-    {
-        if (n == 1)
-        {
-            if (docToClose)
-            {
-                if (!CloseDocument(docToClose, FALSE))
-                {
-                    delete[] templates;
-                    return NULL;
-                }
-            }

 
 

-            wxDocTemplate *temp = templates[0];
-            delete[] templates;
-            wxDocument *newDoc = temp->CreateDocument(path, flags);
+    // 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" );

 
 

-            if (newDoc)
-            {
-                newDoc->SetDocumentName(temp->GetDocumentName());
-                newDoc->SetDocumentTemplate(temp);
-                newDoc->OnNewDocument();
-            }
-            return newDoc;
+        temp = FindTemplateForPath(path);
+        if ( !temp )
+        {
+            wxLogWarning(_("The format of file '%s' couldn't be determined."),
+                         path);

         }
         }

+    }
+    else // not silent, ask the user
+    {
+        // for the new file we need just the template, for an existing one we
+        // need the template and the path, unless it's already specified
+        if ( (flags & wxDOC_NEW) || !path.empty() )
+            temp = SelectDocumentType(&templates[0], numTemplates);
+        else
+            temp = SelectDocumentPath(&templates[0], numTemplates, path, flags);
+    }

 
 

-        wxDocTemplate *temp = SelectDocumentType(templates, n);
-        delete[] templates;
-        if (temp)
+    if ( !temp )
+        return NULL;
+
+    // check whether the document with this path is already opened
+    if ( !path.empty() )
+    {
+        const wxFileName fn(path);
+        for ( wxList::const_iterator i = m_docs.begin(); i != m_docs.end(); ++i )

         {
         {

-            if (docToClose)
+            wxDocument * const doc = (wxDocument*)*i;
+
+            if ( fn == doc->GetFilename() )

             {
             {

-                if (!CloseDocument(docToClose, FALSE))
+                // file already open, just activate it and return
+                if ( doc->GetFirstView() )

                 {
                 {

-                    return NULL;
+                    ActivateView(doc->GetFirstView());
+                    if ( doc->GetDocumentWindow() )
+                        doc->GetDocumentWindow()->SetFocus();
+                    return doc;

                 }
             }
                 }
             }

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

         }
         }

-        else
-            return (wxDocument *) NULL;

     }
 
     }
 

-    // Existing document
-    wxDocTemplate *temp = (wxDocTemplate *) NULL;

 
 

-    wxString path2(wxT(""));
-    if (path != wxT(""))
-        path2 = path;
+    // no, we need to create a new document
+

 
 

-    if (flags & wxDOC_SILENT)
+    // if we've reached the max number of docs, close the first one.
+    if ( (int)GetDocuments().GetCount() >= m_maxDocsOpen )

     {
     {

-        temp = FindTemplateForPath(path2);
-        if (!temp)
+        if ( !CloseDocument((wxDocument *)GetDocuments().GetFirst()->GetData()) )

         {
         {

-            // Since we do not add files with non-default extensions to the FileHistory this
-            // can only happen if the application changes the allowed templates in runtime.
-            (void)wxMessageBox(_("Sorry, the format for this file is unknown."),
-                                _("Open File"),
-                               wxOK | wxICON_EXCLAMATION, wxFindSuitableParent());
+            // can't open the new document if closing the old one failed
+            return NULL;

         }
     }
         }
     }

-    else
-        temp = SelectDocumentPath(templates, n, path2, flags);

 
 

-    delete[] templates;

 
 

-    if (temp)
-    {
-        if (docToClose)
-        {
-            if (!CloseDocument(docToClose, FALSE))
-            {
-                return NULL;
-            }
-        }
+    // do create and initialize the new document finally
+    wxDocument * const docNew = temp->CreateDocument(path, flags);
+    if ( !docNew )
+        return NULL;

 
 

-        wxDocument *newDoc = temp->CreateDocument(path2, flags);
-        if (newDoc)
-        {
-            newDoc->SetDocumentName(temp->GetDocumentName());
-            newDoc->SetDocumentTemplate(temp);
-            if (!newDoc->OnOpenDocument(path2))
-            {
-                newDoc->DeleteAllViews();
-                // delete newDoc; // Implicitly deleted by DeleteAllViews
-                return (wxDocument *) NULL;
-            }
-            // 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 (temp->FileMatchesTemplate(path2))
-                AddFileToHistory(path2);
-        }
-        return newDoc;
+    docNew->SetDocumentName(temp->GetDocumentName());
+    docNew->SetDocumentTemplate(temp);
+
+    // call the appropriate function depending on whether we're creating a new
+    // file or opening an existing one
+    if ( !(flags & wxDOC_NEW ? docNew->OnNewDocument()
+                             : docNew->OnOpenDocument(path)) )
+    {
+         // Document is implicitly deleted by DeleteAllViews
+         docNew->DeleteAllViews();
+         return NULL;

     }
 
     }
 

-    return (wxDocument *) NULL;
+    // 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);
+
+    return docNew;

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

-    wxDocTemplate   **templates = new wxDocTemplate *[m_templates.GetCount()];
-    int               n =0;
+    wxDocTemplates templates(GetVisibleTemplates(m_templates));
+    const size_t numTemplates = templates.size();

 
 

-    for (size_t i = 0; i < m_templates.GetCount(); i++)
-    {
-        wxDocTemplate *temp = (wxDocTemplate *)(m_templates.Item(i)->GetData());
-        if (temp->IsVisible())
-        {
-            if (temp->GetDocumentName() == doc->GetDocumentName())
-            {
-                templates[n] = temp;
-                n ++;
-            }
-        }
-    }
-    if (n == 0)
-    {
-        delete[] templates;
-        return (wxView *) NULL;
-    }
-    if (n == 1)
-    {
-        wxDocTemplate *temp = templates[0];
-        delete[] templates;
-        wxView *view = temp->CreateView(doc, flags);
-        if (view)
-            view->SetViewName(temp->GetViewName());
-        return view;
-    }
+    if ( numTemplates == 0 )
+        return NULL;

 
 

-    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;
+    wxDocTemplate * const
+    temp = numTemplates == 1 ? templates[0]
+                             : SelectViewType(&templates[0], numTemplates);
+
+    if ( !temp )
+        return NULL;
+
+    wxView *view = temp->CreateView(doc, flags);
+    if ( view )
+        view->SetViewName(temp->GetViewName());
+    return view;

 }
 
 // Not yet implemented
 }
 
 // Not yet implemented

-void wxDocManager::DeleteTemplate(wxDocTemplate *WXUNUSED(temp), long WXUNUSED(flags))
+void
+wxDocManager::DeleteTemplate(wxDocTemplate *WXUNUSED(temp), long WXUNUSED(flags))

 {
 }
 
 // Not yet implemented
 bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc))
 {
 {
 }
 
 // Not yet implemented
 bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc))
 {

-    return FALSE;
+    return false;

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


@@ -1291,30 +1319,46 @@ wxDocument *wxDocManager::GetCurrentDocument() const
     if (view)
         return view->GetDocument();
     else
     if (view)
         return view->GetDocument();
     else

-        return (wxDocument *) NULL;
+        return NULL;
+}
+
+// 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

 
 

-// Make a default document name
-bool wxDocManager::MakeDefaultName(wxString& name)
+wxString wxDocManager::MakeNewDocumentName()

 {
 {

-    name.Printf(_("unnamed%d"), m_defaultDocumentNameCounter);
-    m_defaultDocumentNameCounter++;
+    wxString name;
+
+#if WXWIN_COMPATIBILITY_2_8
+    if ( !MakeDefaultName(name) )
+#endif // WXWIN_COMPATIBILITY_2_8
+    {
+        name.Printf(_("unnamed%d"), m_defaultDocumentNameCounter);
+        m_defaultDocumentNameCounter++;
+    }

 
 

-    return TRUE;
+    return name;

 }
 
 // Make a frame title (override this to do something different)
 // If docName is empty, a document is not currently active.
 wxString wxDocManager::MakeFrameTitle(wxDocument* doc)
 {
 }
 
 // Make a frame title (override this to do something different)
 // If docName is empty, a document is not currently active.
 wxString wxDocManager::MakeFrameTitle(wxDocument* doc)
 {

-    wxString appName = wxTheApp->GetAppName();
+    wxString appName = wxTheApp->GetAppDisplayName();

     wxString title;
     if (!doc)
         title = appName;
     else
     {
     wxString title;
     if (!doc)
         title = appName;
     else
     {

-        wxString docName;
-        doc->GetPrintableName(docName);
+        wxString docName = doc->GetUserReadableName();

         title = docName + wxString(_(" - ")) + appName;
     }
     return title;
         title = docName + wxString(_(" - ")) + appName;
     }
     return title;


@@ -1324,7 +1368,7 @@ wxString wxDocManager::MakeFrameTitle(wxDocument* doc)
 // Not yet implemented
 wxDocTemplate *wxDocManager::MatchTemplate(const wxString& WXUNUSED(path))
 {
 // Not yet implemented
 wxDocTemplate *wxDocManager::MatchTemplate(const wxString& WXUNUSED(path))
 {

-    return (wxDocTemplate *) NULL;
+    return NULL;

 }
 
 // File history management
 }
 
 // File history management


@@ -1363,7 +1407,7 @@ void wxDocManager::FileHistoryRemoveMenu(wxMenu *menu)
 }
 
 #if wxUSE_CONFIG
 }
 
 #if wxUSE_CONFIG

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

 {
     if (m_fileHistory)
         m_fileHistory->Load(config);
 {
     if (m_fileHistory)
         m_fileHistory->Load(config);


@@ -1398,7 +1442,7 @@ size_t wxDocManager::GetHistoryFilesCount() const
 // against that of the template
 wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path)
 {
 // against that of the template
 wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path)
 {

-    wxDocTemplate *theTemplate = (wxDocTemplate *) NULL;
+    wxDocTemplate *theTemplate = NULL;

 
     // Find the template which this extension corresponds to
     for (size_t i = 0; i < m_templates.GetCount(); i++)
 
     // Find the template which this extension corresponds to
     for (size_t i = 0; i < m_templates.GetCount(); i++)


@@ -1413,38 +1457,12 @@ wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path)
     return theTemplate;
 }
 
     return theTemplate;
 }
 

-// Try to get a more suitable parent frame than the top window,
-// for selection dialogs. Otherwise you may get an unexpected
-// window being activated when a dialog is shown.
-static wxWindow* wxFindSuitableParent()
-{
-    wxWindow* parent = wxTheApp->GetTopWindow();
-
-    wxWindow* focusWindow = wxWindow::FindFocus();
-    if (focusWindow)
-    {
-        while (focusWindow &&
-                !focusWindow->IsKindOf(CLASSINFO(wxDialog)) &&
-                !focusWindow->IsKindOf(CLASSINFO(wxFrame)))
-
-            focusWindow = focusWindow->GetParent();
-
-        if (focusWindow)
-            parent = focusWindow;
-    }
-    return parent;
-}
-

 // 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,
 // 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,

-#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__)

                                                 int noTemplates,
                                                 int noTemplates,

-#else
-                                                int WXUNUSED(noTemplates),
-#endif

                                                 wxString& path,
                                                 long WXUNUSED(flags),
                                                 bool WXUNUSED(save))
                                                 wxString& path,
                                                 long WXUNUSED(flags),
                                                 bool WXUNUSED(save))


@@ -1459,7 +1477,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
         if (templates[i]->IsVisible())
         {
             // add a '|' to separate this filter from the previous one
         if (templates[i]->IsVisible())
         {
             // add a '|' to separate this filter from the previous one

-            if ( !descrBuf.IsEmpty() )
+            if ( !descrBuf.empty() )

                 descrBuf << wxT('|');
 
             descrBuf << templates[i]->GetDescription()
                 descrBuf << wxT('|');
 
             descrBuf << templates[i]->GetDescription()


@@ -1469,36 +1487,37 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
     }
 #else
     wxString descrBuf = wxT("*.*");
     }
 #else
     wxString descrBuf = wxT("*.*");

+    wxUnusedVar(noTemplates);

 #endif
 
     int FilterIndex = -1;
 
     wxWindow* parent = wxFindSuitableParent();
 
 #endif
 
     int FilterIndex = -1;
 
     wxWindow* parent = wxFindSuitableParent();
 

-    wxString pathTmp = wxFileSelectorEx(_("Select a file"),
+    wxString pathTmp = wxFileSelectorEx(_("Open File"),

                                         m_lastDirectory,
                                         m_lastDirectory,

-                                        wxT(""),
+                                        wxEmptyString,

                                         &FilterIndex,
                                         descrBuf,
                                         0,
                                         parent);
 
                                         &FilterIndex,
                                         descrBuf,
                                         0,
                                         parent);
 

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

     {
         if (!wxFileExists(pathTmp))
         {
             wxString msgTitle;
     {
         if (!wxFileExists(pathTmp))
         {
             wxString msgTitle;

-            if (!wxTheApp->GetAppName().IsEmpty())
-                msgTitle = wxTheApp->GetAppName();
+            if (!wxTheApp->GetAppDisplayName().empty())
+                msgTitle = wxTheApp->GetAppDisplayName();

             else
                 msgTitle = wxString(_("File error"));
 
             (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
                 parent);
 
             else
                 msgTitle = wxString(_("File error"));
 
             (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
                 parent);
 

-            path = wxT("");
-            return (wxDocTemplate *) NULL;
+            path = wxEmptyString;
+            return NULL;

         }
         m_lastDirectory = wxPathOnly(pathTmp);
 
         }
         m_lastDirectory = wxPathOnly(pathTmp);
 


@@ -1521,7 +1540,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
     }
     else
     {
     }
     else
     {

-        path = wxT("");
+        path = wxEmptyString;

     }
 
     return theTemplate;
     }
 
     return theTemplate;


@@ -1540,14 +1559,14 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
         if (templates[i]->IsVisible())
         {
             int j;
         if (templates[i]->IsVisible())
         {
             int j;

-            bool want = TRUE;
+            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
                    )
             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;
+                    want = false;

             }
 
             if ( want )
             }
 
             if ( want )


@@ -1562,7 +1581,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
 
     if (sort)
     {
 
     if (sort)
     {

-        strings.Sort(wxStringSortAscending);
+        strings.Sort(); // ascending sort

         // Yes, this will be slow, but template lists
         // are typically short.
         int j;
         // Yes, this will be slow, but template lists
         // are typically short.
         int j;


@@ -1587,7 +1606,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
             break;
 
         case 1:
             break;
 
         case 1:

-            // don't propose the user to choose if he heas no choice
+            // don't propose the user to choose if he has no choice

             theTemplate = data[0];
             break;
 
             theTemplate = data[0];
             break;
 


@@ -1622,12 +1641,12 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
         if ( templ->IsVisible() && !templ->GetViewName().empty() )
         {
             int j;
         if ( templ->IsVisible() && !templ->GetViewName().empty() )
         {
             int j;

-            bool want = TRUE;
+            bool want = true;

             for (j = 0; j < n; j++)
             {
                 //filter out NOT unique views
                 if ( templates[i]->m_viewTypeName == data[j]->m_viewTypeName )
             for (j = 0; j < n; j++)
             {
                 //filter out NOT unique views
                 if ( templates[i]->m_viewTypeName == data[j]->m_viewTypeName )

-                    want = FALSE;
+                    want = false;

             }
 
             if ( want )
             }
 
             if ( want )


@@ -1641,7 +1660,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
 
     if (sort)
     {
 
     if (sort)
     {

-        strings.Sort(wxStringSortAscending);
+        strings.Sort(); // ascending sort

         // Yes, this will be slow, but template lists
         // are typically short.
         int j;
         // Yes, this will be slow, but template lists
         // are typically short.
         int j;


@@ -1662,7 +1681,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
     switch ( n )
     {
         case 0:
     switch ( n )
     {
         case 0:

-            theTemplate = (wxDocTemplate *)NULL;
+            theTemplate = NULL;

             break;
 
         case 1:
             break;
 
         case 1:


@@ -1721,7 +1740,7 @@ void wxDocManager::ActivateView(wxView *view, bool activate)
         if ( m_currentView == view )
         {
             // don't keep stale pointer
         if ( m_currentView == view )
         {
             // don't keep stale pointer

-            m_currentView = (wxView *) NULL;
+            m_currentView = NULL;

         }
     }
 }
         }
     }
 }


@@ -1752,26 +1771,15 @@ wxDocChildFrame::wxDocChildFrame(wxDocument *doc,
         view->SetFrame(this);
 }
 
         view->SetFrame(this);
 }
 

-wxDocChildFrame::~wxDocChildFrame()
+bool wxDocChildFrame::TryValidator(wxEvent& event)

 {
 {

-}
+    if ( !m_childView )
+        return false;

 
 

-// Extend event processing to search the view's event table
-bool wxDocChildFrame::ProcessEvent(wxEvent& event)
-{
-    if (m_childView)
-        m_childView->Activate(TRUE);
+    // FIXME: why is this needed here?
+    m_childView->Activate(true);

 
 

-    if ( !m_childView || ! m_childView->ProcessEvent(event) )
-    {
-        // 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;
-    }
-    else
-        return TRUE;
+    return m_childView->ProcessEventHere(event);

 }
 
 void wxDocChildFrame::OnActivate(wxActivateEvent& event)
 }
 
 void wxDocChildFrame::OnActivate(wxActivateEvent& event)


@@ -1786,18 +1794,16 @@ void wxDocChildFrame::OnCloseWindow(wxCloseEvent& event)
 {
     if (m_childView)
     {
 {
     if (m_childView)
     {

-        bool ans = FALSE;
-        if (!event.CanVeto())
-            ans = TRUE; // Must delete.
-        else
-            ans = m_childView->Close(FALSE); // FALSE means don't delete associated window
+        bool ans = event.CanVeto()
+                    ? m_childView->Close(false) // false means don't delete associated window
+                    : true; // Must delete.

 
         if (ans)
         {
 
         if (ans)
         {

-            m_childView->Activate(FALSE);
+            m_childView->Activate(false);

             delete m_childView;
             delete m_childView;

-            m_childView = (wxView *) NULL;
-            m_childDocument = (wxDocument *) NULL;
+            m_childView = NULL;
+            m_childDocument = NULL;

 
             this->Destroy();
         }
 
             this->Destroy();
         }


@@ -1818,6 +1824,11 @@ BEGIN_EVENT_TABLE(wxDocParentFrame, wxFrame)
     EVT_CLOSE(wxDocParentFrame::OnCloseWindow)
 END_EVENT_TABLE()
 
     EVT_CLOSE(wxDocParentFrame::OnCloseWindow)
 END_EVENT_TABLE()
 

+wxDocParentFrame::wxDocParentFrame()
+{
+    m_docManager = NULL;
+}
+

 wxDocParentFrame::wxDocParentFrame(wxDocManager *manager,
                                    wxFrame *frame,
                                    wxWindowID id,
 wxDocParentFrame::wxDocParentFrame(wxDocManager *manager,
                                    wxFrame *frame,
                                    wxWindowID id,


@@ -1831,6 +1842,19 @@ wxDocParentFrame::wxDocParentFrame(wxDocManager *manager,
     m_docManager = manager;
 }
 
     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);
+}
+

 void wxDocParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 {
     Close();
 void wxDocParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 {
     Close();


@@ -1840,41 +1864,39 @@ void wxDocParentFrame::OnMRUFile(wxCommandEvent& event)
 {
     int n = event.GetId() - wxID_FILE1;  // the index in MRU list
     wxString filename(m_docManager->GetHistoryFile(n));
 {
     int n = event.GetId() - wxID_FILE1;  // the index in MRU list
     wxString filename(m_docManager->GetHistoryFile(n));

-    if ( !filename.IsEmpty() )
-    {
-        // verify that the file exists before doing anything else
-        if ( wxFile::Exists(filename) )
-        {
-            // try to open it
-            if (!m_docManager->CreateDocument(filename, wxDOC_SILENT))
-            {
-                // remove the file from the MRU list. The user should already be notified.
-                m_docManager->RemoveFileFromHistory(n);
+    if ( filename.empty() )
+        return;

 
 

-                wxLogError(_("The file '%s' couldn't be opened.\nIt has been removed from the most recently used files list."),
-                       filename.c_str());
-            }
-        }
-        else
-        {
-            // remove the bogus filename from the MRU list and notify the user
-            // about it
-            m_docManager->RemoveFileFromHistory(n);
+    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;

 
 

-            wxLogError(_("The file '%s' doesn't exist and couldn't be opened.\nIt has been removed from the most recently used files list."),
-                       filename.c_str());
-        }
+        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.");

     }
     }

+
+
+    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
 }
 
 // Extend event processing to search the view's event table

-bool wxDocParentFrame::ProcessEvent(wxEvent& event)
+bool wxDocParentFrame::TryValidator(wxEvent& event)

 {
 {

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

 }
 
 // Define the behaviour for the frame closing
 }
 
 // Define the behaviour for the frame closing


@@ -1904,8 +1926,10 @@ bool wxDocPrintout::OnPrintPage(int WXUNUSED(page))
     // Get the logical pixels per inch of screen and printer
     int ppiScreenX, ppiScreenY;
     GetPPIScreen(&ppiScreenX, &ppiScreenY);
     // Get the logical pixels per inch of screen and printer
     int ppiScreenX, ppiScreenY;
     GetPPIScreen(&ppiScreenX, &ppiScreenY);

+    wxUnusedVar(ppiScreenY);

     int ppiPrinterX, ppiPrinterY;
     GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);
     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
 
     // This scales the DC so that the printout roughly represents the
     // the screen scaling. The text point size _should_ be the right size


@@ -1920,6 +1944,7 @@ bool wxDocPrintout::OnPrintPage(int WXUNUSED(page))
     int w, h;
     dc->GetSize(&w, &h);
     GetPageSizePixels(&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.
 
     // If printer pageWidth == current DC width, then this doesn't
     // change. But w might be the preview bitmap width, so scale down.


@@ -1930,7 +1955,7 @@ bool wxDocPrintout::OnPrintPage(int WXUNUSED(page))
     {
         m_printoutView->OnDraw(dc);
     }
     {
         m_printoutView->OnDraw(dc);
     }

-    return TRUE;
+    return true;

 }
 
 bool wxDocPrintout::HasPage(int pageNum)
 }
 
 bool wxDocPrintout::HasPage(int pageNum)


@@ -1941,9 +1966,9 @@ bool wxDocPrintout::HasPage(int pageNum)
 bool wxDocPrintout::OnBeginDocument(int startPage, int endPage)
 {
     if (!wxPrintout::OnBeginDocument(startPage, endPage))
 bool wxDocPrintout::OnBeginDocument(int startPage, int endPage)
 {
     if (!wxPrintout::OnBeginDocument(startPage, endPage))

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo)
 }
 
 void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo)


@@ -1957,203 +1982,131 @@ void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, in
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
 // ----------------------------------------------------------------------------

-// File history processor
+// File history (a.k.a. MRU, most recently used, files list)

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

-static inline wxChar* MYcopystring(const wxString& s)
-{
-    wxChar* copy = new wxChar[s.length() + 1];
-    return wxStrcpy(copy, s.c_str());
-}
-
-static inline wxChar* MYcopystring(const wxChar* s)
-{
-    wxChar* copy = new wxChar[wxStrlen(s) + 1];
-    return wxStrcpy(copy, s);
-}
-

 wxFileHistory::wxFileHistory(size_t maxFiles, wxWindowID idBase)
 {
     m_fileMaxFiles = maxFiles;
     m_idBase = idBase;
 wxFileHistory::wxFileHistory(size_t maxFiles, wxWindowID idBase)
 {
     m_fileMaxFiles = maxFiles;
     m_idBase = idBase;

-    m_fileHistoryN = 0;
-    m_fileHistory = new wxChar *[m_fileMaxFiles];

 }
 
 }
 

-wxFileHistory::~wxFileHistory()
-{
-    size_t i;
-    for (i = 0; i < m_fileHistoryN; i++)
-        delete[] m_fileHistory[i];
-    delete[] m_fileHistory;
-}
-
-// File history management

 void wxFileHistory::AddFileToHistory(const wxString& file)
 {
 void wxFileHistory::AddFileToHistory(const wxString& file)
 {

-    size_t i;
-
-    // Check we don't already have this file
-    for (i = 0; i < m_fileHistoryN; i++)
+    // 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 defined( __WXMSW__ ) // Add any other OSes with case insensitive file names
-        wxString testString;
-        if ( m_fileHistory[i] )
-            testString = m_fileHistory[i];
-        if ( m_fileHistory[i] && ( file.Lower() == testString.Lower() ) )
-#else
-        if ( m_fileHistory[i] && ( file == m_fileHistory[i] ) )
-#endif
+        if ( fnNew == m_fileHistory[i] )

         {
             // we do have it, move it to the top of the history
         {
             // we do have it, move it to the top of the history

-            RemoveFileFromHistory (i);
-            AddFileToHistory (file);
-            return;
+            RemoveFileFromHistory(i);
+            numFiles--;
+            break;

         }
     }
 
     // if we already have a full history, delete the one at the end
         }
     }
 
     // if we already have a full history, delete the one at the end

-    if ( m_fileMaxFiles == m_fileHistoryN )
+    if ( numFiles == m_fileMaxFiles )

     {
     {

-        RemoveFileFromHistory (m_fileHistoryN - 1);
-        AddFileToHistory (file);
-        return;
+        RemoveFileFromHistory(--numFiles);

     }
 
     }
 

-    // Add to the project file history:
-    // Move existing files (if any) down so we can insert file at beginning.
-    if (m_fileHistoryN < m_fileMaxFiles)
-    {
-        wxList::compatibility_iterator node = m_fileMenus.GetFirst();
-        while (node)
-        {
-            wxMenu* menu = (wxMenu*) node->GetData();
-            if ( m_fileHistoryN == 0 && menu->GetMenuItemCount() )
-            {
-                menu->AppendSeparator();
-            }
-            menu->Append(m_idBase+m_fileHistoryN, _("[EMPTY]"));
-            node = node->GetNext();
-        }
-        m_fileHistoryN ++;
-    }
-    // Shuffle filenames down
-    for (i = (m_fileHistoryN-1); i > 0; i--)
+    // 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() )

     {
     {

-        m_fileHistory[i] = m_fileHistory[i-1];
+        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, " ");

     }
     }

-    m_fileHistory[0] = MYcopystring(file);

 
 

-    // this is the directory of the last opened file
-    wxString pathCurrent;
-    wxSplitPath( m_fileHistory[0], &pathCurrent, NULL, NULL );
-    for (i = 0; i < m_fileHistoryN; i++)
+    // 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 ( m_fileHistory[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() )

         {
         {

-            // if in same directory just show the filename; otherwise the full
-            // path
-            wxString pathInMenu, path, filename, ext;
-            wxSplitPath( m_fileHistory[i], &path, &filename, &ext );
-            if ( path == pathCurrent )
-            {
-                pathInMenu = filename;
-                if ( !ext.empty() )
-                    pathInMenu = pathInMenu + wxFILE_SEP_EXT + ext;
-            }
-            else
-            {
-                // absolute path; could also set relative path
-                pathInMenu = m_fileHistory[i];
-            }
+            pathInMenu = fnOld.GetFullName();
+        }
+        else // file in different directory
+        {
+            // absolute path; could also set relative path
+            pathInMenu = m_fileHistory[i];
+        }

 
 

-            wxString buf;
-            buf.Printf(s_MRUEntryFormat, i + 1, pathInMenu.c_str());
-            wxList::compatibility_iterator node = m_fileMenus.GetFirst();
-            while (node)
-            {
-                wxMenu* menu = (wxMenu*) node->GetData();
-                menu->SetLabel(m_idBase + i, buf);
-                node = node->GetNext();
-            }
+        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)
 {
         }
     }
 }
 
 void wxFileHistory::RemoveFileFromHistory(size_t i)
 {

-    wxCHECK_RET( i < m_fileHistoryN,
+    size_t numFiles = m_fileHistory.size();
+    wxCHECK_RET( i < numFiles,

                  wxT("invalid index in wxFileHistory::RemoveFileFromHistory") );
 
                  wxT("invalid index in wxFileHistory::RemoveFileFromHistory") );
 

-    // delete the element from the array (could use memmove() too...)
-    delete [] m_fileHistory[i];
+    // delete the element from the array
+    m_fileHistory.RemoveAt(i);
+    numFiles--;

 
 

-    size_t j;
-    for ( j = i; j < m_fileHistoryN - 1; j++ )
+    for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst();
+          node;
+          node = node->GetNext() )

     {
     {

-        m_fileHistory[j] = m_fileHistory[j + 1];
-    }
+        wxMenu * const menu = (wxMenu *) node->GetData();

 
 

-    wxList::compatibility_iterator node = m_fileMenus.GetFirst();
-    while ( node )
-    {
-         wxMenu* menu = (wxMenu*) node->GetData();
-
-         // shuffle filenames up
-         wxString buf;
-         for ( j = i; j < m_fileHistoryN - 1; j++ )
-         {
-             buf.Printf(s_MRUEntryFormat, j + 1, m_fileHistory[j]);
-             menu->SetLabel(m_idBase + j, buf);
-         }
-
-         node = node->GetNext();
+        // 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
 
         // delete the last menu item which is unused now

-        wxWindowID lastItemId = m_idBase + m_fileHistoryN - 1;
-        if (menu->FindItem(lastItemId))
-        {
+        const wxWindowID lastItemId = m_idBase + numFiles;
+        if ( menu->FindItem(lastItemId) )

             menu->Delete(lastItemId);
             menu->Delete(lastItemId);

-        }

 
         // delete the last separator too if no more files are left
 
         // delete the last separator too if no more files are left

-        if ( m_fileHistoryN == 1 )
+        if ( m_fileHistory.empty() )

         {
         {

-            wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetLast();
-            if ( node )
+            const wxMenuItemList::compatibility_iterator
+                nodeLast = menu->GetMenuItems().GetLast();
+            if ( nodeLast )

             {
             {

-                wxMenuItem *menuItem = node->GetData();
-                if ( menuItem->IsSeparator() )
-                {
-                    menu->Delete(menuItem);
-                }
-                //else: should we search backwards for the last separator?
+                wxMenuItem * const lastMenuItem = nodeLast->GetData();
+                if ( lastMenuItem->IsSeparator() )
+                    menu->Delete(lastMenuItem);

             }
             //else: menu is empty somehow
         }
     }
             }
             //else: menu is empty somehow
         }
     }

-
-    m_fileHistoryN--;
-}
-
-wxString wxFileHistory::GetHistoryFile(size_t i) const
-{
-    wxString s;
-    if ( i < m_fileHistoryN )
-    {
-        s = m_fileHistory[i];
-    }
-    else
-    {
-        wxFAIL_MSG( wxT("bad index in wxFileHistory::GetHistoryFile") );
-    }
-
-    return s;

 }
 
 void wxFileHistory::UseMenu(wxMenu *menu)
 {
 }
 
 void wxFileHistory::UseMenu(wxMenu *menu)
 {

-    if (!m_fileMenus.Member(menu))
+    if ( !m_fileMenus.Member(menu) )

         m_fileMenus.Append(menu);
 }
 
         m_fileMenus.Append(menu);
 }
 


@@ -2163,19 +2116,23 @@ void wxFileHistory::RemoveMenu(wxMenu *menu)
 }
 
 #if wxUSE_CONFIG
 }
 
 #if wxUSE_CONFIG

-void wxFileHistory::Load(wxConfigBase& config)
+void wxFileHistory::Load(const wxConfigBase& config)

 {
 {

-    m_fileHistoryN = 0;
+    m_fileHistory.Clear();
+

     wxString buf;
     wxString buf;

-    buf.Printf(wxT("file%d"), (int)m_fileHistoryN+1);
+    buf.Printf(wxT("file%d"), 1);
+

     wxString historyFile;
     wxString historyFile;

-    while ((m_fileHistoryN < m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != wxT("")))
+    while ((m_fileHistory.GetCount() < m_fileMaxFiles) &&
+           config.Read(buf, &historyFile) && !historyFile.empty())

     {
     {

-        m_fileHistory[m_fileHistoryN] = MYcopystring((const wxChar*) historyFile);
-        m_fileHistoryN ++;
-        buf.Printf(wxT("file%d"), (int)m_fileHistoryN+1);
-        historyFile = wxT("");
+        m_fileHistory.Add(historyFile);
+
+        buf.Printf(wxT("file%d"), (int)m_fileHistory.GetCount()+1);
+        historyFile = wxEmptyString;

     }
     }

+

     AddFilesToMenu();
 }
 
     AddFilesToMenu();
 }
 


@@ -2186,7 +2143,7 @@ void wxFileHistory::Save(wxConfigBase& config)
     {
         wxString buf;
         buf.Printf(wxT("file%d"), (int)i+1);
     {
         wxString buf;
         buf.Printf(wxT("file%d"), (int)i+1);

-        if (i < m_fileHistoryN)
+        if (i < m_fileHistory.GetCount())

             config.Write(buf, wxString(m_fileHistory[i]));
         else
             config.Write(buf, wxEmptyString);
             config.Write(buf, wxString(m_fileHistory[i]));
         else
             config.Write(buf, wxEmptyString);


@@ -2196,51 +2153,28 @@ void wxFileHistory::Save(wxConfigBase& config)
 
 void wxFileHistory::AddFilesToMenu()
 {
 
 void wxFileHistory::AddFilesToMenu()
 {

-    if (m_fileHistoryN > 0)
-    {
-        wxList::compatibility_iterator node = m_fileMenus.GetFirst();
-        while (node)
-        {
-            wxMenu* menu = (wxMenu*) node->GetData();
-            if (menu->GetMenuItemCount())
-            {
-                menu->AppendSeparator();
-            }
+    if ( m_fileHistory.empty() )
+        return;

 
 

-            size_t i;
-            for (i = 0; i < m_fileHistoryN; i++)
-            {
-                if (m_fileHistory[i])
-                {
-                    wxString buf;
-                    buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]);
-                    menu->Append(m_idBase+i, buf);
-                }
-            }
-            node = node->GetNext();
-        }
+    for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        AddFilesToMenu((wxMenu *) node->GetData());

     }
 }
 
 void wxFileHistory::AddFilesToMenu(wxMenu* menu)
 {
     }
 }
 
 void wxFileHistory::AddFilesToMenu(wxMenu* menu)
 {

-    if (m_fileHistoryN > 0)
-    {
-        if (menu->GetMenuItemCount())
-        {
-            menu->AppendSeparator();
-        }
+    if ( m_fileHistory.empty() )
+        return;

 
 

-        size_t i;
-        for (i = 0; i < m_fileHistoryN; i++)
-        {
-            if (m_fileHistory[i])
-            {
-                wxString buf;
-                buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]);
-                menu->Append(m_idBase+i, buf);
-            }
-        }
+    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]));

     }
 }
 
     }
 }
 


@@ -2255,7 +2189,7 @@ bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream)
 {
     wxFFile file(filename, _T("rb"));
     if ( !file.IsOpened() )
 {
     wxFFile file(filename, _T("rb"));
     if ( !file.IsOpened() )

-        return FALSE;
+        return false;

 
     char buf[4096];
 
 
     char buf[4096];
 


@@ -2264,22 +2198,22 @@ bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream)
     {
         nRead = file.Read(buf, WXSIZEOF(buf));
         if ( file.Error() )
     {
         nRead = file.Read(buf, WXSIZEOF(buf));
         if ( file.Error() )

-            return FALSE;
+            return false;

 
         stream.write(buf, nRead);
         if ( !stream )
 
         stream.write(buf, nRead);
         if ( !stream )

-            return FALSE;
+            return false;

     }
     while ( !file.Eof() );
 
     }
     while ( !file.Eof() );
 

-    return TRUE;
+    return true;

 }
 
 bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename)
 {
     wxFFile file(filename, _T("wb"));
     if ( !file.IsOpened() )
 }
 
 bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename)
 {
     wxFFile file(filename, _T("wb"));
     if ( !file.IsOpened() )

-        return FALSE;
+        return false;

 
     char buf[4096];
     do
 
     char buf[4096];
     do


@@ -2288,12 +2222,12 @@ bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename)
         if ( !stream.bad() ) // fail may be set on EOF, don't use operator!()
         {
             if ( !file.Write(buf, stream.gcount()) )
         if ( !stream.bad() ) // fail may be set on EOF, don't use operator!()
         {
             if ( !file.Write(buf, stream.gcount()) )

-                return FALSE;
+                return false;

         }
     }
     while ( !stream.eof() );
 
         }
     }
     while ( !stream.eof() );
 

-    return TRUE;
+    return true;

 }
 
 #else // !wxUSE_STD_IOSTREAM
 }
 
 #else // !wxUSE_STD_IOSTREAM


@@ -2302,7 +2236,7 @@ bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream)
 {
     wxFFile file(filename, _T("rb"));
     if ( !file.IsOpened() )
 {
     wxFFile file(filename, _T("rb"));
     if ( !file.IsOpened() )

-        return FALSE;
+        return false;

 
     char buf[4096];
 
 
     char buf[4096];
 


@@ -2311,38 +2245,44 @@ bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream)
     {
         nRead = file.Read(buf, WXSIZEOF(buf));
         if ( file.Error() )
     {
         nRead = file.Read(buf, WXSIZEOF(buf));
         if ( file.Error() )

-            return FALSE;
+            return false;

 
         stream.Write(buf, nRead);
         if ( !stream )
 
         stream.Write(buf, nRead);
         if ( !stream )

-            return FALSE;
+            return false;

     }
     while ( !file.Eof() );
 
     }
     while ( !file.Eof() );
 

-    return TRUE;
+    return true;

 }
 
 bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename)
 {
     wxFFile file(filename, _T("wb"));
     if ( !file.IsOpened() )
 }
 
 bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename)
 {
     wxFFile file(filename, _T("wb"));
     if ( !file.IsOpened() )

-        return FALSE;
+        return false;

 
     char buf[4096];
 
     char buf[4096];

-    do
+    for ( ;; )

     {
         stream.Read(buf, WXSIZEOF(buf));
 
         const size_t nRead = stream.LastRead();
     {
         stream.Read(buf, WXSIZEOF(buf));
 
         const size_t nRead = stream.LastRead();

-        if ( !nRead || !file.Write(buf, nRead) )
-            return FALSE;
+        if ( !nRead )
+        {
+            if ( stream.Eof() )
+                break;
+
+            return false;
+        }
+
+        if ( !file.Write(buf, nRead) )
+            return false;

     }
     }

-    while ( !stream.Eof() );

 
 

-    return TRUE;
+    return true;

 }
 
 #endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM
 
 #endif // wxUSE_DOC_VIEW_ARCHITECTURE
 }
 
 #endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM
 
 #endif // wxUSE_DOC_VIEW_ARCHITECTURE

-