Check for _MSC_VER definedness in libtiff code.

[wxWidgets.git] / src / common / docview.cpp

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index f44c05e7af58eca43a0cdd42360307e2a516116d..849a3a275441c4118bb938be714aa01ffd2172fb 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -60,6 +60,7 @@
 #include "wx/vector.h"
 #include "wx/scopedarray.h"
 #include "wx/scopedptr.h"
 #include "wx/vector.h"
 #include "wx/scopedarray.h"
 #include "wx/scopedptr.h"

+#include "wx/scopeguard.h"

 #include "wx/except.h"
 
 #if wxUSE_STD_IOSTREAM
 #include "wx/except.h"
 
 #if wxUSE_STD_IOSTREAM


@@ -75,8 +76,6 @@
     #include "wx/wfstream.h"
 #endif
 
     #include "wx/wfstream.h"
 #endif
 

-typedef wxVector<wxDocTemplate *> wxDocTemplates;
-

 // ----------------------------------------------------------------------------
 // wxWidgets macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWidgets macros
 // ----------------------------------------------------------------------------


@@ -1383,11 +1382,11 @@ namespace
 {
 
 // helper function: return only the visible templates
 {
 
 // 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();
 {
     // select only the visible templates
     const size_t totalNumTemplates = allTemplates.GetCount();

-    wxDocTemplates templates;
+    wxDocTemplateVector templates;

     if ( totalNumTemplates )
     {
         templates.reserve(totalNumTemplates);
     if ( totalNumTemplates )
     {
         templates.reserve(totalNumTemplates);


@@ -1424,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
     // 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 )
     {
     const size_t numTemplates = templates.size();
     if ( !numTemplates )
     {


@@ -1531,7 +1530,7 @@ wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)
 
 wxView *wxDocManager::CreateView(wxDocument *doc, 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 )
     const size_t numTemplates = templates.size();
 
     if ( numTemplates == 0 )