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

Blind compilation fix for VC6 after r73004.

Browse Source 
Define wxDocTemplateVector for VC6 too, it's used in docview.cpp.

Also wrap too long lines.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-11-24 23:01:45 +00:00
parent da63066b65
commit 288de46cb2
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/wx/docview.h
View File

@@ -21,6 +21,7 @@
#include "wx/string.h" #include "wx/string.h"
#include "wx/frame.h" #include "wx/frame.h"
#include "wx/filehistory.h" #include "wx/filehistory.h"
#include "wx/vector.h"
#if wxUSE_PRINTING_ARCHITECTURE #if wxUSE_PRINTING_ARCHITECTURE
#include "wx/print.h" #include "wx/print.h"
@@ -60,11 +61,9 @@ enum
#define wxMAX_FILE_HISTORY 9 #define wxMAX_FILE_HISTORY 9
#ifndef __VISUALC6__
typedef wxVector<wxDocument*> wxDocVector; typedef wxVector<wxDocument*> wxDocVector;
typedef wxVector<wxView*> wxViewVector; typedef wxVector<wxView*> wxViewVector;
typedef wxVector<wxDocTemplate*> wxDocTemplateVector; typedef wxVector<wxDocTemplate*> wxDocTemplateVector;
#endif
class WXDLLIMPEXP_CORE wxDocument : public wxEvtHandler class WXDLLIMPEXP_CORE wxDocument : public wxEvtHandler
{ {
@@ -148,8 +147,12 @@ public:
virtual bool RemoveView(wxView *view); virtual bool RemoveView(wxView *view);
#ifndef __VISUALC6__ #ifndef __VISUALC6__
wxViewVector GetViewsVector() const { return m_documentViews.AsVector<wxView*>(); } wxViewVector GetViewsVector() const
#endif {
return m_documentViews.AsVector<wxView*>();
}
#endif // !__VISUALC6__
wxList& GetViews() { return m_documentViews; } wxList& GetViews() { return m_documentViews; }
const wxList& GetViews() const { return m_documentViews; } const wxList& GetViews() const { return m_documentViews; }
@@ -467,9 +470,17 @@ public:
virtual wxView *GetCurrentView() const { return m_currentView; } virtual wxView *GetCurrentView() const { return m_currentView; }
#ifndef __VISUALC6__ #ifndef __VISUALC6__
wxDocVector GetDocumentsVector() const { return m_docs.AsVector<wxDocument*>(); } wxDocVector GetDocumentsVector() const
wxDocTemplateVector GetTemplatesVector() const { return m_templates.AsVector<wxDocTemplate*>(); } {
#endif return m_docs.AsVector<wxDocument*>();
}
wxDocTemplateVector GetTemplatesVector() const
{
return m_templates.AsVector<wxDocTemplate*>();
}
#endif // !__VISUALC6__
wxList& GetDocuments() { return m_docs; } wxList& GetDocuments() { return m_docs; }
wxList& GetTemplates() { return m_templates; } wxList& GetTemplates() { return m_templates; }