X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/18759f7850414f46b15a8ed989951e3bc346f830..87eaa6f666513f6209b52ba765b48900fb3ed49f:/src/common/docview.cpp

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index e0720053f1..a72517a65b 100644
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -17,30 +17,31 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "docview.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_DOC_VIEW_ARCHITECTURE
 
+#include "wx/docview.h"
+
 #ifndef WX_PRECOMP
+    #include "wx/list.h"
     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/dc.h"
     #include "wx/dialog.h"
     #include "wx/menu.h"
-    #include "wx/list.h"
     #include "wx/filedlg.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/msgdlg.h"
+    #include "wx/mdi.h"
+    #include "wx/choicdlg.h"
 #endif
 
 #include "wx/ffile.h"
@@ -49,38 +50,32 @@
     #include "wx/filename.h"
 #endif
 
-#ifdef __WXGTK__
-    #include "wx/mdi.h"
-#endif
-
 #if wxUSE_PRINTING_ARCHITECTURE
-  #include "wx/prntbase.h"
-  #include "wx/printdlg.h"
+    #include "wx/prntbase.h"
+    #include "wx/printdlg.h"
 #endif
 
-#include "wx/msgdlg.h"
-#include "wx/choicdlg.h"
-#include "wx/docview.h"
 #include "wx/confbase.h"
 #include "wx/file.h"
 #include "wx/cmdproc.h"
+#include "wx/tokenzr.h"
 
 #include <stdio.h>
 #include <string.h>
 
 #if wxUSE_STD_IOSTREAM
-  #include "wx/ioswrap.h"
-  #if wxUSE_IOSTREAMH
-    #include <fstream.h>
-  #else
-    #include <fstream>
-  #endif
+    #include "wx/ioswrap.h"
+    #if wxUSE_IOSTREAMH
+        #include <fstream.h>
+    #else
+        #include <fstream>
+    #endif
 #else
-  #include "wx/wfstream.h"
+    #include "wx/wfstream.h"
 #endif
 
 // ----------------------------------------------------------------------------
-// wxWindows macros
+// wxWidgets macros
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
@@ -100,7 +95,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
 // function prototypes
 // ----------------------------------------------------------------------------
 
-static inline wxString FindExtension(const wxChar *path);
 static wxWindow* wxFindSuitableParent(void);
 
 // ----------------------------------------------------------------------------
@@ -133,16 +127,16 @@ static wxString FindExtension(const wxChar *path)
 
 wxDocument::wxDocument(wxDocument *parent)
 {
-    m_documentModified = FALSE;
+    m_documentModified = false;
     m_documentParent = parent;
     m_documentTemplate = (wxDocTemplate *) NULL;
     m_commandProcessor = (wxCommandProcessor*) NULL;
-    m_savedYet = FALSE;
+    m_savedYet = false;
 }
 
 bool wxDocument::DeleteContents()
 {
-    return TRUE;
+    return true;
 }
 
 wxDocument::~wxDocument()
@@ -166,7 +160,7 @@ bool wxDocument::Close()
     if (OnSaveModified())
         return OnCloseDocument();
     else
-        return FALSE;
+        return false;
 }
 
 bool wxDocument::OnCloseDocument()
@@ -174,8 +168,8 @@ bool wxDocument::OnCloseDocument()
     // Tell all views that we're about to close
     NotifyClosing();
     DeleteContents();
-    Modify(FALSE);
-    return TRUE;
+    Modify(false);
+    return true;
 }
 
 // Note that this implicitly deletes the document when the last view is
@@ -184,24 +178,44 @@ bool wxDocument::DeleteAllViews()
 {
     wxDocManager* manager = GetDocumentManager();
 
-    wxNode *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;
+    }
+
+    // all views agreed to close, now do close them
+    if ( m_documentViews.empty() )
+    {
+        // normally the document would be implicitly deleted when the last view
+        // is, but if don't have any views, do it here instead
+        if ( manager && manager->GetDocuments().Member(this) )
+            delete this;
+    }
+    else // have views
+    {
+        // as we delete elements we iterate over, don't use the usual "from
+        // begin to end" loop
+        for ( ;; )
+        {
+            wxView *view = (wxView *)*m_documentViews.begin();
 
-        wxNode *next = node->GetNext();
+            bool isLastOne = m_documentViews.size() == 1;
 
-        delete view; // Deletes node implicitly
-        node = next;
+            // this always deletes the node implicitly and if this is the last
+            // view also deletes this object itself (also implicitly, great),
+            // so we can't test for m_documentViews.empty() after calling this!
+            delete view;
+
+            if ( isLastOne )
+                break;
+        }
     }
