When saving the editable state, use the real state (m_editable)

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 2cdab5312d3682c4c446c46d189cd2b4313ad574..9b8de090187c99f84f00e89c266c550aa55f399c 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // 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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -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"


@@ -164,6 +170,8 @@ bool wxDocument::Close()
 
 bool wxDocument::OnCloseDocument()
 {
 
 bool wxDocument::OnCloseDocument()
 {

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

     DeleteContents();
     Modify(FALSE);
     return TRUE;
     DeleteContents();
     Modify(FALSE);
     return TRUE;


@@ -175,14 +183,14 @@ bool wxDocument::DeleteAllViews()
 {
     wxDocManager* manager = GetDocumentManager();
 
 {
     wxDocManager* manager = GetDocumentManager();
 

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

     while (node)
     {
     while (node)
     {

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

         if (!view->Close())
             return FALSE;
 
         if (!view->Close())
             return FALSE;
 

-        wxNode *next = node->Next();
+        wxNode *next = node->GetNext();

 
         delete view; // Deletes node implicitly
         node = next;
 
         delete view; // Deletes node implicitly
         node = next;


@@ -197,9 +205,9 @@ bool wxDocument::DeleteAllViews()
 
 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


@@ -259,7 +267,7 @@ bool wxDocument::SaveAs()
 
     if (ext.IsEmpty() || ext == wxT(""))
     {
 
     if (ext.IsEmpty() || ext == wxT(""))
     {

-        fileName += ".";
+        fileName += wxT(".");

         fileName += docTemplate->GetDefaultExtension();
     }
 
         fileName += docTemplate->GetDefaultExtension();
     }
 


@@ -269,12 +277,12 @@ bool wxDocument::SaveAs()
     GetDocumentManager()->AddFileToHistory(fileName);
 
     // Notify the views that the filename has changed
     GetDocumentManager()->AddFileToHistory(fileName);
 
     // Notify the views that the filename has changed

-    wxNode *node = m_documentViews.First();
+    wxNode *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);
     }
 
     return OnSaveDocument(m_documentFile);


@@ -292,11 +300,11 @@ bool wxDocument::OnSaveDocument(const wxString& file)
         msgTitle = wxString(_("File error"));
 
 #if wxUSE_STD_IOSTREAM
         msgTitle = wxString(_("File error"));
 
 #if wxUSE_STD_IOSTREAM

-    wxSTD ofstream store(wxString(file.fn_str()).mb_str());
+    wxSTD ofstream store(file.mb_str());

     if (store.fail() || store.bad())
 #else
     if (store.fail() || store.bad())
 #else

-    wxFileOutputStream store(wxString(file.fn_str()));
-    if (store.LastError() != wxSTREAM_NOERROR)
+    wxFileOutputStream store(file);
+    if (store.GetLastError() != wxSTREAM_NO_ERROR)

 #endif
     {
         (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,
 #endif
     {
         (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,


@@ -314,6 +322,10 @@ bool wxDocument::OnSaveDocument(const wxString& file)
     Modify(FALSE);
     SetFilename(file);
     SetDocumentSaved(TRUE);
     Modify(FALSE);
     SetFilename(file);
     SetDocumentSaved(TRUE);

+#ifdef __WXMAC__
+    wxFileName fn(file) ;
+    fn.MacSetDefaultTypeAndCreator() ;
+#endif

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -329,11 +341,11 @@ bool wxDocument::OnOpenDocument(const wxString& file)
         msgTitle = wxString(_("File error"));
 
 #if wxUSE_STD_IOSTREAM
         msgTitle = wxString(_("File error"));
 
 #if wxUSE_STD_IOSTREAM

-    wxSTD ifstream store(wxString(file.fn_str()).mb_str());
+    wxSTD ifstream store(file.mb_str());

     if (store.fail() || store.bad())
 #else
     if (store.fail() || store.bad())
 #else

-    wxFileInputStream store(wxString(file.fn_str()));
-    if (store.LastError() != wxSTREAM_NOERROR)
+    wxFileInputStream store(file);
+    if (store.GetLastError() != wxSTREAM_NO_ERROR)

 #endif
     {
         (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
 #endif
     {
         (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,


@@ -344,8 +356,8 @@ bool wxDocument::OnOpenDocument(const wxString& file)
     LoadObject(store);
     if ( !store && !store.eof() )
 #else
     LoadObject(store);
     if ( !store && !store.eof() )
 #else

-    int res = LoadObject(store).LastError();
-    if ((res != wxSTREAM_NOERROR) &&
+    int res = LoadObject(store).GetLastError();
+    if ((res != wxSTREAM_NO_ERROR) &&

         (res != wxSTREAM_EOF))
 #endif
     {
         (res != wxSTREAM_EOF))
 #endif
     {


@@ -488,7 +500,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())
         {


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

-    wxNode *node = m_documentViews.First();
+    wxNode *node = m_documentViews.GetFirst();
+    while (node)
+    {
+        wxView *view = (wxView *)node->GetData();
+               if (view != sender)
+            view->OnUpdate(sender, hint);
+        node = node->GetNext();
+    }
+}
+
+void wxDocument::NotifyClosing()
+{
+    wxNode *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();

     }
 }
 
     }
 }
 


@@ -514,12 +538,12 @@ 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();
+        wxNode *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();

         }
     }
 }
         }
     }
 }


@@ -594,7 +618,7 @@ bool wxView::Close(bool deleteWindow)
 
 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);


@@ -752,11 +776,11 @@ wxDocManager::~wxDocManager()
 
 bool wxDocManager::CloseDocuments(bool force)
 {
 
 bool wxDocManager::CloseDocuments(bool force)
 {

-    wxNode *node = m_docs.First();
+    wxNode *node = m_docs.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxDocument *doc = (wxDocument *)node->Data();
-        wxNode *next = node->Next();
+        wxDocument *doc = (wxDocument *)node->GetData();
+        wxNode *next = node->GetNext();

 
         if (!doc->Close() && !force)
             return FALSE;
 
         if (!doc->Close() && !force)
             return FALSE;


@@ -782,11 +806,11 @@ bool wxDocManager::Clear(bool force)
     if (!CloseDocuments(force))
         return FALSE;
 
     if (!CloseDocuments(force))
         return FALSE;
 

-    wxNode *node = m_templates.First();
+    wxNode *node = m_templates.GetFirst();

     while (node)
     {
     while (node)
     {

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

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


@@ -824,12 +848,12 @@ void wxDocManager::OnFileCloseAll(wxCommandEvent& WXUNUSED(event))
 
 void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event))
 {

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

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

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

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


@@ -1007,9 +1031,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;


@@ -1029,12 +1053,12 @@ bool wxDocManager::ProcessEvent(wxEvent& event)
 
 wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
 {
 
 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;


@@ -1049,9 +1073,9 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
 
     // 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();
+        wxDocument *doc = (wxDocument *)GetDocuments().GetFirst()->GetData();

         if (doc->Close())
         {
             // Implicitly deletes the document when
         if (doc->Close())
         {
             // Implicitly deletes the document when


@@ -1140,12 +1164,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())


@@ -1243,13 +1267,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;
 


@@ -1297,7 +1321,7 @@ void wxDocManager::FileHistoryAddFilesToMenu()
         m_fileHistory->AddFilesToMenu();
 }
 
         m_fileHistory->AddFilesToMenu();
 }
 

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

 {
     if (m_fileHistory)
         return m_fileHistory->GetNoHistoryFiles();
 {
     if (m_fileHistory)
         return m_fileHistory->GetNoHistoryFiles();


@@ -1313,10 +1337,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;


@@ -1354,7 +1377,7 @@ static wxWindow* wxFindSuitableParent()
 // template extension.
 
 wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
 // template extension.
 
 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),


@@ -1364,7 +1387,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;


@@ -1462,13 +1485,26 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
     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())
                {
        for (i = 0; i < noTemplates; i++)
        {
                if (templates[i]->IsVisible())
                {

-                       strings.Add(templates[i]->m_description);
-                       if (!sort)
+               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 ++;
                        }
                                data[n] = templates[i];
                                n ++;
                        }


@@ -1529,14 +1565,24 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
     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)
+               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 ++;
                        }
                                data[n] = templ;
                                n ++;
                        }


@@ -1862,16 +1908,17 @@ void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, in
 // File history processor
 // ----------------------------------------------------------------------------
 
 // 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;


@@ -1880,7 +1927,7 @@ 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++)


@@ -1906,14 +1953,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();
+        wxNode* 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 ++;
     }


@@ -1949,50 +1998,53 @@ 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();
+            wxNode* 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();
+    wxNode* 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 )


@@ -2014,7 +2066,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 )


