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

Make wxDocTemplate::CreateDocument() exceptions-safe.

Browse Source 
Don't create the document object if InitDocument() throws.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2012-05-07 12:23:09 +00:00
parent e4f762f416
commit 319ff5745e
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/docview.cpp
View File

@@ -859,17 +859,19 @@ wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags)
bool bool
wxDocTemplate::InitDocument(wxDocument* doc, const wxString& path, long flags) wxDocTemplate::InitDocument(wxDocument* doc, const wxString& path, long flags)
{ {
wxScopeGuard g = wxMakeObjGuard(*doc, &wxDocument::DeleteAllViews);
doc->SetFilename(path); doc->SetFilename(path);
doc->SetDocumentTemplate(this); doc->SetDocumentTemplate(this);
GetDocumentManager()->AddDocument(doc); GetDocumentManager()->AddDocument(doc);
doc->SetCommandProcessor(doc->OnCreateCommandProcessor()); doc->SetCommandProcessor(doc->OnCreateCommandProcessor());
if (doc->OnCreate(path, flags)) if ( !doc->OnCreate(path, flags) )
return true; return false;
if (GetDocumentManager()->GetDocuments().Member(doc)) g.Dismiss(); // no need to call DeleteAllViews() anymore
doc->DeleteAllViews();
return false; return true;
} }
wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags) wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags)