added wxDocument::AlreadySaved() and use it in OnUpdateFileSave() to ensure that...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/docview.h b/include/wx/docview.h
index cbac9175ea8a80d85968bf61c7017fcf42ebbd21..a0fe1c40f2c8bf308172c559c656587434090520 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -78,6 +78,11 @@ public:
     bool GetDocumentSaved() const { return m_savedYet; }
     void SetDocumentSaved(bool saved = true) { m_savedYet = saved; }
 
+    // return true if the document hasn't been modified since the last time it
+    // was saved (implying that it returns false if it was never saved, even if
+    // the document is not modified)
+    bool AlreadySaved() const { return !IsModified() && GetDocumentSaved(); }
+
     virtual bool Close();
     virtual bool Save();
     virtual bool SaveAs();

diff --git a/interface/wx/docview.h b/interface/wx/docview.h
index 55effdd85c9d6af4be0d96d29957dec77accc11a..33806cf5d05b3d6af7bbe5ce4a2f0b9d51db8c4e 100644 (file)
--- a/interface/wx/docview.h
+++ b/interface/wx/docview.h
@@ -1008,6 +1008,22 @@ public:
     */
     virtual bool AddView(wxView* view);
 
+    /**
+        Returns true if the document hasn't been modified since the last time
+        it had been saved.
+
+        Notice that this function returns @false if the document had been never
+        saved at all, so it may be also used to test whether it makes sense to
+        save the document: if it returns @true, there is nothing to save but if
+        @false is returned, it can be saved, even if it might be not modified
+        (this can be used to create an empty document file by the user).
+
+        @see IsModified(), GetDocumentSaved()
+
+        @since 2.9.0
+     */
+    bool AlreadySaved() const;
+
     /**
         Closes the document, by calling OnSaveModified() and then (if this
         returned @true) OnCloseDocument(). This does not normally delete the

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index db67b4612334fe1f7d491e095125b2a5a2d43579..dbc0e56630a52eafa239d146b0078c43cd9319e7 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -259,7 +259,7 @@ bool wxDocument::OnNewDocument()
 
 bool wxDocument::Save()
 {
-    if (!IsModified() && m_savedYet)
+    if ( AlreadySaved() )
         return true;
 
     if ( m_documentFile.empty() || !m_savedYet )
@@ -1094,8 +1094,8 @@ void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event)
 
 void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event)
 {
-    wxDocument *doc = GetCurrentDocument();
-    event.Enable( doc && doc->IsModified() );
+    wxDocument * const doc = GetCurrentDocument();
+    event.Enable( doc && !doc->AlreadySaved() );
 }
 
 void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event)