@@ -2045,13 +2097,13 @@ 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 != wxT("")))

     {
         m_fileHistory[m_fileHistoryN] = copystring((const wxChar*) historyFile);
         m_fileHistoryN ++;
     {
         m_fileHistory[m_fileHistoryN] = copystring((const wxChar*) historyFile);
         m_fileHistoryN ++;

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

         historyFile = wxT("");
     }
     AddFilesToMenu();
         historyFile = wxT("");
     }
     AddFilesToMenu();


@@ -2059,11 +2111,11 @@ void wxFileHistory::Load(wxConfigBase& config)
 
 void wxFileHistory::Save(wxConfigBase& config)
 {
 
 void wxFileHistory::Save(wxConfigBase& config)
 {

-    int i;
+    size_t i;

     for (i = 0; i < m_fileHistoryN; i++)
     {
         wxString buf;
     for (i = 0; i < m_fileHistoryN; i++)
     {
         wxString buf;

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

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


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

-        wxNode* node = m_fileMenus.First();
+        wxNode* 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();

         }
     }
 }
         }
     }
 }


@@ -2097,15 +2153,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);

             }
         }
     }
             }
         }
     }


@@ -2117,77 +2177,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;
-
-    if ((fd1 = wxFopen (filename.fn_str(), _T("rb"))) == NULL)
+    wxFFile file(filename, _T("rb"));
+    if ( !file.IsOpened() )

         return FALSE;
 
         return FALSE;
 

