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
This commit is contained in:
@@ -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
|
||||
-----------------------------------------------------------
|
||||
|
||||
|
@@ -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();
|
||||
|
||||
|
@@ -246,8 +246,6 @@ bool wxDocument::OnNewDocument()
|
||||
if ( !OnSaveModified() )
|
||||
return false;
|
||||
|
||||
if ( !OnCloseDocument() )
|
||||
return false;
|
||||
DeleteContents();
|
||||
Modify(false);
|
||||
SetDocumentSaved(false);
|
||||
|
Reference in New Issue
Block a user