]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/docview.cpp
Fix Cygwin and MinGW compilation
[wxWidgets.git] / src / common / docview.cpp
index 7a97237c38b1cd817b0b34a02f83b5b876e71b47..0015cce6e0e5ba05d3f214e94780e95c07c8814b 100644 (file)
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        docview.cpp
+// Name:        src/common/docview.cpp
 // 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/cmdproc.h"
 
 #include <stdio.h>
 #include <string.h>
 // 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
@@ -228,16 +227,13 @@ bool wxDocument::OnNewDocument()
 
 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()
@@ -248,7 +244,7 @@ bool wxDocument::SaveAs()
 
     wxString tmp = wxFileSelector(_("Save as"),
             docTemplate->GetDirectory(),
-            GetFilename(),
+            wxFileNameFromPath(GetFilename()),
             docTemplate->GetDefaultExtension(),
             docTemplate->GetFileFilter(),
             wxSAVE | wxOVERWRITE_PROMPT,
@@ -296,7 +292,7 @@ bool wxDocument::OnSaveDocument(const wxString& file)
         msgTitle = wxString(_("File error"));
 
 #if wxUSE_STD_IOSTREAM
-    ofstream store(wxString(file.fn_str()).mb_str());
+    wxSTD ofstream store(wxString(file.fn_str()).mb_str());
     if (store.fail() || store.bad())
 #else
     wxFileOutputStream store(wxString(file.fn_str()));
@@ -317,6 +313,7 @@ bool wxDocument::OnSaveDocument(const wxString& file)
     }
     Modify(FALSE);
     SetFilename(file);
+    SetDocumentSaved(TRUE);
     return TRUE;
 }
 
@@ -332,7 +329,7 @@ bool wxDocument::OnOpenDocument(const wxString& file)
         msgTitle = wxString(_("File error"));
 
 #if wxUSE_STD_IOSTREAM
-    ifstream store(wxString(file.fn_str()).mb_str());
+    wxSTD ifstream store(wxString(file.fn_str()).mb_str());
     if (store.fail() || store.bad())
 #else
     wxFileInputStream store(wxString(file.fn_str()));
@@ -365,7 +362,7 @@ bool wxDocument::OnOpenDocument(const wxString& file)
 }
 
 #if wxUSE_STD_IOSTREAM
-istream& wxDocument::LoadObject(istream& stream)
+wxSTD istream& wxDocument::LoadObject(wxSTD istream& stream)
 #else
 wxInputStream& wxDocument::LoadObject(wxInputStream& stream)
 #endif
@@ -374,7 +371,7 @@ wxInputStream& wxDocument::LoadObject(wxInputStream& stream)
 }
 
 #if wxUSE_STD_IOSTREAM
-ostream& wxDocument::SaveObject(ostream& stream)
+wxSTD ostream& wxDocument::SaveObject(wxSTD ostream& stream)
 #else
 wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream)
 #endif
@@ -701,6 +698,7 @@ bool wxDocTemplate::FileMatchesTemplate(const wxString& path)
 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)
@@ -710,6 +708,7 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
 
     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)
@@ -750,7 +749,7 @@ wxDocManager::~wxDocManager()
     sm_docManager = (wxDocManager*) NULL;
 }
 
-bool wxDocManager::Clear(bool force)
+bool wxDocManager::CloseDocuments(bool force)
 {
     wxNode *node = m_docs.First();
     while (node)
@@ -774,7 +773,15 @@ bool wxDocManager::Clear(bool force)
         // delete another.
         node = next;
     }
-    node = m_templates.First();
+    return TRUE;
+}
+
+bool wxDocManager::Clear(bool force)
+{
+    if (!CloseDocuments(force))
+        return FALSE;
+
+    wxNode *node = m_templates.First();
     while (node)
     {
         wxDocTemplate *templ = (wxDocTemplate*) node->Data();
@@ -809,6 +816,11 @@ void wxDocManager::OnFileClose(wxCommandEvent& WXUNUSED(event))
     }
 }
 
+void wxDocManager::OnFileCloseAll(wxCommandEvent& WXUNUSED(event))
+{
+    CloseDocuments(FALSE);
+}
+
 void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event))
 {
     CreateDocument(wxString(""), wxDOC_NEW);
@@ -1046,7 +1058,10 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
                 delete doc;
         }
         else
+        {
+            delete[] templates;
             return (wxDocument *) NULL;
+        }
     }
 
     // New document: user chooses a template, unless there's only one.
@@ -1742,7 +1757,7 @@ void wxDocParentFrame::OnMRUFile(wxCommandEvent& event)
             // 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());
         }
     }
@@ -1837,224 +1852,6 @@ void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, in
 
 #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;
-    m_undoAccelerator = wxT("\tCtrl+Z");
-    m_redoAccelerator = wxT("\tCtrl+Y");
-}
-
-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
 // ----------------------------------------------------------------------------
@@ -2314,7 +2111,7 @@ void wxFileHistory::AddFilesToMenu(wxMenu* menu)
 // ----------------------------------------------------------------------------
 
 #if wxUSE_STD_IOSTREAM
-bool wxTransferFileToStream(const wxString& filename, ostream& stream)
+bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream)
 {
     FILE *fd1;
     int ch;
@@ -2329,7 +2126,7 @@ bool wxTransferFileToStream(const wxString& filename, ostream& stream)
     return TRUE;
 }
 
-bool wxTransferStreamToFile(istream& stream, const wxString& filename)
+bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename)
 {
     FILE *fd1;
     int ch;