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

Add wxDocManager::Get{Views,Documents,Templates}Vector().

Browse Source 
Add accessors returning more convenient wxVectors to supplement the existing
ones giving access to internally used wxLists.

Closes #14814.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-11-24 17:37:12 +00:00
parent 102540a046
commit 93d0805b35
5 changed files with 67 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/docview.cpp
View File

@@ -76,8 +76,6 @@
#include "wx/wfstream.h"
#endif
typedef wxVector<wxDocTemplate *> wxDocTemplates;
// ----------------------------------------------------------------------------
// wxWidgets macros
// ----------------------------------------------------------------------------
@@ -1384,11 +1382,11 @@ namespace
{
// helper function: return only the visible templates
wxDocTemplates GetVisibleTemplates(const wxList& allTemplates)
wxDocTemplateVector GetVisibleTemplates(const wxList& allTemplates)
{
// select only the visible templates
const size_t totalNumTemplates = allTemplates.GetCount();
wxDocTemplates templates;
wxDocTemplateVector templates;
if ( totalNumTemplates )
{
templates.reserve(totalNumTemplates);
@@ -1425,7 +1423,7 @@ wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)
// this ought to be const but SelectDocumentType/Path() are not
// const-correct and can't be changed as, being virtual, this risks
// breaking user code overriding them
wxDocTemplates templates(GetVisibleTemplates(m_templates));
wxDocTemplateVector templates(GetVisibleTemplates(m_templates));
const size_t numTemplates = templates.size();
if ( !numTemplates )
{
@@ -1532,7 +1530,7 @@ wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)
wxView *wxDocManager::CreateView(wxDocument *doc, long flags)
{
wxDocTemplates templates(GetVisibleTemplates(m_templates));
wxDocTemplateVector templates(GetVisibleTemplates(m_templates));
const size_t numTemplates = templates.size();
if ( numTemplates == 0 )