-    // 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
@@ -219,25 +233,25 @@ wxDocManager *wxDocument::GetDocumentManager() const
 bool wxDocument::OnNewDocument()
 {
     if (!OnSaveModified())
-        return FALSE;
+        return false;
 
-    if (OnCloseDocument()==FALSE) return FALSE;
+    if (OnCloseDocument()==false) return false;
     DeleteContents();
-    Modify(FALSE);
-    SetDocumentSaved(FALSE);
+    Modify(false);
+    SetDocumentSaved(false);
 
     wxString name;
     GetDocumentManager()->MakeDefaultName(name);
     SetTitle(name);
-    SetFilename(name, TRUE);
+    SetFilename(name, true);
 
-    return TRUE;
+    return true;
 }
 
 bool wxDocument::Save()
 {
     if (!IsModified() && m_savedYet)
-        return TRUE;
+        return true;
 
     if ( m_documentFile.empty() || !m_savedYet )
         return SaveAs();
@@ -249,24 +263,55 @@ bool wxDocument::SaveAs()
 {
     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 tmp = wxFileSelector(_("Save as"),
             docTemplate->GetDirectory(),
             wxFileNameFromPath(GetFilename()),
             docTemplate->GetDefaultExtension(),
-            docTemplate->GetFileFilter(),
-            wxSAVE | wxOVERWRITE_PROMPT,
+            filter,
+            wxFD_SAVE | wxFD_OVERWRITE_PROMPT,
             GetDocumentWindow());
 
-    if (tmp.IsEmpty())
-        return FALSE;
+    if (tmp.empty())
+        return false;
 
     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();
@@ -276,7 +321,7 @@ bool wxDocument::SaveAs()
     SetTitle(wxFileNameFromPath(fileName));
 
     // Notify the views that the filename has changed
-    wxNode *node = m_documentViews.GetFirst();
+    wxList::compatibility_iterator node = m_documentViews.GetFirst();
     while (node)
     {
         wxView *view = (wxView *)node->GetData();
@@ -286,7 +331,7 @@ bool wxDocument::SaveAs()
 
     // 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.
@@ -299,93 +344,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.
    }
-   return TRUE;
+   return true;
 }
 
 bool wxDocument::OnSaveDocument(const wxString& file)
 {
     if ( !file )
-        return FALSE;
+        return false;
 
-    wxString msgTitle;
-    if (wxTheApp->GetAppName() != wxT(""))
-        msgTitle = wxTheApp->GetAppName();
-    else
-        msgTitle = wxString(_("File error"));
+    if ( !DoSaveDocument(file) )
+        return false;
 
-#if wxUSE_STD_IOSTREAM
-    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);
-    SetDocumentSaved(TRUE);
+    SetDocumentSaved(true);
 #ifdef __WXMAC__
     wxFileName fn(file) ;
     fn.MacSetDefaultTypeAndCreator() ;
 #endif
-    return TRUE;
+    return true;
 }
 
 bool wxDocument::OnOpenDocument(const wxString& file)
 {
     if (!OnSaveModified())
-        return FALSE;
+        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();
 
-    return TRUE;
+    return true;
 }
 
 #if wxUSE_STD_IOSTREAM
@@ -408,27 +402,27 @@ wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream)
 
 bool wxDocument::Revert()
 {
-    return FALSE;
+    return false;
 }
 
 
 // Get title, or filename if no title, else unnamed
 bool wxDocument::GetPrintableName(wxString& buf) const
 {
-    if (m_documentTitle != wxT(""))
+    if (!m_documentTitle.empty())
     {
         buf = m_documentTitle;
-        return TRUE;
+        return true;
     }
-    else if (m_documentFile != wxT(""))
+    else if (!m_documentFile.empty())
     {
         buf = wxFileNameFromPath(m_documentFile);
-        return TRUE;
+        return true;
     }
     else
     {
         buf = _("unnamed");
-        return TRUE;
+        return true;
     }
 }
 
@@ -446,7 +440,7 @@ wxCommandProcessor *wxDocument::OnCreateCommandProcessor()
     return new wxCommandProcessor;
 }
 
-// TRUE if safe to close
+// true if safe to close
 bool wxDocument::OnSaveModified()
 {
     if (IsModified())
@@ -455,7 +449,7 @@ bool wxDocument::OnSaveModified()
         GetPrintableName(title);
 
         wxString msgTitle;
-        if (wxTheApp->GetAppName() != wxT(""))
+        if (!wxTheApp->GetAppName().empty())
             msgTitle = wxTheApp->GetAppName();
         else
             msgTitle = wxString(_("Warning"));
@@ -468,20 +462,20 @@ bool wxDocument::OnSaveModified()
                 GetDocumentWindow());
         if (res == wxNO)
         {
-            Modify(FALSE);
-            return TRUE;
+            Modify(false);
+            return true;
         }
         else if (res == wxYES)
             return Save();
         else if (res == wxCANCEL)
-            return FALSE;
+            return false;
     }
-    return TRUE;
+    return true;
 }
 
 bool wxDocument::Draw(wxDC& WXUNUSED(context))
 {
-    return TRUE;
+    return true;
 }
 
 bool wxDocument::AddView(wxView *view)
