move code ignoring VK_SPACE and VK_RETURN WM_CHAR messages to MSWDefWindowProc()...

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 2be69634e84d26fb7c94a107903bd9ea47cc5997..221ce1b1364ab66a3209fe731c1727f3cf1e0d9a 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     Document/view classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Purpose:     Document/view classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

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

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "docview.h"
 #endif
 
     #pragma implementation "docview.h"
 #endif
 


@@ -40,8 +40,14 @@
     #include "wx/list.h"
     #include "wx/filedlg.h"
     #include "wx/intl.h"
     #include "wx/list.h"
     #include "wx/filedlg.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

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

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


@@ -57,6 +63,7 @@
 #include "wx/docview.h"
 #include "wx/confbase.h"
 #include "wx/file.h"
 #include "wx/docview.h"
 #include "wx/confbase.h"
 #include "wx/file.h"

+#include "wx/cmdproc.h"

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>


@@ -73,29 +80,28 @@
 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------

-// wxWindows macros
+// wxWidgets macros

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

-    IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
-    IMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler)
-    IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxDocManager, wxEvtHandler)
-    IMPLEMENT_CLASS(wxDocChildFrame, wxFrame)
-    IMPLEMENT_CLASS(wxDocParentFrame, wxFrame)
+IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
+IMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler)
+IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxDocManager, wxEvtHandler)
+IMPLEMENT_CLASS(wxDocChildFrame, wxFrame)
+IMPLEMENT_CLASS(wxDocParentFrame, wxFrame)

 
 

-    #if wxUSE_PRINTING_ARCHITECTURE
-        IMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout)
-    #endif
+#if wxUSE_PRINTING_ARCHITECTURE
+    IMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout)
+#endif

 
 

-    IMPLEMENT_CLASS(wxCommand, wxObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxCommandProcessor, wxObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)

 
 // ----------------------------------------------------------------------------
 // function prototypes
 // ----------------------------------------------------------------------------
 
 static inline wxString FindExtension(const wxChar *path);
 
 // ----------------------------------------------------------------------------
 // function prototypes
 // ----------------------------------------------------------------------------
 
 static inline wxString FindExtension(const wxChar *path);

+static wxWindow* wxFindSuitableParent(void);

 
 // ----------------------------------------------------------------------------
 // local constants
 
 // ----------------------------------------------------------------------------
 // local constants


@@ -127,16 +133,16 @@ static wxString FindExtension(const wxChar *path)
 
 wxDocument::wxDocument(wxDocument *parent)
 {
 
 wxDocument::wxDocument(wxDocument *parent)
 {

-    m_documentModified = FALSE;
+    m_documentModified = false;

     m_documentParent = parent;
     m_documentTemplate = (wxDocTemplate *) NULL;
     m_commandProcessor = (wxCommandProcessor*) NULL;
     m_documentParent = parent;
     m_documentTemplate = (wxDocTemplate *) NULL;
     m_commandProcessor = (wxCommandProcessor*) NULL;

-    m_savedYet = FALSE;
+    m_savedYet = false;

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

-    return TRUE;
+    return true;

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


@@ -160,14 +166,16 @@ bool wxDocument::Close()
     if (OnSaveModified())
         return OnCloseDocument();
     else
     if (OnSaveModified())
         return OnCloseDocument();
     else

-        return FALSE;
+        return false;

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

+    // Tell all views that we're about to close
+    NotifyClosing();

     DeleteContents();
     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


@@ -176,31 +184,51 @@ bool wxDocument::DeleteAllViews()
 {
     wxDocManager* manager = GetDocumentManager();
 
 {
     wxDocManager* manager = GetDocumentManager();
 

-    wxNode *node = m_documentViews.First();
-    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->Data();
-        if (!view->Close())
-            return FALSE;
+        wxView *view = (wxView *)*i;
+        if ( !view->Close() )
+            return false;
+    }

 
 

-        wxNode *next = node->Next();
+    // 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
 {
 }
 
 wxView *wxDocument::GetFirstView() const
 {

-    if (m_documentViews.Number() == 0)
+    if (m_documentViews.GetCount() == 0)

         return (wxView *) NULL;
         return (wxView *) NULL;

-    return (wxView *)m_documentViews.First()->Data();
+    return (wxView *)m_documentViews.GetFirst()->GetData();

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


@@ -211,157 +239,153 @@ wxDocManager *wxDocument::GetDocumentManager() const
 bool wxDocument::OnNewDocument()
 {
     if (!OnSaveModified())
 bool wxDocument::OnNewDocument()
 {
     if (!OnSaveModified())

-        return FALSE;
+        return false;

 
 

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

     DeleteContents();
     DeleteContents();

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

 
     wxString name;
     GetDocumentManager()->MakeDefaultName(name);
     SetTitle(name);
 
     wxString name;
     GetDocumentManager()->MakeDefaultName(name);
     SetTitle(name);

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

 
 

-    return TRUE;
+    return true;

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

-    bool ret = FALSE;
+    if (!IsModified() && m_savedYet)
+        return true;

 
 

-    if (!IsModified()) return TRUE;
-    if (m_documentFile == wxT("") || !m_savedYet)
-        ret = SaveAs();
-    else
-        ret = OnSaveDocument(m_documentFile);
-    if ( ret )
-        SetDocumentSaved(TRUE);
-    return ret;
+    if ( m_documentFile.empty() || !m_savedYet )
+        return SaveAs();
+
+    return OnSaveDocument(m_documentFile);

 }
 
 bool wxDocument::SaveAs()
 {
     wxDocTemplate *docTemplate = GetDocumentTemplate();
     if (!docTemplate)
 }
 
 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 = wxDocManager::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(),
     wxString tmp = wxFileSelector(_("Save as"),
             docTemplate->GetDirectory(),
             wxFileNameFromPath(GetFilename()),
             docTemplate->GetDefaultExtension(),

-            docTemplate->GetFileFilter(),
+            filter,

             wxSAVE | wxOVERWRITE_PROMPT,
             GetDocumentWindow());
 
             wxSAVE | wxOVERWRITE_PROMPT,
             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 += ".";
+        fileName += wxT(".");

         fileName += docTemplate->GetDefaultExtension();
     }
 
     SetFilename(fileName);
     SetTitle(wxFileNameFromPath(fileName));
 
         fileName += docTemplate->GetDefaultExtension();
     }
 
     SetFilename(fileName);
     SetTitle(wxFileNameFromPath(fileName));
 

-    GetDocumentManager()->AddFileToHistory(fileName);
-

     // Notify the views that the filename has changed
     // Notify the views that the filename has changed

-    wxNode *node = m_documentViews.First();
+    wxList::compatibility_iterator node = m_documentViews.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxView *view = (wxView *)node->Data();
+        wxView *view = (wxView *)node->GetData();

         view->OnChangeFilename();
         view->OnChangeFilename();

-        node = node->Next();
+        node = node->GetNext();

     }
 
     }
 

-    return OnSaveDocument(m_documentFile);
+    // Files that were not saved correctly are not added to the FileHistory.
+    if (!OnSaveDocument(m_documentFile))
+        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.
+   if (docTemplate->FileMatchesTemplate(fileName))
+   {
+       GetDocumentManager()->AddFileToHistory(fileName);
+   }
+   else
+   {
+       // The user will probably not be able to open the file again, so
+       // we could warn about the wrong file-extension here.
+   }
+   return true;

 }
 
 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(wxString(file.fn_str()).mb_str());
-    if (store.fail() || store.bad())
-#else
-    wxFileOutputStream store(wxString(file.fn_str()));
-    if (store.LastError() != wxSTREAM_NOERROR)
-#endif
-    {
-        (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,
-                           GetDocumentWindow());
-        // Saving error
-        return FALSE;
-    }
-    if (!SaveObject(store))
-    {
-        (void)wxMessageBox(_("Sorry, could not save this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
-                           GetDocumentWindow());
-        // Saving error
-        return FALSE;
-    }
-    Modify(FALSE);
+    Modify(false);

     SetFilename(file);
     SetFilename(file);

-    return TRUE;
+    SetDocumentSaved(true);
+#ifdef __WXMAC__
+    wxFileName fn(file) ;
+    fn.MacSetDefaultTypeAndCreator() ;
+#endif
+    return true;

 }
 
 bool wxDocument::OnOpenDocument(const wxString& file)
 {
     if (!OnSaveModified())
 }
 
 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(wxString(file.fn_str()).mb_str());
