Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't use wxScopedPtr<> in wxDocTemplate::CreateDocument() as the document is implicitly deleted by InitDocument() if its initialization fails; try to explain the (complex and inconsistent) rules for deleting the document in the manual

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-03-09 19:40:49 +00:00
parent 3a393f8a52
commit 4c7d530a26
2 changed files with 52 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/docview.cpp
View File

@@ -775,9 +775,16 @@ wxDocTemplate::~wxDocTemplate()
// Tries to dynamically construct an object of the right class.
wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags)
{
wxScopedPtr<wxDocument> doc(DoCreateDocument());
// InitDocument() is supposed to delete the document object if its
// initialization fails so don't use wxScopedPtr<> here: this is fragile
// but unavoidable because the default implementation uses CreateView()
// which may -- or not -- create a wxView and if it does create it and its
// initialization fails then the view destructor will delete the document
// (via RemoveView()) and as we can't distinguish between the two cases we
// just have to assume that it always deletes it in case of failure
wxDocument * const doc = DoCreateDocument();
return doc && InitDocument(doc.get(), path, flags) ? doc.release() : NULL;
return doc && InitDocument(doc, path, flags) ? doc : NULL;
}
bool