@@ -491,22 +485,22 @@ bool wxDocument::AddView(wxView *view)
         m_documentViews.Append(view);
         OnChangedViewList();
     }
-    return TRUE;
+    return true;
 }
 
 bool wxDocument::RemoveView(wxView *view)
 {
     (void)m_documentViews.DeleteObject(view);
     OnChangedViewList();
-    return TRUE;
+    return true;
 }
 
 bool wxDocument::OnCreate(const wxString& WXUNUSED(path), long flags)
 {
     if (GetDocumentTemplate()->CreateView(this, flags))
-        return TRUE;
+        return true;
     else
-        return FALSE;
+        return false;
 }
 
 // Called after a view is added or removed.
@@ -525,7 +519,7 @@ void wxDocument::OnChangedViewList()
 
 void wxDocument::UpdateAllViews(wxView *sender, wxObject *hint)
 {
-    wxNode *node = m_documentViews.GetFirst();
+    wxList::compatibility_iterator node = m_documentViews.GetFirst();
     while (node)
     {
         wxView *view = (wxView *)node->GetData();
@@ -537,7 +531,7 @@ void wxDocument::UpdateAllViews(wxView *sender, wxObject *hint)
 
 void wxDocument::NotifyClosing()
 {
-    wxNode *node = m_documentViews.GetFirst();
+    wxList::compatibility_iterator node = m_documentViews.GetFirst();
     while (node)
     {
         wxView *view = (wxView *)node->GetData();
@@ -552,7 +546,7 @@ void wxDocument::SetFilename(const wxString& filename, bool notifyViews)
     if ( notifyViews )
     {
         // Notify the views that the filename has changed
-        wxNode *node = m_documentViews.GetFirst();
+        wxList::compatibility_iterator node = m_documentViews.GetFirst();
         while (node)
         {
             wxView *view = (wxView *)node->GetData();
@@ -562,6 +556,63 @@ void wxDocument::SetFilename(const wxString& filename, bool notifyViews)
     }
 }
 
+bool wxDocument::DoSaveDocument(const wxString& file)
+{
+    wxString msgTitle;
+    if (!wxTheApp->GetAppName().empty())
+        msgTitle = wxTheApp->GetAppName();
+    else
+        msgTitle = wxString(_("File error"));
+
+#if wxUSE_STD_IOSTREAM
+    wxSTD ofstream store(file.mb_str(), wxSTD ios::binary);
+    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;
+    }
+
+    return true;
+}
+
+bool wxDocument::DoOpenDocument(const wxString& file)
+{
+#if wxUSE_STD_IOSTREAM
+    wxSTD ifstream store(file.mb_str(), wxSTD ios::binary);
+    if (!store.fail() && !store.bad())
+#else
+    wxFileInputStream store(file);
+    if (store.GetLastError() == wxSTREAM_NO_ERROR)
+#endif
+    {
+#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
+            return true;
+    }
+
+    wxLogError(_("Sorry, could not open this file."));
+    return false;
+}
+
+
 // ----------------------------------------------------------------------------
 // Document view
 // ----------------------------------------------------------------------------
@@ -575,7 +626,7 @@ wxView::wxView()
 
 wxView::~wxView()
 {
-    GetDocumentManager()->ActivateView(this, FALSE);
+    GetDocumentManager()->ActivateView(this, false);
     m_viewDocument->RemoveView(this);
 }
 
@@ -585,7 +636,7 @@ bool wxView::ProcessEvent(wxEvent& event)
     if ( !GetDocument() || !GetDocument()->ProcessEvent(event) )
         return wxEvtHandler::ProcessEvent(event);
 
-    return TRUE;
+    return true;
 }
 
 void wxView::OnActivateView(bool WXUNUSED(activate), wxView *WXUNUSED(activeView), wxView *WXUNUSED(deactiveView))
@@ -603,14 +654,18 @@ void wxView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
 
 void wxView::OnChangeFilename()
 {
-    if (GetFrame() && GetDocument())
-    {
-        wxString title;
+    // GetFrame can return wxWindow rather than wxTopLevelWindow due to
+    // generic MDI implementation so use SetLabel rather than SetTitle.
+    // It should cause SetTitle() for top level windows.
+    wxWindow *win = GetFrame();
+    if (!win) return;
 
-        GetDocument()->GetPrintableName(title);
+    wxDocument *doc = GetDocument();
+    if (!doc) return;
 
-        GetFrame()->SetTitle(title);
-    }
+    wxString name;
+    doc->GetPrintableName(name);
+    win->SetLabel(name);
 }
 
 void wxView::SetDocument(wxDocument *doc)
@@ -623,9 +678,9 @@ void wxView::SetDocument(wxDocument *doc)
 bool wxView::Close(bool deleteWindow)
 {
     if (OnClose(deleteWindow))
-        return TRUE;
+        return true;
     else
-        return FALSE;
+        return false;
 }
 
 void wxView::Activate(bool activate)
@@ -639,7 +694,7 @@ void wxView::Activate(bool activate)
 
 bool wxView::OnClose(bool WXUNUSED(deleteWindow))
 {
-    return GetDocument() ? GetDocument()->Close() : TRUE;
+    return GetDocument() ? GetDocument()->Close() : true;
 }
 
 #if wxUSE_PRINTING_ARCHITECTURE
@@ -686,29 +741,43 @@ wxDocTemplate::~wxDocTemplate()
 // Tries to dynamically construct an object of the right class.
 wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags)
 {
-    if (!m_docClassInfo)
+    wxDocument *doc = DoCreateDocument();
+    if ( doc == NULL )
         return (wxDocument *) NULL;
-    wxDocument *doc = (wxDocument *)m_docClassInfo->CreateObject();
+
+    if (InitDocument(doc, path, flags))
+    {
+        return doc;
+    }
+    else
+    {
+        return (wxDocument *) NULL;
+    }
+}
+
+bool wxDocTemplate::InitDocument(wxDocument* doc, const wxString& path, long flags)
+{
     doc->SetFilename(path);
     doc->SetDocumentTemplate(this);
     GetDocumentManager()->AddDocument(doc);
     doc->SetCommandProcessor(doc->OnCreateCommandProcessor());
 
     if (doc->OnCreate(path, flags))
-        return doc;
+        return true;
     else
     {
         if (GetDocumentManager()->GetDocuments().Member(doc))
             doc->DeleteAllViews();
-        return (wxDocument *) NULL;
+        return false;
     }
 }
 
 wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags)
 {
-    if (!m_viewClassInfo)
+    wxView *view = DoCreateView();
+    if ( view == NULL )
         return (wxView *) NULL;
-    wxView *view = (wxView *)m_viewClassInfo->CreateObject();
+
     view->SetDocument(doc);
     if (view->OnCreate(doc, flags))
     {
@@ -725,9 +794,36 @@ wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags)
 // that of the template
 bool wxDocTemplate::FileMatchesTemplate(const wxString& path)
 {
+    wxStringTokenizer parser (GetFileFilter(), wxT(";"));
+    wxString anything = wxT ("*");
+    while (parser.HasMoreTokens())
+    {
+        wxString filter = parser.GetNextToken();
+        wxString filterExt = FindExtension (filter);
+        if ( filter.IsSameAs (anything)    ||
+             filterExt.IsSameAs (anything) ||
+             filterExt.IsSameAs (FindExtension (path)) )
+            return true;
+    }
     return GetDefaultExtension().IsSameAs(FindExtension(path));
 }
 
+wxDocument *wxDocTemplate::DoCreateDocument()
+{
+    if (!m_docClassInfo)
+        return (wxDocument *) NULL;
+
+    return (wxDocument *)m_docClassInfo->CreateObject();
+}
+
+wxView *wxDocTemplate::DoCreateView()
+{
+    if (!m_viewClassInfo)
+        return (wxView *) NULL;
+
+    return (wxView *)m_viewClassInfo->CreateObject();
+}
+
 // ----------------------------------------------------------------------------
 // wxDocManager
 // ----------------------------------------------------------------------------
@@ -755,11 +851,9 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
 
 #if wxUSE_PRINTING_ARCHITECTURE
     EVT_MENU(wxID_PRINT, wxDocManager::OnPrint)
-    EVT_MENU(wxID_PRINT_SETUP, wxDocManager::OnPrintSetup)
     EVT_MENU(wxID_PREVIEW, wxDocManager::OnPreview)
 
     EVT_UPDATE_UI(wxID_PRINT, wxDocManager::OnUpdatePrint)
-    EVT_UPDATE_UI(wxID_PRINT_SETUP, wxDocManager::OnUpdatePrintSetup)
     EVT_UPDATE_UI(wxID_PREVIEW, wxDocManager::OnUpdatePreview)
 #endif
 END_EVENT_TABLE()
@@ -799,50 +893,52 @@ bool wxDocManager::CloseDocument(wxDocument* doc, bool force)
         if (m_docs.Member(doc))
             delete doc;
 
-        return TRUE;
+        return true;
     }
