From c6e4d276a34ff0bf57c2da45f3cd84f296afacd2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 7 Aug 2008 12:17:52 +0000
Subject: [PATCH] don't call OnCloseDocument() from OnNewDocument(), this
 plainly doesn't make sense (#1508)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/changes.txt       |  2 ++
 interface/wx/docview.h | 11 +++++++++--
 src/common/docview.cpp |  2 --
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 3dca38bc52..44fe563ab1 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -102,6 +102,8 @@ Changes in behaviour not resulting in compilation errors, please read this!
 - Under MSW wxExecute() arguments are now always properly quoted, as under
   Unix, and so shouldn't contain quotes unless they are part of the argument.
 
+- wxDocument::OnNewDocument() doesn't call OnCloseDocument() any more.
+
 Changes in behaviour which may result in compilation errors
 -----------------------------------------------------------
 
diff --git a/interface/wx/docview.h b/interface/wx/docview.h
index 3a8bc4fddd..dcb80c1f28 100644
--- a/interface/wx/docview.h
+++ b/interface/wx/docview.h
@@ -1122,9 +1122,16 @@ public:
     virtual void OnChangedViewList();
 
     /**
+        This virtual function is called when the document is being closed.
+
         The default implementation calls DeleteContents() (an empty
-        implementation) and sets the modified flag to @false. Override this to
-        supply additional behaviour when the document is closed with Close().
+        implementation) and sets the modified flag to @false. You can override
+        it to supply additional behaviour when the document is closed with
+        Close().
+
+        Notice that previous wxWidgets versions used to call this function also
+        from OnNewDocument(), rather counter-intuitively. This is no longer the
+        case since wxWidgets 2.9.0.
     */
     virtual bool OnCloseDocument();
 
diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index b493ec91bd..5d53187c73 100644
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -246,8 +246,6 @@ bool wxDocument::OnNewDocument()
     if ( !OnSaveModified() )
         return false;
 
-    if ( !OnCloseDocument() )
-        return false;
     DeleteContents();
     Modify(false);
     SetDocumentSaved(false);
-- 
2.47.2