wxBase compilation fix

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 8f693926e5429ec3a85d7cd34a1b01a5f0a5a817..36ecc6a51a70aa25978e168e7b528fe94ee2f564 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     Document/view classes
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Document/view classes
 // Author:      Julian Smart
 // Modified by:


@@ -57,6 +57,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>


@@ -76,20 +77,18 @@
 // wxWindows macros
 // ----------------------------------------------------------------------------
 
 // wxWindows 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
 
 // ----------------------------------------------------------------------------
 // function prototypes


@@ -130,6 +129,7 @@ wxDocument::wxDocument(wxDocument *parent)
     m_documentModified = FALSE;
     m_documentParent = parent;
     m_documentTemplate = (wxDocTemplate *) NULL;
     m_documentModified = FALSE;
     m_documentParent = parent;
     m_documentTemplate = (wxDocTemplate *) NULL;

+    m_commandProcessor = (wxCommandProcessor*) NULL;

     m_savedYet = FALSE;
 }
 
     m_savedYet = FALSE;
 }
 


@@ -145,7 +145,8 @@ wxDocument::~wxDocument()
     if (m_commandProcessor)
         delete m_commandProcessor;
 
     if (m_commandProcessor)
         delete m_commandProcessor;
 

-    GetDocumentManager()->RemoveDocument(this);
+    if (GetDocumentManager())
+        GetDocumentManager()->RemoveDocument(this);

 
     // Not safe to do here, since it'll invoke virtual view functions
     // expecting to see valid derived objects: and by the time we get here,
 
     // Not safe to do here, since it'll invoke virtual view functions
     // expecting to see valid derived objects: and by the time we get here,


@@ -172,6 +173,8 @@ bool wxDocument::OnCloseDocument()
 // deleted.
 bool wxDocument::DeleteAllViews()
 {
 // deleted.
 bool wxDocument::DeleteAllViews()
 {

+    wxDocManager* manager = GetDocumentManager();
+

     wxNode *node = m_documentViews.First();
     while (node)
     {
     wxNode *node = m_documentViews.First();
     while (node)
     {


@@ -184,6 +187,11 @@ bool wxDocument::DeleteAllViews()
         delete view; // Deletes node implicitly
         node = next;
     }
         delete view; // Deletes node implicitly
         node = next;
     }

+    // 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;
 }
 


@@ -196,7 +204,7 @@ wxView *wxDocument::GetFirstView() const
 
 wxDocManager *wxDocument::GetDocumentManager() const
 {
 
 wxDocManager *wxDocument::GetDocumentManager() const
 {

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

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


@@ -221,7 +229,7 @@ bool wxDocument::Save()
 {
     bool ret = FALSE;
 
 {
     bool ret = FALSE;
 

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

     if (m_documentFile == wxT("") || !m_savedYet)
         ret = SaveAs();
     else
     if (m_documentFile == wxT("") || !m_savedYet)
         ret = SaveAs();
     else


@@ -239,7 +247,7 @@ bool wxDocument::SaveAs()
 
     wxString tmp = wxFileSelector(_("Save as"),
             docTemplate->GetDirectory(),
 
     wxString tmp = wxFileSelector(_("Save as"),
             docTemplate->GetDirectory(),

-            GetFilename(),
+            wxFileNameFromPath(GetFilename()),

             docTemplate->GetDefaultExtension(),
             docTemplate->GetFileFilter(),
             wxSAVE | wxOVERWRITE_PROMPT,
             docTemplate->GetDefaultExtension(),
             docTemplate->GetFileFilter(),
             wxSAVE | wxOVERWRITE_PROMPT,


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

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

     if (store.fail() || store.bad())
 #else
     wxFileOutputStream store(wxString(file.fn_str()));
     if (store.fail() || store.bad())
 #else
     wxFileOutputStream store(wxString(file.fn_str()));


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

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

     if (store.fail() || store.bad())
 #else
     wxFileInputStream store(wxString(file.fn_str()));
     if (store.fail() || store.bad())
 #else
     wxFileInputStream store(wxString(file.fn_str()));


@@ -356,7 +364,7 @@ bool wxDocument::OnOpenDocument(const wxString& file)
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

-istream& wxDocument::LoadObject(istream& stream)
+wxSTD istream& wxDocument::LoadObject(wxSTD istream& stream)

 #else
 wxInputStream& wxDocument::LoadObject(wxInputStream& stream)
 #endif
 #else
 wxInputStream& wxDocument::LoadObject(wxInputStream& stream)
 #endif


@@ -365,7 +373,7 @@ wxInputStream& wxDocument::LoadObject(wxInputStream& stream)
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

-ostream& wxDocument::SaveObject(ostream& stream)
+wxSTD ostream& wxDocument::SaveObject(wxSTD ostream& stream)

 #else
 wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream)
 #endif
 #else
 wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream)
 #endif


@@ -655,7 +663,8 @@ wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags)
         return doc;
     else
     {
         return doc;
     else
     {

-        delete doc;
+        if (GetDocumentManager()->GetDocuments().Member(doc))
+            doc->DeleteAllViews();

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


@@ -806,7 +815,10 @@ void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event))
 
 void wxDocManager::OnFileOpen(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxDocManager::OnFileOpen(wxCommandEvent& WXUNUSED(event))
 {

-    CreateDocument(wxString(""), 0);
+    if ( !CreateDocument(wxString(""), 0) )
+    {
+        OnOpenFileFailure();
+    }

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


@@ -1093,15 +1105,16 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
             newDoc->SetDocumentTemplate(temp);
             if (!newDoc->OnOpenDocument(path2))
             {
             newDoc->SetDocumentTemplate(temp);
             if (!newDoc->OnOpenDocument(path2))
             {

-                delete newDoc;
+                newDoc->DeleteAllViews();
+                // delete newDoc; // Implicitly deleted by DeleteAllViews

                 return (wxDocument *) NULL;
             }
             AddFileToHistory(path2);
         }
         return newDoc;
     }
                 return (wxDocument *) NULL;
             }
             AddFileToHistory(path2);
         }
         return newDoc;
     }

-    else
-        return (wxDocument *) NULL;
+
+    return (wxDocument *) NULL;

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


@@ -1291,6 +1304,28 @@ wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path)
     return theTemplate;
 }
 
     return theTemplate;
 }
 

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

 // Prompts user to open a file, using file specs in templates.
 // How to implement in wxWindows? Must extend the file selector
 // dialog or implement own; OR match the extension to the
 // 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


