Fixes for GNUPro 00r1

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index f9a4f3e7709d39514f5b254e783dc3dade9a55ff..0015cce6e0e5ba05d3f214e94780e95c07c8814b 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -227,16 +227,13 @@ bool wxDocument::OnNewDocument()
 
 bool wxDocument::Save()
 {
 
 bool wxDocument::Save()
 {

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

 
 

-    if (!IsModified() && m_savedYet) 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()
 }
 
 bool wxDocument::SaveAs()


@@ -316,6 +313,7 @@ bool wxDocument::OnSaveDocument(const wxString& file)
     }
     Modify(FALSE);
     SetFilename(file);
     }
     Modify(FALSE);
     SetFilename(file);

+    SetDocumentSaved(TRUE);

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -700,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)
 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)


@@ -709,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_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)


@@ -749,7 +749,7 @@ wxDocManager::~wxDocManager()
     sm_docManager = (wxDocManager*) NULL;
 }
 
     sm_docManager = (wxDocManager*) NULL;
 }
 

-bool wxDocManager::Clear(bool force)
+bool wxDocManager::CloseDocuments(bool force)

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


@@ -773,7 +773,15 @@ bool wxDocManager::Clear(bool force)
         // delete another.
         node = next;
     }
         // 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();
     while (node)
     {
         wxDocTemplate *templ = (wxDocTemplate*) node->Data();


@@ -808,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);
 void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event))
 {
     CreateDocument(wxString(""), wxDOC_NEW);


@@ -1045,7 +1058,10 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
                 delete doc;
         }
         else
                 delete doc;
         }
         else

+        {
+            delete[] templates;

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

+        }

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


@@ -1741,7 +1757,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());
         }
     }