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

Implemented delayed closing of an existing document

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-05-01 15:40:39 +00:00
parent 1cf1238db4
commit b72b192036
2 changed files with 52 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/common/docview.cpp
View File

@@ -774,6 +774,24 @@ wxDocManager::~wxDocManager()
sm_docManager = (wxDocManager*) NULL;
}
// closes the specified document
bool wxDocManager::CloseDocument(wxDocument* doc, bool force)
{
if (doc->Close() || force)
{
// Implicitly deletes the document when
// the last view is deleted
doc->DeleteAllViews();
// Check we're really deleted
if (m_docs.Member(doc))
delete doc;
return TRUE;
}
return FALSE;
}
bool wxDocManager::CloseDocuments(bool force)
{
wxNode *node = m_docs.GetFirst();
@@ -781,18 +799,10 @@ bool wxDocManager::CloseDocuments(bool force)
{
wxDocument *doc = (wxDocument *)node->GetData();
wxNode *next = node->GetNext();
if (!doc->Close() && !force)
if (!CloseDocument(doc, force))
return FALSE;
// Implicitly deletes the document when the last
// view is removed (deleted)
doc->DeleteAllViews();
// Check document is deleted
if (m_docs.Member(doc))
delete doc;
// This assumes that documents are not connected in
// any way, i.e. deleting one document does NOT
// delete another.
@@ -1070,27 +1080,15 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
delete[] templates;
return (wxDocument *) NULL;
}
wxDocument* docToClose = NULL;
// If we've reached the max number of docs, close the
// first one.
if ( (int)GetDocuments().GetCount() >= m_maxDocsOpen )
{
wxDocument *doc = (wxDocument *)GetDocuments().GetFirst()->GetData();
if (doc->Close())
{
// Implicitly deletes the document when
// the last view is deleted
doc->DeleteAllViews();
// Check we're really deleted
if (m_docs.Member(doc))
delete doc;
}
else
{
delete[] templates;
return (wxDocument *) NULL;
}
docToClose = doc;
}
// New document: user chooses a template, unless there's only one.
@@ -1098,9 +1096,18 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
{
if (n == 1)
{
if (docToClose)
{
if (!CloseDocument(docToClose, FALSE))
{
return NULL;
}
}
wxDocTemplate *temp = templates[0];
delete[] templates;
wxDocument *newDoc = temp->CreateDocument(path, flags);
if (newDoc)
{
newDoc->SetDocumentName(temp->GetDocumentName());
@@ -1114,7 +1121,16 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
delete[] templates;
if (temp)
{
if (docToClose)
{
if (!CloseDocument(docToClose, FALSE))
{
return NULL;
}
}
wxDocument *newDoc = temp->CreateDocument(path, flags);
if (newDoc)
{
newDoc->SetDocumentName(temp->GetDocumentName());
@@ -1143,6 +1159,14 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
if (temp)
{
if (docToClose)
{
if (!CloseDocument(docToClose, FALSE))
{
return NULL;
}
}
wxDocument *newDoc = temp->CreateDocument(path2, flags);
if (newDoc)
{