@@ -1328,36 +1363,53 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
     wxString descrBuf = wxT("*.*");
 #endif
 
     wxString descrBuf = wxT("*.*");
 #endif
 

-    int FilterIndex = 0;
+    int FilterIndex = -1;
+
+    wxWindow* parent = wxFindSuitableParent();
+

     wxString pathTmp = wxFileSelectorEx(_("Select a file"),
                                         m_lastDirectory,
                                         wxT(""),
                                         &FilterIndex,
                                         descrBuf,
                                         0,
     wxString pathTmp = wxFileSelectorEx(_("Select a file"),
                                         m_lastDirectory,
                                         wxT(""),
                                         &FilterIndex,
                                         descrBuf,
                                         0,

-                                        wxTheApp->GetTopWindow());
+                                        parent);

 
 

+    wxDocTemplate *theTemplate = (wxDocTemplate *)NULL;

     if (!pathTmp.IsEmpty())
     {
     if (!pathTmp.IsEmpty())
     {

+        if (!wxFileExists(pathTmp))
+        {
+            wxString msgTitle;
+            if (!wxTheApp->GetAppName().IsEmpty())
+                msgTitle = wxTheApp->GetAppName();
+            else
+                msgTitle = wxString(_("File error"));
+
+            (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
+                parent);
+
+            path = wxT("");
+            return (wxDocTemplate *) NULL;
+        }

         m_lastDirectory = wxPathOnly(pathTmp);
 
         path = pathTmp;
 
         m_lastDirectory = wxPathOnly(pathTmp);
 
         path = pathTmp;
 

-        // This is dodgy in that we're selecting the template on the
-        // basis of the file extension, which may not be a standard
-        // one. We really want to know exactly which template was
-        // chosen by using a more advanced file selector.
-        wxDocTemplate *theTemplate = FindTemplateForPath(path);
-        if ( !theTemplate )
+        // first choose the template using the extension, if this fails (i.e.
+        // wxFileSelectorEx() didn't fill it), then use the path
+        if ( FilterIndex != -1 )

             theTemplate = templates[FilterIndex];
             theTemplate = templates[FilterIndex];

-
-        return theTemplate;
+        if ( !theTemplate )
+            theTemplate = FindTemplateForPath(path);

     }
     else
     {
         path = wxT("");
     }
     else
     {
         path = wxT("");

-        return (wxDocTemplate *) NULL;

     }
     }

+
+    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
 #if 0
     // In all other windowing systems, until we have more advanced
     // file selectors, we must select the document type (template) first, and


@@ -1382,61 +1434,134 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
 }
 
 wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
 }
 
 wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,

-                                                int noTemplates)
+                                                int noTemplates, bool sort)

 {
 {

-    wxChar **strings = new wxChar *[noTemplates];
-    wxChar **data = new wxChar *[noTemplates];
+    wxArrayString strings(sort);
+    wxDocTemplate **data = new wxDocTemplate *[noTemplates];

     int i;
     int n = 0;
     int i;
     int n = 0;

-    for (i = 0; i < noTemplates; i++)
-    {
-        if (templates[i]->IsVisible())
-        {
-            strings[n] = (wxChar *)templates[i]->m_description.c_str();
-            data[n] = (wxChar *)templates[i];
-            n ++;
-        }
-    }
-    if (n == 0)
-    {
-        delete[] strings;
-        delete[] data;
-        return (wxDocTemplate *) NULL;
-    }
-    else if (n == 1)
-    {
-        wxDocTemplate *temp = (wxDocTemplate *)data[0];
-        delete[] strings;
-        delete[] data;
-        return temp;
+       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];
+                       }
+               }
+       }
+
+    wxDocTemplate *theTemplate;
+
+    switch ( n )
+    {
+        case 0:
+            // no visible templates, hence nothing to choose from
+            theTemplate = NULL;
+            break;
+
+        case 1:
+            // don't propose the user to choose if he heas no choice
+            theTemplate = data[0];
+            break;
+
+        default:
+            // propose the user to choose one of several
+            theTemplate = (wxDocTemplate *)wxGetSingleChoiceData
+                          (
+                            _("Select a document template"),
+                            _("Templates"),
+                            strings,
+                            (void **)data,
+                            wxFindSuitableParent()
+                          );

     }
 
     }
 

-    wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document template"), _("Templates"), n,
-            strings, (void **)data);
-    delete[] strings;

     delete[] data;
     delete[] data;

+

     return theTemplate;
 }
 
 wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
     return theTemplate;
 }
 
 wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,

-        int noTemplates)
+                                            int noTemplates, bool sort)

 {
 {

-    wxChar **strings = new wxChar *[noTemplates];
-    wxChar **data = new wxChar *[noTemplates];
+    wxArrayString strings(sort);
+    wxDocTemplate **data = new wxDocTemplate *[noTemplates];

     int i;
     int n = 0;
     for (i = 0; i < noTemplates; i++)
     {
     int i;
     int n = 0;
     for (i = 0; i < noTemplates; i++)
     {

-        if (templates[i]->IsVisible() && (templates[i]->GetViewName() != wxT("")))
+        wxDocTemplate *templ = templates[i];
+        if ( templ->IsVisible() && !templ->GetViewName().empty() )

         {
         {

-            strings[n] = (wxChar *)templates[i]->m_viewTypeName.c_str();
-            data[n] = (wxChar *)templates[i];
-            n ++;
+            strings.Add(templ->m_viewTypeName);
+                       if (!sort)
+                       {
+                               data[n] = templ;
+                               n ++;
+                       }

         }
     }
         }
     }

-    wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document view"), _("Views"), n,
-            strings, (void **)data);
-    delete[] strings;
+
+       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];
+                       }
+               }
+       }
+
+    wxDocTemplate *theTemplate;
+
+    // the same logic as above
+    switch ( n )
+    {
+        case 0:
+            theTemplate = (wxDocTemplate *)NULL;
+            break;
+
+        case 1:
+            theTemplate = data[0];
+            break;
+
+        default:
+            theTemplate = (wxDocTemplate *)wxGetSingleChoiceData
+                          (
+                            _("Select a document view"),
+                            _("Views"),
+                            strings,
+                            (void **)data,
+                            wxFindSuitableParent()
+                          );
+
+    }
+

     delete[] data;
     return theTemplate;
 }
     delete[] data;
     return theTemplate;
 }


