X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93d0805b35757bbfd30ed4ae6756b9764c112c0d..6968a3b87cee46f5c5af9b46e1ef97f17133cef7:/include/wx/docview.h diff --git a/include/wx/docview.h b/include/wx/docview.h index f4ecc68950..ae45ba71cd 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -21,6 +21,7 @@ #include "wx/string.h" #include "wx/frame.h" #include "wx/filehistory.h" +#include "wx/vector.h" #if wxUSE_PRINTING_ARCHITECTURE #include "wx/print.h" @@ -60,11 +61,9 @@ enum #define wxMAX_FILE_HISTORY 9 -#ifndef __VISUALC6__ typedef wxVector wxDocVector; typedef wxVector wxViewVector; typedef wxVector wxDocTemplateVector; -#endif class WXDLLIMPEXP_CORE wxDocument : public wxEvtHandler { @@ -148,8 +147,12 @@ public: virtual bool RemoveView(wxView *view); #ifndef __VISUALC6__ - wxViewVector GetViewsVector() const { return m_documentViews.AsVector(); } -#endif + wxViewVector GetViewsVector() const + { + return m_documentViews.AsVector(); + } +#endif // !__VISUALC6__ + wxList& GetViews() { return m_documentViews; } const wxList& GetViews() const { return m_documentViews; } @@ -467,9 +470,17 @@ public: virtual wxView *GetCurrentView() const { return m_currentView; } #ifndef __VISUALC6__ - wxDocVector GetDocumentsVector() const { return m_docs.AsVector(); } - wxDocTemplateVector GetTemplatesVector() const { return m_templates.AsVector(); } -#endif + wxDocVector GetDocumentsVector() const + { + return m_docs.AsVector(); + } + + wxDocTemplateVector GetTemplatesVector() const + { + return m_templates.AsVector(); + } +#endif // !__VISUALC6__ + wxList& GetDocuments() { return m_docs; } wxList& GetTemplates() { return m_templates; }