-    if (store.fail() || store.bad())
-#else
-    wxFileInputStream store(wxString(file.fn_str()));
-    if (store.LastError() != wxSTREAM_NOERROR)
-#endif
-    {
-        (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
-                           GetDocumentWindow());
-        return FALSE;
-    }
-#if wxUSE_STD_IOSTREAM
-    if (!LoadObject(store))
-#else
-    int res = LoadObject(store).LastError();
-    if ((res != wxSTREAM_NOERROR) &&
-        (res != wxSTREAM_EOF))
-#endif
-    {
-        (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
-                           GetDocumentWindow());
-        return FALSE;
-    }
-    SetFilename(file, TRUE);
-    Modify(FALSE);
-    m_savedYet = TRUE;
+    SetFilename(file, true);
+    Modify(false);
+    m_savedYet = true;

 
     UpdateAllViews();
 
 
     UpdateAllViews();
 

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM


@@ -384,27 +408,27 @@ wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream)
 
 bool wxDocument::Revert()
 {
 
 bool wxDocument::Revert()
 {

-    return FALSE;
+    return false;

 }
 
 
 // Get title, or filename if no title, else unnamed
 bool wxDocument::GetPrintableName(wxString& buf) const
 {
 }
 
 
 // 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;
     {
         buf = m_documentTitle;

-        return TRUE;
+        return true;

     }
     }

-    else if (m_documentFile != wxT(""))
+    else if (!m_documentFile.empty())

     {
         buf = wxFileNameFromPath(m_documentFile);
     {
         buf = wxFileNameFromPath(m_documentFile);

-        return TRUE;
+        return true;

     }
     else
     {
         buf = _("unnamed");
     }
     else
     {
         buf = _("unnamed");

-        return TRUE;
+        return true;

     }
 }
 
     }
 }
 


@@ -422,7 +446,7 @@ wxCommandProcessor *wxDocument::OnCreateCommandProcessor()
     return new wxCommandProcessor;
 }
 
     return new wxCommandProcessor;
 }
 

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

 bool wxDocument::OnSaveModified()
 {
     if (IsModified())
 bool wxDocument::OnSaveModified()
 {
     if (IsModified())


@@ -431,7 +455,7 @@ bool wxDocument::OnSaveModified()
         GetPrintableName(title);
 
         wxString msgTitle;
         GetPrintableName(title);
 
         wxString msgTitle;

-        if (wxTheApp->GetAppName() != wxT(""))
+        if (!wxTheApp->GetAppName().empty())

             msgTitle = wxTheApp->GetAppName();
         else
             msgTitle = wxString(_("Warning"));
             msgTitle = wxTheApp->GetAppName();
         else
             msgTitle = wxString(_("Warning"));


@@ -444,20 +468,20 @@ bool wxDocument::OnSaveModified()
                 GetDocumentWindow());
         if (res == wxNO)
         {
                 GetDocumentWindow());
         if (res == wxNO)
         {

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

         }
         else if (res == wxYES)
             return Save();
         else if (res == wxCANCEL)
         }
         else if (res == wxYES)
             return Save();
         else if (res == wxCANCEL)

-            return FALSE;
+            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)


@@ -467,22 +491,22 @@ bool wxDocument::AddView(wxView *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)
 {
     if (GetDocumentTemplate()->CreateView(this, flags))
 }
 
 bool wxDocument::OnCreate(const wxString& WXUNUSED(path), long flags)
 {
     if (GetDocumentTemplate()->CreateView(this, flags))

-        return TRUE;
+        return true;

     else
     else

-        return FALSE;
+        return false;

 }
 
 // Called after a view is added or removed.
 }
 
 // Called after a view is added or removed.


@@ -490,7 +514,7 @@ 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.Number() == 0)
+    if (m_documentViews.GetCount() == 0)

     {
         if (OnSaveModified())
         {
     {
         if (OnSaveModified())
         {


@@ -501,12 +525,24 @@ void wxDocument::OnChangedViewList()
 
 void wxDocument::UpdateAllViews(wxView *sender, wxObject *hint)
 {
 
 void wxDocument::UpdateAllViews(wxView *sender, wxObject *hint)
 {

-    wxNode *node = m_documentViews.First();
+    wxList::compatibility_iterator node = m_documentViews.GetFirst();
+    while (node)
+    {
+        wxView *view = (wxView *)node->GetData();
+        if (view != sender)
+            view->OnUpdate(sender, hint);
+        node = node->GetNext();
+    }
+}
+
+void wxDocument::NotifyClosing()
+{
+    wxList::compatibility_iterator node = m_documentViews.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxView *view = (wxView *)node->Data();
-        view->OnUpdate(sender, hint);
-        node = node->Next();
+        wxView *view = (wxView *)node->GetData();
+        view->OnClosingDocument();
+        node = node->GetNext();

     }
 }
 
     }
 }
 


@@ -516,32 +552,100 @@ void wxDocument::SetFilename(const wxString& filename, bool notifyViews)
     if ( notifyViews )
     {
         // Notify the views that the filename has changed
     if ( notifyViews )
     {
         // Notify the views that the filename has changed

-        wxNode *node = m_documentViews.First();
+        wxList::compatibility_iterator node = m_documentViews.GetFirst();

         while (node)
         {
         while (node)
         {

-            wxView *view = (wxView *)node->Data();
+            wxView *view = (wxView *)node->GetData();

             view->OnChangeFilename();
             view->OnChangeFilename();

-            node = node->Next();
+            node = node->GetNext();

         }
     }
 }
 
         }
     }
 }
 

+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());
+    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)
+{
+    wxString msgTitle;
+    if (!wxTheApp->GetAppName().empty())
+        msgTitle = wxTheApp->GetAppName();
+    else
+        msgTitle = wxString(_("File error"));
+
+#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;
+    }
+
+    return true;
+}
+
+

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

-    //  SetDocument(doc);

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