-    return FALSE;
+    return false;
 }
 
 bool wxDocManager::CloseDocuments(bool force)
 {
-    wxNode *node = m_docs.GetFirst();
+    wxList::compatibility_iterator node = m_docs.GetFirst();
     while (node)
     {
         wxDocument *doc = (wxDocument *)node->GetData();
-        wxNode *next = node->GetNext();
+        wxList::compatibility_iterator next = node->GetNext();
 
         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;
     }
-    return TRUE;
+    return true;
 }
 
 bool wxDocManager::Clear(bool force)
 {
     if (!CloseDocuments(force))
-        return FALSE;
+        return false;
 
-    wxNode *node = m_templates.GetFirst();
+    m_currentView = NULL;
+
+    wxList::compatibility_iterator node = m_templates.GetFirst();
     while (node)
     {
         wxDocTemplate *templ = (wxDocTemplate*) node->GetData();
-        wxNode* next = node->GetNext();
+        wxList::compatibility_iterator next = node->GetNext();
         delete templ;
         node = next;
     }
-    return TRUE;
+    return true;
 }
 
 bool wxDocManager::Initialize()
 {
     m_fileHistory = OnCreateFileHistory();
-    return TRUE;
+    return true;
 }
 
 wxFileHistory *wxDocManager::OnCreateFileHistory()