@@ -1600,7 +1725,7 @@ void wxDocParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 
 void wxDocParentFrame::OnMRUFile(wxCommandEvent& event)
 {
 
 void wxDocParentFrame::OnMRUFile(wxCommandEvent& event)
 {

-    int n = event.GetSelection() - wxID_FILE1;  // the index in MRU list
+    int n = event.GetId() - wxID_FILE1;  // the index in MRU list

     wxString filename(m_docManager->GetHistoryFile(n));
     if ( !filename.IsEmpty() )
     {
     wxString filename(m_docManager->GetHistoryFile(n));
     if ( !filename.IsEmpty() )
     {


@@ -1616,8 +1741,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.\n"
-                         "It 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());
         }
     }


@@ -1712,222 +1836,6 @@ void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, in
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
 

-// ----------------------------------------------------------------------------
-// Command processing framework
-// ----------------------------------------------------------------------------
-
-wxCommand::wxCommand(bool canUndoIt, const wxString& name)
-{
-    m_canUndo = canUndoIt;
-    m_commandName = name;
-}
-
-wxCommand::~wxCommand()
-{
-}
-
-// Command processor
-wxCommandProcessor::wxCommandProcessor(int maxCommands)
-{
-    m_maxNoCommands = maxCommands;
-    m_currentCommand = (wxNode *) NULL;
-    m_commandEditMenu = (wxMenu *) NULL;
-}
-
-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;
-            else
-                buf = wxString(_("Can't &Undo ")) + commandName;
-
-            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_commandEditMenu->SetLabel(wxID_REDO, buf);
-                m_commandEditMenu->Enable(wxID_REDO, TRUE);
-            }
-            else
-            {
-                m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo"));
-                m_commandEditMenu->Enable(wxID_REDO, FALSE);
-            }
-        }
-        else
-        {
-            m_commandEditMenu->SetLabel(wxID_UNDO, _("&Undo"));
-            m_commandEditMenu->Enable(wxID_UNDO, FALSE);
-
-            if (m_commands.Number() == 0)
-            {
-                m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo"));
-                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_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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // File history processor
 // ----------------------------------------------------------------------------


@@ -1951,22 +1859,29 @@ wxFileHistory::~wxFileHistory()
 void wxFileHistory::AddFileToHistory(const wxString& file)
 {
     int i;
 void wxFileHistory::AddFileToHistory(const wxString& file)
 {
     int 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] && wxString(m_fileHistory[i]) == file)
+        if ( m_fileHistory[i] && (file == m_fileHistory[i]) )
+        {
+            // we do have it, move it to the top of the history
+            RemoveFileFromHistory (i);
+            AddFileToHistory (file);

             return;
             return;

+        }

     }
 
     }
 

-    // Add to the project file history:
-    // Move existing files (if any) down so we can insert file at beginning.
-
-    // First delete filename that has popped off the end of the array (if any)
-    if (m_fileHistoryN == m_fileMaxFiles)
+    // if we already have a full history, delete the one at the end
+    if ( m_fileMaxFiles == m_fileHistoryN )

     {
     {

-        delete[] m_fileHistory[m_fileMaxFiles-1];
-        m_fileHistory[m_fileMaxFiles-1] = (wxChar *) NULL;
+        RemoveFileFromHistory (m_fileHistoryN - 1);
+        AddFileToHistory (file);
+        return;

     }
     }

+
+    // Add to the project file history:
+    // Move existing files (if any) down so we can insert file at beginning.

     if (m_fileHistoryN < m_fileMaxFiles)
     {
         wxNode* node = m_fileMenus.First();
     if (m_fileHistoryN < m_fileMaxFiles)
     {
         wxNode* node = m_fileMenus.First();


@@ -1987,19 +1902,40 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
     }
     m_fileHistory[0] = copystring(file);
 
     }
     m_fileHistory[0] = copystring(file);
 

+    // this is the directory of the last opened file
+    wxString pathCurrent;
+    wxSplitPath( m_fileHistory[0], &pathCurrent, NULL, NULL );

     for (i = 0; i < m_fileHistoryN; i++)
     for (i = 0; i < m_fileHistoryN; i++)

-        if (m_fileHistory[i])
+    {
+        if ( m_fileHistory[i] )

         {
         {

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

             wxString buf;
             wxString buf;

-            buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]);
+            buf.Printf(s_MRUEntryFormat, i + 1, pathInMenu.c_str());

             wxNode* node = m_fileMenus.First();
             while (node)
             {
                 wxMenu* menu = (wxMenu*) node->Data();
             wxNode* node = m_fileMenus.First();
             while (node)
             {
                 wxMenu* menu = (wxMenu*) node->Data();

-                menu->SetLabel(wxID_FILE1+i, buf);
+                menu->SetLabel(wxID_FILE1 + i, buf);

                 node = node->Next();
             }
         }
                 node = node->Next();
             }
         }