-    m_viewTypeName = wxT("");

     m_viewFrame = (wxFrame *) NULL;
 }
 
 wxView::~wxView()
 {
     m_viewFrame = (wxFrame *) NULL;
 }
 
 wxView::~wxView()
 {

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

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


@@ -550,8 +654,8 @@ bool wxView::ProcessEvent(wxEvent& event)
 {
     if ( !GetDocument() || !GetDocument()->ProcessEvent(event) )
         return wxEvtHandler::ProcessEvent(event);
 {
     if ( !GetDocument() || !GetDocument()->ProcessEvent(event) )
         return wxEvtHandler::ProcessEvent(event);

-    else
-        return TRUE;
+
+    return true;

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


@@ -589,14 +693,14 @@ void wxView::SetDocument(wxDocument *doc)
 bool wxView::Close(bool deleteWindow)
 {
     if (OnClose(deleteWindow))
 bool wxView::Close(bool deleteWindow)
 {
     if (OnClose(deleteWindow))

-        return TRUE;
+        return true;

     else
     else

-        return FALSE;
+        return false;

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

-    if (GetDocumentManager())
+    if (GetDocument() && GetDocumentManager())

     {
         OnActivateView(activate, this, GetDocumentManager()->GetCurrentView());
         GetDocumentManager()->ActivateView(this, activate);
     {
         OnActivateView(activate, this, GetDocumentManager()->GetCurrentView());
         GetDocumentManager()->ActivateView(this, activate);


@@ -605,7 +709,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


@@ -652,29 +756,43 @@ 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)
+    wxDocument *doc = DoCreateDocument();
+    if ( doc == NULL )
+        return (wxDocument *) NULL;
+
+    if (InitDocument(doc, path, flags))
+    {
+        return doc;
+    }
+    else
+    {

         return (wxDocument *) NULL;
         return (wxDocument *) NULL;

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

         return (wxView *) NULL;
         return (wxView *) NULL;

-    wxView *view = (wxView *)m_viewClassInfo->CreateObject();
+

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


@@ -694,6 +812,22 @@ bool wxDocTemplate::FileMatchesTemplate(const wxString& path)
     return GetDefaultExtension().IsSameAs(FindExtension(path));
 }
 
     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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxDocManager
 // ----------------------------------------------------------------------------


@@ -701,6 +835,7 @@ bool wxDocTemplate::FileMatchesTemplate(const wxString& path)
 BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
     EVT_MENU(wxID_OPEN, wxDocManager::OnFileOpen)
     EVT_MENU(wxID_CLOSE, wxDocManager::OnFileClose)
 BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
     EVT_MENU(wxID_OPEN, wxDocManager::OnFileOpen)
     EVT_MENU(wxID_CLOSE, wxDocManager::OnFileClose)

+    EVT_MENU(wxID_CLOSE_ALL, wxDocManager::OnFileCloseAll)

     EVT_MENU(wxID_REVERT, wxDocManager::OnFileRevert)
     EVT_MENU(wxID_NEW, wxDocManager::OnFileNew)
     EVT_MENU(wxID_SAVE, wxDocManager::OnFileSave)
     EVT_MENU(wxID_REVERT, wxDocManager::OnFileRevert)
     EVT_MENU(wxID_NEW, wxDocManager::OnFileNew)
     EVT_MENU(wxID_SAVE, wxDocManager::OnFileSave)


@@ -710,6 +845,7 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
 
     EVT_UPDATE_UI(wxID_OPEN, wxDocManager::OnUpdateFileOpen)
     EVT_UPDATE_UI(wxID_CLOSE, wxDocManager::OnUpdateFileClose)
 
     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_NEW, wxDocManager::OnUpdateFileNew)
     EVT_UPDATE_UI(wxID_SAVE, wxDocManager::OnUpdateFileSave)
     EVT_UPDATE_UI(wxID_REVERT, wxDocManager::OnUpdateFileRevert)
     EVT_UPDATE_UI(wxID_NEW, wxDocManager::OnUpdateFileNew)
     EVT_UPDATE_UI(wxID_SAVE, wxDocManager::OnUpdateFileSave)


@@ -719,11 +855,9 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
 
 #if wxUSE_PRINTING_ARCHITECTURE
     EVT_MENU(wxID_PRINT, wxDocManager::OnPrint)
 
 #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_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()
     EVT_UPDATE_UI(wxID_PREVIEW, wxDocManager::OnUpdatePreview)
 #endif
 END_EVENT_TABLE()


@@ -750,45 +884,65 @@ wxDocManager::~wxDocManager()
     sm_docManager = (wxDocManager*) NULL;
 }
 
     sm_docManager = (wxDocManager*) NULL;
 }
 

-bool wxDocManager::Clear(bool force)
+// closes the specified document
+bool wxDocManager::CloseDocument(wxDocument* doc, bool force)

 {
 {

-    wxNode *node = m_docs.First();
-    while (node)
+    if (doc->Close() || force)

     {
     {

-        wxDocument *doc = (wxDocument *)node->Data();
-        wxNode *next = node->Next();
-
-        if (!doc->Close() && !force)
-            return FALSE;
-
-        // Implicitly deletes the document when the last
-        // view is removed (deleted)
+        // Implicitly deletes the document when
+        // the last view is deleted

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

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

         if (m_docs.Member(doc))
             delete doc;
 
         if (m_docs.Member(doc))
             delete doc;
 

+        return true;
+    }
+    return false;
+}
+
+bool wxDocManager::CloseDocuments(bool force)
+{
+    wxList::compatibility_iterator node = m_docs.GetFirst();
+    while (node)
+    {
+        wxDocument *doc = (wxDocument *)node->GetData();
+        wxList::compatibility_iterator next = node->GetNext();
+
+        if (!CloseDocument(doc, force))
+            return false;
+

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

-    node = m_templates.First();
+    return true;
+}
+
+bool wxDocManager::Clear(bool force)
+{
+    if (!CloseDocuments(force))
+        return false;
+
+    m_currentView = NULL;
+
+    wxList::compatibility_iterator node = m_templates.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxDocTemplate *templ = (wxDocTemplate*) node->Data();
-        wxNode* next = node->Next();
+        wxDocTemplate *templ = (wxDocTemplate*) node->GetData();
+        wxList::compatibility_iterator next = node->GetNext();

         delete templ;
         node = next;
     }
         delete templ;
         node = next;
     }

-    return TRUE;
+    return true;

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

-    return TRUE;
+    return true;

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


@@ -809,14 +963,19 @@ void wxDocManager::OnFileClose(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

+void wxDocManager::OnFileCloseAll(wxCommandEvent& WXUNUSED(event))
+{
+    CloseDocuments(false);
+}
+

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

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

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

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

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


@@ -857,29 +1016,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


@@ -891,41 +1034,50 @@ 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
 }
 

-void wxDocManager::OnUndo(wxCommandEvent& WXUNUSED(event))
+void wxDocManager::OnUndo(wxCommandEvent& event)

 {
     wxDocument *doc = GetCurrentDocument();
     if (!doc)
         return;
     if (doc->GetCommandProcessor())
         doc->GetCommandProcessor()->Undo();
 {
     wxDocument *doc = GetCurrentDocument();
     if (!doc)
         return;
     if (doc->GetCommandProcessor())
         doc->GetCommandProcessor()->Undo();

+    else
+        event.Skip();

 }
 
 }
 

-void wxDocManager::OnRedo(wxCommandEvent& WXUNUSED(event))
+void wxDocManager::OnRedo(wxCommandEvent& event)

 {
     wxDocument *doc = GetCurrentDocument();
     if (!doc)
         return;
     if (doc->GetCommandProcessor())
         doc->GetCommandProcessor()->Redo();
 {
     wxDocument *doc = GetCurrentDocument();
     if (!doc)
         return;
     if (doc->GetCommandProcessor())
         doc->GetCommandProcessor()->Redo();

+    else
+        event.Skip();

 }
 
 // Handlers for UI update commands
 
 void wxDocManager::OnUpdateFileOpen(wxUpdateUIEvent& event)
 {
 }
 
 // Handlers for UI update commands
 
 void wxDocManager::OnUpdateFileOpen(wxUpdateUIEvent& event)
 {

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

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


@@ -942,13 +1094,13 @@ void wxDocManager::OnUpdateFileRevert(wxUpdateUIEvent& event)
 
 void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event)
 {
 
 void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event)
 {

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

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

-    event.Enable( (doc != (wxDocument*) NULL) );
+    event.Enable( doc && doc->IsModified() );

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


@@ -960,13 +1112,29 @@ void wxDocManager::OnUpdateFileSaveAs(wxUpdateUIEvent& event)
 void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event)
 {
     wxDocument *doc = GetCurrentDocument();
 void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event)
 {
     wxDocument *doc = GetCurrentDocument();

-    event.Enable( (doc && doc->GetCommandProcessor() && doc->GetCommandProcessor()->CanUndo()) );
+    if (!doc)
+        event.Enable(false);
+    else if (!doc->GetCommandProcessor())
+        event.Skip();
+    else
+    {
+        event.Enable( doc->GetCommandProcessor()->CanUndo() );
+        doc->GetCommandProcessor()->SetMenuStrings();
+    }

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

-    event.Enable( (doc && doc->GetCommandProcessor() && doc->GetCommandProcessor()->CanRedo()) );
+    if (!doc)
+        event.Enable(false);
+    else if (!doc->GetCommandProcessor())
+        event.Skip();
+    else
+    {
+        event.Enable( doc->GetCommandProcessor()->CanRedo() );
+        doc->GetCommandProcessor()->SetMenuStrings();
+    }

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


@@ -975,11 +1143,6 @@ void wxDocManager::OnUpdatePrint(wxUpdateUIEvent& event)
     event.Enable( (doc != (wxDocument*) NULL) );
 }
 
     event.Enable( (doc != (wxDocument*) NULL) );
 }
 

-void wxDocManager::OnUpdatePrintSetup(wxUpdateUIEvent& event)
-{
-    event.Enable( TRUE );
-}
-

 void wxDocManager::OnUpdatePreview(wxUpdateUIEvent& event)
 {
     wxDocument *doc = GetCurrentDocument();
 void wxDocManager::OnUpdatePreview(wxUpdateUIEvent& event)
 {
     wxDocument *doc = GetCurrentDocument();


@@ -990,9 +1153,9 @@ wxView *wxDocManager::GetCurrentView() const
 {
     if (m_currentView)
         return m_currentView;
 {
     if (m_currentView)
         return m_currentView;

-    if (m_docs.Number() == 1)
+    if (m_docs.GetCount() == 1)

     {
     {

-        wxDocument* doc = (wxDocument*) m_docs.First()->Data();
+        wxDocument* doc = (wxDocument*) m_docs.GetFirst()->GetData();

         return doc->GetFirstView();
     }
     return (wxView *) NULL;
         return doc->GetFirstView();
     }
     return (wxView *) NULL;


@@ -1005,19 +1168,19 @@ bool wxDocManager::ProcessEvent(wxEvent& event)
     if (view)
     {
         if (view->ProcessEvent(event))
     if (view)
     {
         if (view->ProcessEvent(event))

-            return TRUE;
+            return true;

     }
     return wxEvtHandler::ProcessEvent(event);
 }
 
 wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
 {
     }
     return wxEvtHandler::ProcessEvent(event);
 }
 
 wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
 {

-    wxDocTemplate **templates = new wxDocTemplate *[m_templates.Number()];
-    int i;
-    int n = 0;
-    for (i = 0; i < m_templates.Number(); i++)
+    wxDocTemplate   **templates = new wxDocTemplate *[m_templates.GetCount()];
+    int               n = 0;
+
+    for (size_t i = 0; i < m_templates.GetCount(); i++)

     {
     {

-        wxDocTemplate *temp = (wxDocTemplate *)(m_templates.Nth(i)->Data());
+        wxDocTemplate *temp = (wxDocTemplate *)(m_templates.Item(i)->GetData());

         if (temp->IsVisible())
         {
             templates[n] = temp;
         if (temp->IsVisible())
         {
             templates[n] = temp;


@@ -1030,23 +1193,14 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
         return (wxDocument *) NULL;
     }
 
         return (wxDocument *) NULL;
     }
 

+    wxDocument* docToClose = NULL;
+

     // If we've reached the max number of docs, close the
     // first one.
     // If we've reached the max number of docs, close the
     // first one.

-    if (GetDocuments().Number() >= m_maxDocsOpen)
+    if ( (int)GetDocuments().GetCount() >= m_maxDocsOpen )

     {
     {

-        wxDocument *doc = (wxDocument *)GetDocuments().First()->Data();
-        if (doc->Close())
-        {
-            // Implicitly deletes the document when
-            // the last view is deleted
-            doc->DeleteAllViews();
-
-            // Check we're really deleted
-            if (m_docs.Member(doc))
-                delete doc;
-        }
-        else
-            return (wxDocument *) NULL;
+        wxDocument *doc = (wxDocument *)GetDocuments().GetFirst()->GetData();
+        docToClose = doc;

     }
 
     // New document: user chooses a template, unless there's only one.
     }
 
     // New document: user chooses a template, unless there's only one.


@@ -1054,14 +1208,29 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
     {
         if (n == 1)
         {
     {
         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);
             wxDocTemplate *temp = templates[0];
             delete[] templates;
             wxDocument *newDoc = temp->CreateDocument(path, flags);

+

             if (newDoc)
             {
                 newDoc->SetDocumentName(temp->GetDocumentName());
                 newDoc->SetDocumentTemplate(temp);
             if (newDoc)
             {
                 newDoc->SetDocumentName(temp->GetDocumentName());
                 newDoc->SetDocumentTemplate(temp);

-                newDoc->OnNewDocument();
+                if (!newDoc->OnNewDocument() )
+                {
+                     // Document is implicitly deleted by DeleteAllViews
+                     newDoc->DeleteAllViews();
+                     return NULL;
+                }

             }
             return newDoc;
         }
             }
             return newDoc;
         }


@@ -1070,12 +1239,26 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
         delete[] templates;
         if (temp)
         {
         delete[] templates;
         if (temp)
         {

+            if (docToClose)
+            {
+                if (!CloseDocument(docToClose, false))
+                {
+                    return NULL;
+                }
+            }
+

             wxDocument *newDoc = temp->CreateDocument(path, flags);
             wxDocument *newDoc = temp->CreateDocument(path, flags);

+

             if (newDoc)
             {
                 newDoc->SetDocumentName(temp->GetDocumentName());
                 newDoc->SetDocumentTemplate(temp);
             if (newDoc)
             {
                 newDoc->SetDocumentName(temp->GetDocumentName());
                 newDoc->SetDocumentTemplate(temp);

-                newDoc->OnNewDocument();
+                if (!newDoc->OnNewDocument() )
+                {
+                     // Document is implicitly deleted by DeleteAllViews
+                     newDoc->DeleteAllViews();
+                     return NULL;
+                }

             }
             return newDoc;
         }
             }
             return newDoc;
         }


@@ -1084,14 +1267,22 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
     }
 
     // Existing document
     }
 
     // Existing document

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

 
 

-    wxString path2(wxT(""));
-    if (path != wxT(""))
-        path2 = path;
+    wxString path2 = path;

 
     if (flags & wxDOC_SILENT)
 
     if (flags & wxDOC_SILENT)

+    {

         temp = FindTemplateForPath(path2);
         temp = FindTemplateForPath(path2);

+        if (!temp)
+        {
+            // 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());
+        }
+    }

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


@@ -1099,6 +1290,36 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
 
     if (temp)
     {
 
     if (temp)
     {

+        if (docToClose)
+        {
+            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)
         {
         wxDocument *newDoc = temp->CreateDocument(path2, flags);
         if (newDoc)
         {


@@ -1110,7 +1331,11 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
                 // delete newDoc; // Implicitly deleted by DeleteAllViews
                 return (wxDocument *) NULL;
             }
                 // delete newDoc; // Implicitly deleted by DeleteAllViews
                 return (wxDocument *) NULL;
             }

-            AddFileToHistory(path2);
+            // 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;
     }
         }
         return newDoc;
     }


@@ -1120,12 +1345,12 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
 
 wxView *wxDocManager::CreateView(wxDocument *doc, long flags)
 {
 
 wxView *wxDocManager::CreateView(wxDocument *doc, long flags)
 {

-    wxDocTemplate **templates = new wxDocTemplate *[m_templates.Number()];
-    int n =0;
-    int i;
-    for (i = 0; i < m_templates.Number(); i++)
+    wxDocTemplate   **templates = new wxDocTemplate *[m_templates.GetCount()];
+    int               n =0;
+
+    for (size_t i = 0; i < m_templates.GetCount(); i++)

     {
     {

-        wxDocTemplate *temp = (wxDocTemplate *)(m_templates.Nth(i)->Data());
+        wxDocTemplate *temp = (wxDocTemplate *)(m_templates.Item(i)->GetData());

         if (temp->IsVisible())
         {
             if (temp->GetDocumentName() == doc->GetDocumentName())
         if (temp->IsVisible())
         {
             if (temp->GetDocumentName() == doc->GetDocumentName())


@@ -1171,13 +1396,14 @@ void wxDocManager::DeleteTemplate(wxDocTemplate *WXUNUSED(temp), long WXUNUSED(f
 // 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
 {

-    if (m_currentView)
-        return m_currentView->GetDocument();
+    wxView *view = GetCurrentView();
+    if (view)
+        return view->GetDocument();

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


@@ -1188,7 +1414,7 @@ bool wxDocManager::MakeDefaultName(wxString& name)
     name.Printf(_("unnamed%d"), m_defaultDocumentNameCounter);
     m_defaultDocumentNameCounter++;
 
     name.Printf(_("unnamed%d"), m_defaultDocumentNameCounter);
     m_defaultDocumentNameCounter++;
 

-    return TRUE;
+    return true;

 }
 
 // Make a frame title (override this to do something different)
 }
 
 // Make a frame title (override this to do something different)


@@ -1222,13 +1448,13 @@ void wxDocManager::AddFileToHistory(const wxString& file)
         m_fileHistory->AddFileToHistory(file);
 }
 
         m_fileHistory->AddFileToHistory(file);
 }
 

-void wxDocManager::RemoveFileFromHistory(int i)
+void wxDocManager::RemoveFileFromHistory(size_t i)

 {
     if (m_fileHistory)
         m_fileHistory->RemoveFileFromHistory(i);
 }
 
 {
     if (m_fileHistory)
         m_fileHistory->RemoveFileFromHistory(i);
 }
 

-wxString wxDocManager::GetHistoryFile(int i) const
+wxString wxDocManager::GetHistoryFile(size_t i) const

 {
     wxString histFile;
 
 {
     wxString histFile;
 


@@ -1276,12 +1502,9 @@ void wxDocManager::FileHistoryAddFilesToMenu()
         m_fileHistory->AddFilesToMenu();
 }
 
         m_fileHistory->AddFilesToMenu();
 }
 

-int wxDocManager::GetNoHistoryFiles() const
+size_t wxDocManager::GetHistoryFilesCount() const

 {
 {

-    if (m_fileHistory)
-        return m_fileHistory->GetNoHistoryFiles();
-    else
-        return 0;
+    return m_fileHistory ? m_fileHistory->GetCount() : 0;

 }
 
 
 }
 
 


@@ -1292,10 +1515,9 @@ wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path)
     wxDocTemplate *theTemplate = (wxDocTemplate *) NULL;
 
     // Find the template which this extension corresponds to
     wxDocTemplate *theTemplate = (wxDocTemplate *) NULL;
 
     // Find the template which this extension corresponds to

-    int i;
-    for (i = 0; i < m_templates.Number(); i++)
+    for (size_t i = 0; i < m_templates.GetCount(); i++)

     {
     {

-        wxDocTemplate *temp = (wxDocTemplate *)m_templates.Nth(i)->Data();
+        wxDocTemplate *temp = (wxDocTemplate *)m_templates.Item(i)->GetData();

         if ( temp->FileMatchesTemplate(path) )
         {
             theTemplate = temp;
         if ( temp->FileMatchesTemplate(path) )
         {
             theTemplate = temp;


@@ -1328,12 +1550,11 @@ static wxWindow* wxFindSuitableParent()
 }
 
 // Prompts user to open a file, using file specs in templates.
 }
 
 // Prompts user to open a file, using file specs in templates.

-// How to implement in wxWindows? Must extend the file selector
-// dialog or implement own; OR match the extension to the
-// template extension.
+// Must extend the file selector dialog or implement own; OR
+// match the extension to the template extension.

 
 wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
 
 wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,

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

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


@@ -1343,7 +1564,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
                                                 bool WXUNUSED(save))
 {
     // We can only have multiple filters in Windows and GTK
                                                 bool WXUNUSED(save))
 {
     // We can only have multiple filters in Windows and GTK

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

     wxString descrBuf;
 
     int i;
     wxString descrBuf;
 
     int i;


@@ -1352,7 +1573,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()


@@ -1370,19 +1591,19 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
 
     wxString pathTmp = wxFileSelectorEx(_("Select a file"),
                                         m_lastDirectory,
 
     wxString pathTmp = wxFileSelectorEx(_("Select a file"),
                                         m_lastDirectory,

-                                        wxT(""),
+                                        wxEmptyString,

                                         &FilterIndex,
                                         descrBuf,
                                         0,
                                         parent);
 
     wxDocTemplate *theTemplate = (wxDocTemplate *)NULL;
                                         &FilterIndex,
                                         descrBuf,
                                         0,
                                         parent);
 
     wxDocTemplate *theTemplate = (wxDocTemplate *)NULL;

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

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

-            if (!wxTheApp->GetAppName().IsEmpty())
+            if (!wxTheApp->GetAppName().empty())

                 msgTitle = wxTheApp->GetAppName();
             else
                 msgTitle = wxString(_("File error"));
                 msgTitle = wxTheApp->GetAppName();
             else
                 msgTitle = wxString(_("File error"));


@@ -1390,7 +1611,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
             (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
                 parent);
 
             (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
                 parent);
 

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

             return (wxDocTemplate *) NULL;
         }
         m_lastDirectory = wxPathOnly(pathTmp);
             return (wxDocTemplate *) NULL;
         }
         m_lastDirectory = wxPathOnly(pathTmp);


@@ -1403,72 +1624,72 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
             theTemplate = templates[FilterIndex];
         if ( !theTemplate )
             theTemplate = FindTemplateForPath(path);
             theTemplate = templates[FilterIndex];
         if ( !theTemplate )
             theTemplate = FindTemplateForPath(path);

+        if ( !theTemplate )
+        {
+            // 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());
+        }

     }
     else
     {
     }
     else
     {

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

     }
 
     return theTemplate;
     }
 
     return theTemplate;

-
-#if 0
-    // In all other windowing systems, until we have more advanced
-    // file selectors, we must select the document type (template) first, and
-    // _then_ pop up the file selector.
-    wxDocTemplate *temp = SelectDocumentType(templates, noTemplates);
-    if (!temp)
-        return (wxDocTemplate *) NULL;
-
-    wxChar *pathTmp = wxFileSelector(_("Select a file"), wxT(""), wxT(""),
-            temp->GetDefaultExtension(),
-            temp->GetFileFilter(),
-            0, wxTheApp->GetTopWindow());
-
-    if (pathTmp)
-    {
-        path = pathTmp;
-        return temp;
-    }
-    else
-        return (wxDocTemplate *) NULL;
-#endif // 0

 }
 
 wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
                                                 int noTemplates, bool sort)
 {
 }
 
 wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
                                                 int noTemplates, bool sort)
 {

-    wxArrayString strings(sort);
+    wxArrayString strings;

     wxDocTemplate **data = new wxDocTemplate *[noTemplates];
     int i;
     int n = 0;
     wxDocTemplate **data = new wxDocTemplate *[noTemplates];
     int i;
     int n = 0;

-       for (i = 0; i < noTemplates; i++)
-       {
-               if (templates[i]->IsVisible())
-               {
-                       strings.Add(templates[i]->m_description);
-                       if (!sort)
-                       {
-                               data[n] = templates[i];
-                               n ++;
-                       }
-               }
-       }  // for
-
-       if (sort)
-       {
-               // Yes, this will be slow, but template lists
-               // are typically short.
-               int j;
-               n = strings.Count();
-               for (i = 0; i < n; i++)
-               {
-                       for (j = 0; j < noTemplates; j++)
-                       {
-                               if (strings[i] == templates[j]->m_description)
-                                       data[i] = templates[j];
-                       }
-               }
-       }
+
+    for (i = 0; i < noTemplates; i++)
+    {
+        if (templates[i]->IsVisible())
+        {
+            int j;
+            bool want = true;
+            for (j = 0; j < n; j++)
+            {
+                //filter out NOT unique documents + view combinations
+                if ( templates[i]->m_docTypeName == data[j]->m_docTypeName &&
+                     templates[i]->m_viewTypeName == data[j]->m_viewTypeName
+                   )
+                    want = false;
+            }
+
+            if ( want )
+            {
+                strings.Add(templates[i]->m_description);
+
+                data[n] = templates[i];
+                n ++;
+            }
+        }
+    }  // for
+
+    if (sort)
+    {
+        strings.Sort(); // ascending sort
+        // Yes, this will be slow, but template lists
+        // are typically short.
+        int j;
+        n = strings.Count();
+        for (i = 0; i < n; i++)
+        {
+            for (j = 0; j < noTemplates; j++)
+            {
+                if (strings[i] == templates[j]->m_description)
+                    data[i] = templates[j];
+            }
+        }
+    }

 
     wxDocTemplate *theTemplate;
 
 
     wxDocTemplate *theTemplate;
 


@@ -1504,39 +1725,50 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
 wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
                                             int noTemplates, bool sort)
 {
 wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
                                             int noTemplates, bool sort)
 {

-    wxArrayString strings(sort);
+    wxArrayString strings;

     wxDocTemplate **data = new wxDocTemplate *[noTemplates];
     int i;
     int n = 0;
     wxDocTemplate **data = new wxDocTemplate *[noTemplates];
     int i;
     int n = 0;

+

     for (i = 0; i < noTemplates; i++)
     {
         wxDocTemplate *templ = templates[i];
         if ( templ->IsVisible() && !templ->GetViewName().empty() )
         {
     for (i = 0; i < noTemplates; i++)
     {
         wxDocTemplate *templ = templates[i];
         if ( templ->IsVisible() && !templ->GetViewName().empty() )
         {

-            strings.Add(templ->m_viewTypeName);
-                       if (!sort)
-                       {
-                               data[n] = templ;
-                               n ++;
-                       }
+            int j;
+            bool want = true;
+            for (j = 0; j < n; j++)
+            {
+                //filter out NOT unique views
+                if ( templates[i]->m_viewTypeName == data[j]->m_viewTypeName )
+                    want = false;
+            }
+
+            if ( want )
+            {
+                strings.Add(templ->m_viewTypeName);
+                data[n] = templ;
+                n ++;
+            }

         }
     }
 
         }
     }
 

-       if (sort)
-       {
-               // Yes, this will be slow, but template lists
-               // are typically short.
-               int j;
-               n = strings.Count();
-               for (i = 0; i < n; i++)
-               {
-                       for (j = 0; j < noTemplates; j++)
-                       {
-                               if (strings[i] == templates[j]->m_viewTypeName)
-                                       data[i] = templates[j];
-                       }
-               }
-       }
+    if (sort)
+    {
+        strings.Sort(); // ascending sort
+        // Yes, this will be slow, but template lists
+        // are typically short.
+        int j;
+        n = strings.Count();
+        for (i = 0; i < n; i++)
+        {
+            for (j = 0; j < noTemplates; j++)
+            {
+                if (strings[i] == templates[j]->m_viewTypeName)
+                    data[i] = templates[j];
+            }
+        }
+    }

 
     wxDocTemplate *theTemplate;
 
 
     wxDocTemplate *theTemplate;
 


@@ -1592,25 +1824,19 @@ void wxDocManager::RemoveDocument(wxDocument *doc)
 
 // Views or windows should inform the document manager
 // when a view is going in or out of focus
 
 // Views or windows should inform the document manager
 // when a view is going in or out of focus

-void wxDocManager::ActivateView(wxView *view, bool activate, bool WXUNUSED(deleting))
-{
-    // If we're deactiving, and if we're not actually deleting the view, then
-    // don't reset the current view because we may be going to
-    // a window without a view.
-    // WHAT DID I MEAN BY THAT EXACTLY?
-    /*
-       if (deleting)
-       {
-       if (m_currentView == view)
-       m_currentView = NULL;
-       }
-       else
-     */
-    {
-        if (activate)
-            m_currentView = view;
-        else
+void wxDocManager::ActivateView(wxView *view, bool activate)
+{
+    if ( activate )
+    {
+        m_currentView = view;
+    }
+    else // deactivate
+    {
+        if ( m_currentView == view )
+        {
+            // don't keep stale pointer

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

+        }

     }
 }
 
     }
 }
 


@@ -1640,15 +1866,11 @@ wxDocChildFrame::wxDocChildFrame(wxDocument *doc,
         view->SetFrame(this);
 }
 
         view->SetFrame(this);
 }
 

-wxDocChildFrame::~wxDocChildFrame()
-{
-}
-

 // Extend event processing to search the view's event table
 bool wxDocChildFrame::ProcessEvent(wxEvent& event)
 {
     if (m_childView)
 // 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) )
     {
 
     if ( !m_childView || ! m_childView->ProcessEvent(event) )
     {


@@ -1656,10 +1878,10 @@ bool wxDocChildFrame::ProcessEvent(wxEvent& event)
         if (!event.IsKindOf(CLASSINFO(wxCommandEvent)) || !GetParent() || !GetParent()->ProcessEvent(event))
             return wxEvtHandler::ProcessEvent(event);
         else
         if (!event.IsKindOf(CLASSINFO(wxCommandEvent)) || !GetParent() || !GetParent()->ProcessEvent(event))
             return wxEvtHandler::ProcessEvent(event);
         else

-            return TRUE;
+            return true;

     }
     else
     }
     else

-        return TRUE;
+        return true;

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


@@ -1674,15 +1896,13 @@ 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;
             m_childView = (wxView *) NULL;
             m_childDocument = (wxDocument *) NULL;
             delete m_childView;
             m_childView = (wxView *) NULL;
             m_childDocument = (wxDocument *) NULL;


@@ -1728,13 +1948,20 @@ 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() )
+    if ( !filename.empty() )

     {
         // verify that the file exists before doing anything else
         if ( wxFile::Exists(filename) )
         {
             // try to open it
     {
         // verify that the file exists before doing anything else
         if ( wxFile::Exists(filename) )
         {
             // try to open it

-            (void)m_docManager->CreateDocument(filename, wxDOC_SILENT);
+            if (!m_docManager->CreateDocument(filename, wxDOC_SILENT))
+            {
+                // remove the file from the MRU list. The user should already be notified.
+                m_docManager->RemoveFileFromHistory(n);
+
+                wxLogError(_("The file '%s' couldn't be opened.\nIt has been removed from the most recently used files list."),
+                       filename.c_str());
+            }

         }
         else
         {
         }
         else
         {


@@ -1742,7 +1969,7 @@ void wxDocParentFrame::OnMRUFile(wxCommandEvent& event)
             // about it
             m_docManager->RemoveFileFromHistory(n);
 
             // about it
             m_docManager->RemoveFileFromHistory(n);
 

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


@@ -1755,7 +1982,7 @@ bool wxDocParentFrame::ProcessEvent(wxEvent& event)
     if (!m_docManager || !m_docManager->ProcessEvent(event))
         return wxEvtHandler::ProcessEvent(event);
     else
     if (!m_docManager || !m_docManager->ProcessEvent(event))
         return wxEvtHandler::ProcessEvent(event);
     else

-        return TRUE;
+        return true;

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


@@ -1785,8 +2012,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


@@ -1801,6 +2030,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.


@@ -1811,7 +2041,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)


@@ -1822,9 +2052,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)


@@ -1838,237 +2068,32 @@ void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, in
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
 // ----------------------------------------------------------------------------

-// Command processing framework
+// File history processor

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

-wxCommand::wxCommand(bool canUndoIt, const wxString& name)
-{
-    m_canUndo = canUndoIt;
-    m_commandName = name;
-}
-
-wxCommand::~wxCommand()
+static inline wxChar* MYcopystring(const wxString& s)

 {
 {

+    wxChar* copy = new wxChar[s.length() + 1];
+    return wxStrcpy(copy, s.c_str());

 }
 
 }
 

-// Command processor
-wxCommandProcessor::wxCommandProcessor(int maxCommands)
+static inline wxChar* MYcopystring(const wxChar* s)

 {
 {

-    m_maxNoCommands = maxCommands;
-    m_currentCommand = (wxNode *) NULL;
-    m_commandEditMenu = (wxMenu *) NULL;
-    m_undoAccelerator = wxT("\tCtrl+Z");
-    m_redoAccelerator = wxT("\tCtrl+Y");
+    wxChar* copy = new wxChar[wxStrlen(s) + 1];
+    return wxStrcpy(copy, s);

 }
 
 }
 

-wxCommandProcessor::~wxCommandProcessor()
-{
-    ClearCommands();
-}
-
-// Pass a command to the processor. The processor calls Do();
-// if successful, is appended to the command history unless
-// storeIt is FALSE.
-bool wxCommandProcessor::Submit(wxCommand *command, bool storeIt)
-{
-    bool success = command->Do();
-    if (success && storeIt)
-    {
-        if (m_commands.Number() == m_maxNoCommands)
-        {
-            wxNode *firstNode = m_commands.First();
-            wxCommand *firstCommand = (wxCommand *)firstNode->Data();
-            delete firstCommand;
-            delete firstNode;
-        }
-
-        // Correct a bug: we must chop off the current 'branch'
-        // so that we're at the end of the command list.
-        if (!m_currentCommand)
-            ClearCommands();
-        else
-        {
-            wxNode *node = m_currentCommand->Next();
-            while (node)
-            {
-                wxNode *next = node->Next();
-                delete (wxCommand *)node->Data();
-                delete node;
-                node = next;
-            }
-        }
-
-        m_commands.Append(command);
-        m_currentCommand = m_commands.Last();
-        SetMenuStrings();
-    }
-    return success;
-}
-
-bool wxCommandProcessor::Undo()
-{
-    if (m_currentCommand)
-    {
-        wxCommand *command = (wxCommand *)m_currentCommand->Data();
-        if (command->CanUndo())
-        {
-            bool success = command->Undo();
-            if (success)
-            {
-                m_currentCommand = m_currentCommand->Previous();
-                SetMenuStrings();
-                return TRUE;
-            }
-        }
-    }
-    return FALSE;
-}
-
-bool wxCommandProcessor::Redo()
-{
-    wxCommand *redoCommand = (wxCommand *) NULL;
-    wxNode *redoNode = (wxNode *) NULL;
-    if (m_currentCommand && m_currentCommand->Next())
-    {
-        redoCommand = (wxCommand *)m_currentCommand->Next()->Data();
-        redoNode = m_currentCommand->Next();
-    }
-    else
-    {
-        if (m_commands.Number() > 0)
-        {
-            redoCommand = (wxCommand *)m_commands.First()->Data();
-            redoNode = m_commands.First();
-        }
-    }
-
-    if (redoCommand)
-    {
-        bool success = redoCommand->Do();
-        if (success)
-        {
-            m_currentCommand = redoNode;
-            SetMenuStrings();
-            return TRUE;
-        }
-    }
-    return FALSE;
-}
-
-bool wxCommandProcessor::CanUndo() const
-{
-    if (m_currentCommand)
-        return ((wxCommand *)m_currentCommand->Data())->CanUndo();
-    return FALSE;
-}
-
-bool wxCommandProcessor::CanRedo() const
-{
-    if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->Next() == (wxNode*) NULL))
-        return FALSE;
-
-    if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->Next() != (wxNode*) NULL))
-        return TRUE;
-
-    if ((m_currentCommand == (wxNode*) NULL) && (m_commands.Number() > 0))
-        return TRUE;
-
-    return FALSE;
-}
-
-void wxCommandProcessor::Initialize()
-{
-    m_currentCommand = m_commands.Last();
-    SetMenuStrings();
-}
-
-void wxCommandProcessor::SetMenuStrings()
-{
-    if (m_commandEditMenu)
-    {
-        wxString buf;
-        if (m_currentCommand)
-        {
-            wxCommand *command = (wxCommand *)m_currentCommand->Data();
-            wxString commandName(command->GetName());
-            if (commandName == wxT("")) commandName = _("Unnamed command");
-            bool canUndo = command->CanUndo();
-            if (canUndo)
-                buf = wxString(_("&Undo ")) + commandName + m_undoAccelerator;
-            else
-                buf = wxString(_("Can't &Undo ")) + commandName + m_undoAccelerator;
-
-            m_commandEditMenu->SetLabel(wxID_UNDO, buf);
-            m_commandEditMenu->Enable(wxID_UNDO, canUndo);
-
-            // We can redo, if we're not at the end of the history.
-            if (m_currentCommand->Next())
-            {
-                wxCommand *redoCommand = (wxCommand *)m_currentCommand->Next()->Data();
-                wxString redoCommandName(redoCommand->GetName());
-                if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command");
-                buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator;
-                m_commandEditMenu->SetLabel(wxID_REDO, buf);
-                m_commandEditMenu->Enable(wxID_REDO, TRUE);
-            }
-            else
-            {
-                m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo") + m_redoAccelerator);
-                m_commandEditMenu->Enable(wxID_REDO, FALSE);
-            }
-        }
-        else
-        {
-            m_commandEditMenu->SetLabel(wxID_UNDO, _("&Undo") + m_undoAccelerator);
-            m_commandEditMenu->Enable(wxID_UNDO, FALSE);
-
-            if (m_commands.Number() == 0)
-            {
-                m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo") + m_redoAccelerator);
-                m_commandEditMenu->Enable(wxID_REDO, FALSE);
-            }
-            else
-            {
-                // currentCommand is NULL but there are commands: this means that
-                // we've undone to the start of the list, but can redo the first.
-                wxCommand *redoCommand = (wxCommand *)m_commands.First()->Data();
-                wxString redoCommandName(redoCommand->GetName());
-                if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command");
-                buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator;
-                m_commandEditMenu->SetLabel(wxID_REDO, buf);
-                m_commandEditMenu->Enable(wxID_REDO, TRUE);
-            }
-        }
-    }
-}
-
-void wxCommandProcessor::ClearCommands()
-{
-    wxNode *node = m_commands.First();
-    while (node)
-    {
-        wxCommand *command = (wxCommand *)node->Data();
-        delete command;
-        delete node;
-        node = m_commands.First();
-    }
-    m_currentCommand = (wxNode *) NULL;
-}
-
-// ----------------------------------------------------------------------------
-// File history processor
-// ----------------------------------------------------------------------------
-
-wxFileHistory::wxFileHistory(int maxFiles)
+wxFileHistory::wxFileHistory(size_t maxFiles, wxWindowID idBase)

 {
     m_fileMaxFiles = maxFiles;
 {
     m_fileMaxFiles = maxFiles;

+    m_idBase = idBase;

     m_fileHistoryN = 0;
     m_fileHistory = new wxChar *[m_fileMaxFiles];
 }
 
 wxFileHistory::~wxFileHistory()
 {
     m_fileHistoryN = 0;
     m_fileHistory = new wxChar *[m_fileMaxFiles];
 }
 
 wxFileHistory::~wxFileHistory()
 {

-    int i;
+    size_t i;

     for (i = 0; i < m_fileHistoryN; i++)
         delete[] m_fileHistory[i];
     delete[] m_fileHistory;
     for (i = 0; i < m_fileHistoryN; i++)
         delete[] m_fileHistory[i];
     delete[] m_fileHistory;


@@ -2077,12 +2102,19 @@ wxFileHistory::~wxFileHistory()
 // File history management
 void wxFileHistory::AddFileToHistory(const wxString& file)
 {
 // File history management
 void wxFileHistory::AddFileToHistory(const wxString& file)
 {

-    int i;
+    size_t i;

 
     // Check we don't already have this file
     for (i = 0; i < m_fileHistoryN; i++)
     {
 
     // Check we don't already have this file
     for (i = 0; i < m_fileHistoryN; i++)
     {

-        if ( m_fileHistory[i] && (file == m_fileHistory[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

         {
             // we do have it, move it to the top of the history
             RemoveFileFromHistory (i);
         {
             // we do have it, move it to the top of the history
             RemoveFileFromHistory (i);


@@ -2103,14 +2135,16 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
     // Move existing files (if any) down so we can insert file at beginning.
     if (m_fileHistoryN < m_fileMaxFiles)
     {
     // Move existing files (if any) down so we can insert file at beginning.
     if (m_fileHistoryN < m_fileMaxFiles)
     {

-        wxNode* node = m_fileMenus.First();
+        wxList::compatibility_iterator node = m_fileMenus.GetFirst();

         while (node)
         {
         while (node)
         {

-            wxMenu* menu = (wxMenu*) node->Data();
-            if (m_fileHistoryN == 0)
+            wxMenu* menu = (wxMenu*) node->GetData();
+            if ( m_fileHistoryN == 0 && menu->GetMenuItemCount() )
+            {

                 menu->AppendSeparator();
                 menu->AppendSeparator();

-            menu->Append(wxID_FILE1+m_fileHistoryN, _("[EMPTY]"));
-            node = node->Next();
+            }
+            menu->Append(m_idBase+m_fileHistoryN, _("[EMPTY]"));
+            node = node->GetNext();

         }
         m_fileHistoryN ++;
     }
         }
         m_fileHistoryN ++;
     }


@@ -2119,7 +2153,7 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
     {
         m_fileHistory[i] = m_fileHistory[i-1];
     }
     {
         m_fileHistory[i] = m_fileHistory[i-1];
     }

-    m_fileHistory[0] = copystring(file);
+    m_fileHistory[0] = MYcopystring(file);

 
     // this is the directory of the last opened file
     wxString pathCurrent;
 
     // this is the directory of the last opened file
     wxString pathCurrent;


@@ -2146,55 +2180,57 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
 
             wxString buf;
             buf.Printf(s_MRUEntryFormat, i + 1, pathInMenu.c_str());
 
             wxString buf;
             buf.Printf(s_MRUEntryFormat, i + 1, pathInMenu.c_str());

-            wxNode* node = m_fileMenus.First();
+            wxList::compatibility_iterator node = m_fileMenus.GetFirst();

             while (node)
             {
             while (node)
             {

-                wxMenu* menu = (wxMenu*) node->Data();
-                menu->SetLabel(wxID_FILE1 + i, buf);
-                node = node->Next();
+                wxMenu* menu = (wxMenu*) node->GetData();
+                menu->SetLabel(m_idBase + i, buf);
+                node = node->GetNext();

             }
         }
     }
 }
 
             }
         }
     }
 }
 

-void wxFileHistory::RemoveFileFromHistory(int i)
+void wxFileHistory::RemoveFileFromHistory(size_t i)

 {
     wxCHECK_RET( i < m_fileHistoryN,
                  wxT("invalid index in wxFileHistory::RemoveFileFromHistory") );
 
 {
     wxCHECK_RET( i < m_fileHistoryN,
                  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 (could use memmove() too...)
+    delete [] m_fileHistory[i];

 
 

-        int j;
-        for ( j = i; j < m_fileHistoryN - 1; j++ )
-        {
-            m_fileHistory[j] = m_fileHistory[j + 1];
-        }
+    size_t j;
+    for ( j = i; j < m_fileHistoryN - 1; j++ )
+    {
+        m_fileHistory[j] = m_fileHistory[j + 1];
+    }

 
 

-    wxNode* node = m_fileMenus.First();
+    wxList::compatibility_iterator node = m_fileMenus.GetFirst();

     while ( node )
     {
     while ( node )
     {

-        wxMenu* menu = (wxMenu*) node->Data();
-
+         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(wxID_FILE1 + 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->Next();
+         node = node->GetNext();

 
         // delete the last menu item which is unused now
 
         // delete the last menu item which is unused now

-        if (menu->FindItem(wxID_FILE1 + m_fileHistoryN - 1))
-        menu->Delete(wxID_FILE1 + m_fileHistoryN - 1);
+        wxWindowID lastItemId = m_idBase + m_fileHistoryN - 1;
+        if (menu->FindItem(lastItemId))
+        {
+            menu->Delete(lastItemId);
+        }

 
         // delete the last separator too if no more files are left
         if ( m_fileHistoryN == 1 )
         {
 
         // delete the last separator too if no more files are left
         if ( m_fileHistoryN == 1 )
         {

-            wxMenuItemList::Node *node = menu->GetMenuItems().GetLast();
+            wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetLast();

             if ( node )
             {
                 wxMenuItem *menuItem = node->GetData();
             if ( node )
             {
                 wxMenuItem *menuItem = node->GetData();


@@ -2211,7 +2247,7 @@ void wxFileHistory::RemoveFileFromHistory(int i)
     m_fileHistoryN--;
 }
 
     m_fileHistoryN--;
 }
 

-wxString wxFileHistory::GetHistoryFile(int i) const
+wxString wxFileHistory::GetHistoryFile(size_t i) const

 {
     wxString s;
     if ( i < m_fileHistoryN )
 {
     wxString s;
     if ( i < m_fileHistoryN )


@@ -2242,26 +2278,29 @@ void wxFileHistory::Load(wxConfigBase& config)
 {
     m_fileHistoryN = 0;
     wxString buf;
 {
     m_fileHistoryN = 0;
     wxString buf;

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

     wxString historyFile;
     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] = copystring((const wxChar*) historyFile);
+        m_fileHistory[m_fileHistoryN] = MYcopystring((const wxChar*) historyFile);

         m_fileHistoryN ++;
         m_fileHistoryN ++;

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

     }
     AddFilesToMenu();
 }
 
 void wxFileHistory::Save(wxConfigBase& config)
 {
     }
     AddFilesToMenu();
 }
 
 void wxFileHistory::Save(wxConfigBase& config)
 {

-    int i;
-    for (i = 0; i < m_fileHistoryN; i++)
+    size_t i;
+    for (i = 0; i < m_fileMaxFiles; i++)

     {
         wxString buf;
     {
         wxString buf;

-        buf.Printf(wxT("file%d"), i+1);
-        config.Write(buf, wxString(m_fileHistory[i]));
+        buf.Printf(wxT("file%d"), (int)i+1);
+        if (i < m_fileHistoryN)
+            config.Write(buf, wxString(m_fileHistory[i]));
+        else
+            config.Write(buf, wxEmptyString);

     }
 }
 #endif // wxUSE_CONFIG
     }
 }
 #endif // wxUSE_CONFIG


@@ -2270,22 +2309,26 @@ void wxFileHistory::AddFilesToMenu()
 {
     if (m_fileHistoryN > 0)
     {
 {
     if (m_fileHistoryN > 0)
     {

-        wxNode* node = m_fileMenus.First();
+        wxList::compatibility_iterator node = m_fileMenus.GetFirst();

         while (node)
         {
         while (node)
         {

-            wxMenu* menu = (wxMenu*) node->Data();
-            menu->AppendSeparator();
-            int i;
+            wxMenu* menu = (wxMenu*) node->GetData();
+            if (menu->GetMenuItemCount())
+            {
+                menu->AppendSeparator();
+            }
+
+            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]);
             for (i = 0; i < m_fileHistoryN; i++)
             {
                 if (m_fileHistory[i])
                 {
                     wxString buf;
                     buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]);

-                    menu->Append(wxID_FILE1+i, buf);
+                    menu->Append(m_idBase+i, buf);

                 }
             }
                 }
             }

-            node = node->Next();
+            node = node->GetNext();

         }
     }
 }
         }
     }
 }


@@ -2294,15 +2337,19 @@ void wxFileHistory::AddFilesToMenu(wxMenu* menu)
 {
     if (m_fileHistoryN > 0)
     {
 {
     if (m_fileHistoryN > 0)
     {

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

-                menu->Append(wxID_FILE1+i, buf);
+                menu->Append(m_idBase+i, buf);

             }
         }
     }
             }
         }
     }


@@ -2314,77 +2361,99 @@ void wxFileHistory::AddFilesToMenu(wxMenu* menu)
 // ----------------------------------------------------------------------------
 
 #if wxUSE_STD_IOSTREAM
 // ----------------------------------------------------------------------------
 
 #if wxUSE_STD_IOSTREAM

+

 bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream)
 {
 bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream)
 {

-    FILE *fd1;
-    int ch;
+    wxFFile file(filename, _T("rb"));
+    if ( !file.IsOpened() )
+        return false;

 
 

-    if ((fd1 = wxFopen (filename.fn_str(), _T("rb"))) == NULL)
-        return FALSE;
+    char buf[4096];

 
 

-    while ((ch = getc (fd1)) != EOF)
-        stream << (unsigned char)ch;
+    size_t nRead;
+    do
+    {
+        nRead = file.Read(buf, WXSIZEOF(buf));
+        if ( file.Error() )
+            return false;

 
 

-    fclose (fd1);
-    return TRUE;
+        stream.write(buf, nRead);
+        if ( !stream )
+            return false;
+    }
+    while ( !file.Eof() );
+
+    return true;

 }
 
 bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename)
 {
 }
 
 bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename)
 {

-    FILE *fd1;
-    int ch;
+    wxFFile file(filename, _T("wb"));
+    if ( !file.IsOpened() )
+        return false;

 
 

-    if ((fd1 = wxFopen (filename.fn_str(), _T("wb"))) == NULL)
+    char buf[4096];
+    do

     {
     {

-        return FALSE;
+        stream.read(buf, WXSIZEOF(buf));
+        if ( !stream.bad() ) // fail may be set on EOF, don't use operator!()
+        {
+            if ( !file.Write(buf, stream.gcount()) )
+                return false;
+        }

     }
     }

+    while ( !stream.eof() );

 
 

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

 }
 }

-#else
+
+#else // !wxUSE_STD_IOSTREAM
+

 bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream)
 {
 bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream)
 {

-    FILE *fd1;
-    int ch;
+    wxFFile file(filename, _T("rb"));
+    if ( !file.IsOpened() )
+        return false;
+
+    char buf[4096];

 
 

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

 
 

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

 
 

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

 }
 
 bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename)
 {
 }
 
 bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename)
 {

-    FILE *fd1;
-    char ch;
+    wxFFile file(filename, _T("wb"));
+    if ( !file.IsOpened() )
+        return false;

 
 

-    if ((fd1 = wxFopen (filename, wxT("wb"))) == NULL)
+    char buf[4096];
+    do

     {
     {

-        return FALSE;
-    }
+        stream.Read(buf, WXSIZEOF(buf));

 
 

-    int len = stream.StreamSize();
-    // TODO: is this the correct test for EOF?
-    while (stream.TellI() < (len - 1))
-    {
-        ch = stream.GetC();
-        putc (ch, fd1);
+        const size_t nRead = stream.LastRead();
+        if ( !nRead || !file.Write(buf, nRead) )
+            return false;

     }
     }

-    fclose (fd1);
-    return TRUE;
+    while ( !stream.Eof() );
+
+    return true;

 }
 }

-#endif
+
+#endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM

 
 #endif // wxUSE_DOC_VIEW_ARCHITECTURE
 
 
 #endif // wxUSE_DOC_VIEW_ARCHITECTURE