-    while ((ch = getc (fd1)) != EOF)
-        stream << (unsigned char)ch;
+    char buf[4096];
+
+    size_t nRead;
+    do
+    {
+        nRead = file.Read(buf, WXSIZEOF(buf));
+        if ( file.Error() )
+            return FALSE;
+
+        stream.write(buf, nRead);
+        if ( !stream )
+            return FALSE;
+    }
+    while ( !file.Eof() );

 
 

-    fclose (fd1);

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

-    FILE *fd1;
-    int ch;
-
-    if ((fd1 = wxFopen (filename.fn_str(), _T("wb"))) == NULL)
-    {
+    wxFFile file(filename, _T("wb"));
+    if ( !file.IsOpened() )

         return FALSE;
         return FALSE;

-    }

 
 

-    while (!stream.eof())
+    char buf[4096];
+    do

     {
     {

-        ch = stream.get();
-        if (!stream.eof())
-            putc (ch, fd1);
+        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;
+        }

     }
     }

-    fclose (fd1);
+    while ( !stream.eof() );
+

     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;
-
-    if ((fd1 = wxFopen (filename, wxT("rb"))) == NULL)
+    wxFFile file(filename, _T("rb"));
+    if ( !file.IsOpened() )

         return FALSE;
 
         return FALSE;
 

-    while ((ch = getc (fd1)) != EOF)
-        stream.PutC((char) ch);
+    char buf[4096];
+
+    size_t nRead;
+    do
+    {
+        nRead = file.Read(buf, WXSIZEOF(buf));
+        if ( file.Error() )
+            return FALSE;
+
+        stream.Write(buf, nRead);
+        if ( !stream )
+            return FALSE;
+    }
+    while ( !file.Eof() );

 
 

-    fclose (fd1);

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

-    FILE *fd1;
-    char ch;
-
-    if ((fd1 = wxFopen (filename, wxT("wb"))) == NULL)
-    {
+    wxFFile file(filename, _T("wb"));
+    if ( !file.IsOpened() )

         return FALSE;
         return FALSE;

-    }

 
 

-    int len = stream.StreamSize();
-    // TODO: is this the correct test for EOF?
-    while (stream.TellI() < (len - 1))
+    char buf[4096];
+    do

     {
     {

-        ch = stream.GetC();
-        putc (ch, fd1);
+        stream.Read(buf, WXSIZEOF(buf));
+
+        const size_t nRead = stream.LastRead();
+        if ( !nRead || !file.Write(buf, nRead) )
+            return FALSE;

     }
     }

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

     return TRUE;
 }
     return TRUE;
 }

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

 
 #endif // wxUSE_DOC_VIEW_ARCHITECTURE
 
 
 #endif // wxUSE_DOC_VIEW_ARCHITECTURE