+    }

 }
 
 void wxFileHistory::RemoveFileFromHistory(int i)
 }
 
 void wxFileHistory::RemoveFileFromHistory(int i)


@@ -2007,11 +1943,6 @@ void wxFileHistory::RemoveFileFromHistory(int i)
     wxCHECK_RET( i < m_fileHistoryN,
                  wxT("invalid index in wxFileHistory::RemoveFileFromHistory") );
 
     wxCHECK_RET( i < m_fileHistoryN,
                  wxT("invalid index in wxFileHistory::RemoveFileFromHistory") );
 

-    wxNode* node = m_fileMenus.First();
-    while ( node )
-    {
-        wxMenu* menu = (wxMenu*) node->Data();
-

         // 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];
 


@@ -2021,6 +1952,12 @@ void wxFileHistory::RemoveFileFromHistory(int i)
             m_fileHistory[j] = m_fileHistory[j + 1];
         }
 
             m_fileHistory[j] = m_fileHistory[j + 1];
         }
 

+    wxNode* node = m_fileMenus.First();
+    while ( node )
+    {
+        wxMenu* menu = (wxMenu*) node->Data();
+
+

         // shuffle filenames up
         wxString buf;
         for ( j = i; j < m_fileHistoryN - 1; j++ )
         // shuffle filenames up
         wxString buf;
         for ( j = i; j < m_fileHistoryN - 1; j++ )


@@ -2032,6 +1969,7 @@ void wxFileHistory::RemoveFileFromHistory(int i)
         node = node->Next();
 
         // delete the last menu item which is unused now
         node = node->Next();
 
         // delete the last menu item which is unused now

+        if (menu->FindItem(wxID_FILE1 + m_fileHistoryN - 1))

         menu->Delete(wxID_FILE1 + m_fileHistoryN - 1);
 
         // delete the last separator too if no more files are left
         menu->Delete(wxID_FILE1 + m_fileHistoryN - 1);
 
         // delete the last separator too if no more files are left


@@ -2157,12 +2095,12 @@ void wxFileHistory::AddFilesToMenu(wxMenu* menu)
 // ----------------------------------------------------------------------------
 
 #if wxUSE_STD_IOSTREAM
 // ----------------------------------------------------------------------------
 
 #if wxUSE_STD_IOSTREAM

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

 {
     FILE *fd1;
     int ch;
 
 {
     FILE *fd1;
     int ch;
 

-    if ((fd1 = fopen (filename.fn_str(), "rb")) == NULL)
+    if ((fd1 = wxFopen (filename.fn_str(), _T("rb"))) == NULL)

         return FALSE;
 
     while ((ch = getc (fd1)) != EOF)
         return FALSE;
 
     while ((ch = getc (fd1)) != EOF)


@@ -2172,12 +2110,12 @@ bool wxTransferFileToStream(const wxString& filename, ostream& stream)
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxTransferStreamToFile(istream& stream, const wxString& filename)
+bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename)

 {
     FILE *fd1;
     int ch;
 
 {
     FILE *fd1;
     int ch;
 

-    if ((fd1 = fopen (filename.fn_str(), "wb")) == NULL)
+    if ((fd1 = wxFopen (filename.fn_str(), _T("wb"))) == NULL)

     {
         return FALSE;
     }
     {
         return FALSE;
     }


@@ -2191,6 +2129,42 @@ bool wxTransferStreamToFile(istream& stream, const wxString& filename)
     fclose (fd1);
     return TRUE;
 }
     fclose (fd1);
     return TRUE;
 }

+#else
+bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream)
+{
+    FILE *fd1;
+    int ch;
+
+    if ((fd1 = wxFopen (filename, wxT("rb"))) == NULL)
+        return FALSE;
+
+    while ((ch = getc (fd1)) != EOF)
+        stream.PutC((char) ch);
+
+    fclose (fd1);
+    return TRUE;
+}
+
+bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename)
+{
+    FILE *fd1;
+    char ch;
+
+    if ((fd1 = wxFopen (filename, wxT("wb"))) == NULL)
+    {
+        return FALSE;
+    }
+
+    int len = stream.StreamSize();
+    // TODO: is this the correct test for EOF?
+    while (stream.TellI() < (len - 1))
+    {
+        ch = stream.GetC();
+        putc (ch, fd1);
+    }
+    fclose (fd1);
+    return TRUE;
+}

 #endif
 
 #endif // wxUSE_DOC_VIEW_ARCHITECTURE
 #endif
 
 #endif // wxUSE_DOC_VIEW_ARCHITECTURE