@@ -865,17 +961,17 @@ void wxDocManager::OnFileClose(wxCommandEvent& WXUNUSED(event))
 
 void wxDocManager::OnFileCloseAll(wxCommandEvent& WXUNUSED(event))
 {
-    CloseDocuments(FALSE);
+    CloseDocuments(false);
 }
 
 void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event))
 {
-    CreateDocument( wxT(""), wxDOC_NEW );
+    CreateDocument( wxEmptyString, wxDOC_NEW );
 }
 
 void wxDocManager::OnFileOpen(wxCommandEvent& WXUNUSED(event))
 {
-    if ( !CreateDocument( wxT(""), 0) )
+    if ( !CreateDocument( wxEmptyString, 0) )
     {
         OnOpenFileFailure();
     }
@@ -916,29 +1012,13 @@ void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
     if (printout)
     {
         wxPrinter printer;
-        printer.Print(view->GetFrame(), printout, TRUE);
+        printer.Print(view->GetFrame(), printout, true);
 
         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
@@ -950,14 +1030,19 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
     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();
-        frame->Show(TRUE);
+        frame->Show(true);
     }
 #endif // wxUSE_PRINTING_ARCHITECTURE
 }
@@ -988,7 +1073,7 @@ void wxDocManager::OnRedo(wxCommandEvent& event)
 
 void wxDocManager::OnUpdateFileOpen(wxUpdateUIEvent& event)
 {
-    event.Enable( TRUE );
+    event.Enable( true );
 }
 
 void wxDocManager::OnUpdateFileClose(wxUpdateUIEvent& event)
@@ -1005,7 +1090,7 @@ void wxDocManager::OnUpdateFileRevert(wxUpdateUIEvent& event)
 
 void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event)
 {
-    event.Enable( TRUE );
+    event.Enable( true );
 }
 
 void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event)
@@ -1024,7 +1109,7 @@ void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event)
 {
     wxDocument *doc = GetCurrentDocument();
     if (!doc)
-        event.Enable(FALSE);
+        event.Enable(false);
     else if (!doc->GetCommandProcessor())
         event.Skip();
     else
@@ -1038,7 +1123,7 @@ void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event)
 {
     wxDocument *doc = GetCurrentDocument();
     if (!doc)
-        event.Enable(FALSE);
+        event.Enable(false);
     else if (!doc->GetCommandProcessor())
         event.Skip();
     else
@@ -1054,11 +1139,6 @@ void wxDocManager::OnUpdatePrint(wxUpdateUIEvent& event)
     event.Enable( (doc != (wxDocument*) NULL) );
 }
 
-void wxDocManager::OnUpdatePrintSetup(wxUpdateUIEvent& event)
-{
-    event.Enable( TRUE );
-}
-
 void wxDocManager::OnUpdatePreview(wxUpdateUIEvent& event)
 {
     wxDocument *doc = GetCurrentDocument();
@@ -1084,7 +1164,7 @@ bool wxDocManager::ProcessEvent(wxEvent& event)
     if (view)
     {
         if (view->ProcessEvent(event))
-            return TRUE;
+            return true;
     }
     return wxEvtHandler::ProcessEvent(event);
 }
@@ -1126,7 +1206,7 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
         {
             if (docToClose)
             {
-                if (!CloseDocument(docToClose, FALSE))
+                if (!CloseDocument(docToClose, false))
                 {
                     delete[] templates;
                     return NULL;
@@ -1141,7 +1221,12 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
             {
                 newDoc->SetDocumentName(temp->GetDocumentName());
                 newDoc->SetDocumentTemplate(temp);
-                newDoc->OnNewDocument();
+                if (!newDoc->OnNewDocument() )
+                {
+                     // Document is implicitly deleted by DeleteAllViews
+                     newDoc->DeleteAllViews();
+                     return NULL;
+                }
             }
             return newDoc;
         }
@@ -1152,7 +1237,7 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
         {
             if (docToClose)
             {
-                if (!CloseDocument(docToClose, FALSE))
+                if (!CloseDocument(docToClose, false))
                 {
                     return NULL;
                 }
@@ -1164,7 +1249,12 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
             {
                 newDoc->SetDocumentName(temp->GetDocumentName());
                 newDoc->SetDocumentTemplate(temp);
-                newDoc->OnNewDocument();
+                if (!newDoc->OnNewDocument() )
+                {
+                     // Document is implicitly deleted by DeleteAllViews
+                     newDoc->DeleteAllViews();
+                     return NULL;
+                }
             }
             return newDoc;
         }
@@ -1173,11 +1263,9 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
     }
 
     // Existing document
-    wxDocTemplate *temp = (wxDocTemplate *) NULL;
+    wxDocTemplate *temp;
 
-    wxString path2(wxT(""));
-    if (path != wxT(""))
-        path2 = path;
+    wxString path2 = path;
 
     if (flags & wxDOC_SILENT)
     {
@@ -1200,12 +1288,34 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
     {
         if (docToClose)
         {
-            if (!CloseDocument(docToClose, FALSE))
+            if (!CloseDocument(docToClose, false))
             {
                 return NULL;
             }
         }
 
+        //see if this file is already open
+        for (size_t i = 0; i < GetDocuments().GetCount(); ++i)
+        {
+            wxDocument* currentDoc = (wxDocument*)(GetDocuments().Item(i)->GetData());
+#ifdef __WXMSW__
+            //file paths are case-insensitive on Windows
+            if (path2.CmpNoCase(currentDoc->GetFilename()) == 0)
+#else
+            if (path2.Cmp(currentDoc->GetFilename()) == 0)
+#endif
+            {
+                //file already open. Just activate it and return
+                if (currentDoc->GetFirstView())
+                {
+                    ActivateView(currentDoc->GetFirstView(), true);
+                    if (currentDoc->GetDocumentWindow())
+                        currentDoc->GetDocumentWindow()->SetFocus();
+                    return currentDoc;
+                }
+            }
+        }
+
         wxDocument *newDoc = temp->CreateDocument(path2, flags);
         if (newDoc)
         {
@@ -1282,7 +1392,7 @@ void wxDocManager::DeleteTemplate(wxDocTemplate *WXUNUSED(temp), long WXUNUSED(f
 // Not yet implemented
 bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc))
 {
-    return FALSE;
+    return false;
 }
 
 wxDocument *wxDocManager::GetCurrentDocument() const
@@ -1300,7 +1410,7 @@ bool wxDocManager::MakeDefaultName(wxString& name)
     name.Printf(_("unnamed%d"), m_defaultDocumentNameCounter);
     m_defaultDocumentNameCounter++;
 
-    return TRUE;
+    return true;
 }
 
 // Make a frame title (override this to do something different)
@@ -1459,7 +1569,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
         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()
@@ -1477,19 +1587,19 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
 
     wxString pathTmp = wxFileSelectorEx(_("Select a file"),
                                         m_lastDirectory,
-                                        wxT(""),
+                                        wxEmptyString,
                                         &FilterIndex,
                                         descrBuf,
                                         0,
                                         parent);
 
     wxDocTemplate *theTemplate = (wxDocTemplate *)NULL;
-    if (!pathTmp.IsEmpty())
+    if (!pathTmp.empty())
     {
         if (!wxFileExists(pathTmp))
         {
             wxString msgTitle;
-            if (!wxTheApp->GetAppName().IsEmpty())
+            if (!wxTheApp->GetAppName().empty())
                 msgTitle = wxTheApp->GetAppName();
             else
                 msgTitle = wxString(_("File error"));
@@ -1497,7 +1607,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
             (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
                 parent);
 
-            path = wxT("");
+            path = wxEmptyString;
             return (wxDocTemplate *) NULL;
         }
         m_lastDirectory = wxPathOnly(pathTmp);
@@ -1521,7 +1631,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
     }
     else
     {
-        path = wxT("");
+        path = wxEmptyString;
     }
 
     return theTemplate;
@@ -1530,7 +1640,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
 wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
                                                 int noTemplates, bool sort)
 {
-    wxArrayString strings(sort);
+    wxArrayString strings;
     wxDocTemplate **data = new wxDocTemplate *[noTemplates];
     int i;
     int n = 0;
@@ -1540,14 +1650,14 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
         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
                    )
-                    want = FALSE;
+                    want = false;
             }
 
             if ( want )
@@ -1562,6 +1672,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
 
     if (sort)
     {
+        strings.Sort(); // ascending sort
         // Yes, this will be slow, but template lists
         // are typically short.
         int j;
@@ -1610,7 +1721,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
 wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
                                             int noTemplates, bool sort)
 {
-    wxArrayString strings(sort);
+    wxArrayString strings;
     wxDocTemplate **data = new wxDocTemplate *[noTemplates];
     int i;
     int n = 0;
@@ -1621,12 +1732,12 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
         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 )
-                    want = FALSE;
+                    want = false;
             }
 
             if ( want )
@@ -1640,6 +1751,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
 
     if (sort)
     {
+        strings.Sort(); // ascending sort
         // Yes, this will be slow, but template lists
         // are typically short.
         int j;
@@ -1750,15 +1862,11 @@ wxDocChildFrame::wxDocChildFrame(wxDocument *doc,
         view->SetFrame(this);
 }
 
-wxDocChildFrame::~wxDocChildFrame()
-{
-}
-
 // Extend event processing to search the view's event table
 bool wxDocChildFrame::ProcessEvent(wxEvent& event)
 {
     if (m_childView)
-        m_childView->Activate(TRUE);
+        m_childView->Activate(true);
 
     if ( !m_childView || ! m_childView->ProcessEvent(event) )
     {
@@ -1766,10 +1874,10 @@ bool wxDocChildFrame::ProcessEvent(wxEvent& event)
         if (!event.IsKindOf(CLASSINFO(wxCommandEvent)) || !GetParent() || !GetParent()->ProcessEvent(event))
             return wxEvtHandler::ProcessEvent(event);
         else
-            return TRUE;
+            return true;
     }
     else
-        return TRUE;
+        return true;
 }
 
 void wxDocChildFrame::OnActivate(wxActivateEvent& event)
@@ -1784,15 +1892,13 @@ void wxDocChildFrame::OnCloseWindow(wxCloseEvent& event)
 {
     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)
         {
-            m_childView->Activate(FALSE);
+            m_childView->Activate(false);
             delete m_childView;
             m_childView = (wxView *) NULL;
             m_childDocument = (wxDocument *) NULL;
@@ -1816,6 +1922,11 @@ BEGIN_EVENT_TABLE(wxDocParentFrame, wxFrame)
     EVT_CLOSE(wxDocParentFrame::OnCloseWindow)
 END_EVENT_TABLE()
 
+wxDocParentFrame::wxDocParentFrame()
+{
+    m_docManager = NULL;
+}
+
 wxDocParentFrame::wxDocParentFrame(wxDocManager *manager,
                                    wxFrame *frame,
                                    wxWindowID id,
@@ -1829,6 +1940,19 @@ wxDocParentFrame::wxDocParentFrame(wxDocManager *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();
@@ -1838,7 +1962,7 @@ void wxDocParentFrame::OnMRUFile(wxCommandEvent& event)
 {
     int n = event.GetId() - wxID_FILE1;  // the index in MRU list
     wxString filename(m_docManager->GetHistoryFile(n));
-    if ( !filename.IsEmpty() )
+    if ( !filename.empty() )
     {
         // verify that the file exists before doing anything else
         if ( wxFile::Exists(filename) )
@@ -1872,7 +1996,7 @@ bool wxDocParentFrame::ProcessEvent(wxEvent& event)
     if (!m_docManager || !m_docManager->ProcessEvent(event))
         return wxEvtHandler::ProcessEvent(event);
     else
-        return TRUE;
+        return true;
 }
 
 // Define the behaviour for the frame closing
@@ -1902,8 +2026,10 @@ bool wxDocPrintout::OnPrintPage(int WXUNUSED(page))
     // Get the logical pixels per inch of screen and printer
     int ppiScreenX, ppiScreenY;
     GetPPIScreen(&ppiScreenX, &ppiScreenY);
+    wxUnusedVar(ppiScreenY);
     int ppiPrinterX, ppiPrinterY;
     GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);
+    wxUnusedVar(ppiPrinterY);
 
     // This scales the DC so that the printout roughly represents the
     // the screen scaling. The text point size _should_ be the right size
@@ -1918,6 +2044,7 @@ bool wxDocPrintout::OnPrintPage(int WXUNUSED(page))
     int w, h;
     dc->GetSize(&w, &h);
     GetPageSizePixels(&pageWidth, &pageHeight);
+    wxUnusedVar(pageHeight);
 
     // If printer pageWidth == current DC width, then this doesn't
     // change. But w might be the preview bitmap width, so scale down.
@@ -1928,7 +2055,7 @@ bool wxDocPrintout::OnPrintPage(int WXUNUSED(page))
     {
         m_printoutView->OnDraw(dc);
     }
-    return TRUE;
+    return true;
 }
 
 bool wxDocPrintout::HasPage(int pageNum)
@@ -1939,9 +2066,9 @@ bool wxDocPrintout::HasPage(int pageNum)
 bool wxDocPrintout::OnBeginDocument(int startPage, int endPage)
 {
     if (!wxPrintout::OnBeginDocument(startPage, endPage))
-        return FALSE;
+        return false;
 
-    return TRUE;
+    return true;
 }
 
 void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo)
@@ -2022,7 +2149,7 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
     // Move existing files (if any) down so we can insert file at beginning.
     if (m_fileHistoryN < m_fileMaxFiles)
     {
-        wxNode* node = m_fileMenus.GetFirst();
+        wxList::compatibility_iterator node = m_fileMenus.GetFirst();
         while (node)
         {
             wxMenu* menu = (wxMenu*) node->GetData();
@@ -2065,9 +2192,11 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
                 pathInMenu = m_fileHistory[i];
             }
 
+            // we need to quote '&' characters which are used for mnemonics
+            pathInMenu.Replace(_T("&"), _T("&&"));
             wxString buf;
             buf.Printf(s_MRUEntryFormat, i + 1, pathInMenu.c_str());
-            wxNode* node = m_fileMenus.GetFirst();
+            wxList::compatibility_iterator node = m_fileMenus.GetFirst();
             while (node)
             {
                 wxMenu* menu = (wxMenu*) node->GetData();
@@ -2092,23 +2221,23 @@ void wxFileHistory::RemoveFileFromHistory(size_t i)
         m_fileHistory[j] = m_fileHistory[j + 1];
     }
 
-    wxNode* node = m_fileMenus.GetFirst();
+    wxList::compatibility_iterator node = m_fileMenus.GetFirst();
     while ( node )
     {
-         wxMenu* menu = (wxMenu*) node->GetData();
+        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);
-         }
+        // 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();
+        node = node->GetNext();
 
         // delete the last menu item which is unused now
-        wxWindowID lastItemId = m_idBase + m_fileHistoryN - 1;
+        wxWindowID lastItemId = m_idBase + wx_truncate_cast(wxWindowID, m_fileHistoryN) - 1;
         if (menu->FindItem(lastItemId))
         {
             menu->Delete(lastItemId);
@@ -2117,10 +2246,10 @@ void wxFileHistory::RemoveFileFromHistory(size_t i)
         // delete the last separator too if no more files are left
         if ( m_fileHistoryN == 1 )
         {
-            wxMenuItemList::Node *node = menu->GetMenuItems().GetLast();
-            if ( node )
+            wxMenuItemList::compatibility_iterator nodeLast = menu->GetMenuItems().GetLast();
+            if ( nodeLast )
             {
-                wxMenuItem *menuItem = node->GetData();
+                wxMenuItem *menuItem = nodeLast->GetData();
                 if ( menuItem->IsSeparator() )
                 {
                     menu->Delete(menuItem);
@@ -2167,12 +2296,12 @@ void wxFileHistory::Load(wxConfigBase& config)
     wxString buf;
     buf.Printf(wxT("file%d"), (int)m_fileHistoryN+1);
     wxString historyFile;
-    while ((m_fileHistoryN < m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != wxT("")))
+    while ((m_fileHistoryN < 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("");
+        historyFile = wxEmptyString;
     }
     AddFilesToMenu();
 }
@@ -2196,7 +2325,7 @@ void wxFileHistory::AddFilesToMenu()
 {
     if (m_fileHistoryN > 0)
     {
-        wxNode* node = m_fileMenus.GetFirst();
+        wxList::compatibility_iterator node = m_fileMenus.GetFirst();
         while (node)
         {
             wxMenu* menu = (wxMenu*) node->GetData();
@@ -2253,7 +2382,7 @@ bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream)
 {
     wxFFile file(filename, _T("rb"));
     if ( !file.IsOpened() )
-        return FALSE;
+        return false;
 
     char buf[4096];
 
@@ -2262,22 +2391,22 @@ bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream)
     {
         nRead = file.Read(buf, WXSIZEOF(buf));
         if ( file.Error() )
-            return FALSE;
+            return false;
 
         stream.write(buf, nRead);
         if ( !stream )
-            return FALSE;
+            return false;
     }
     while ( !file.Eof() );
 
-    return TRUE;
+    return true;
 }
 
 bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename)
 {
     wxFFile file(filename, _T("wb"));
     if ( !file.IsOpened() )
-        return FALSE;
+        return false;
 
     char buf[4096];
     do
@@ -2286,12 +2415,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()) )
-                return FALSE;
+                return false;
         }
     }
     while ( !stream.eof() );
 
-    return TRUE;
+    return true;
 }
 
 #else // !wxUSE_STD_IOSTREAM
@@ -2300,7 +2429,7 @@ bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream)
 {
     wxFFile file(filename, _T("rb"));
     if ( !file.IsOpened() )
-        return FALSE;
+        return false;
 
     char buf[4096];
 
@@ -2309,22 +2438,22 @@ bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream)
     {
         nRead = file.Read(buf, WXSIZEOF(buf));
         if ( file.Error() )
-            return FALSE;
+            return false;
 
         stream.Write(buf, nRead);
         if ( !stream )
-            return FALSE;
+            return false;
     }
     while ( !file.Eof() );
 
-    return TRUE;
+    return true;
 }
 
 bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename)
 {
     wxFFile file(filename, _T("wb"));
     if ( !file.IsOpened() )
-        return FALSE;
+        return false;
 
     char buf[4096];
     do
@@ -2333,14 +2462,13 @@ bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename)
 
         const size_t nRead = stream.LastRead();
         if ( !nRead || !file.Write(buf, nRead) )
-            return FALSE;
+            return false;
     }
     while ( !stream.Eof() );
 
-    return TRUE;
+    return true;
 }
 
 #endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM
 
 #endif // wxUSE_DOC_VIEW_ARCHITECTURE
-