From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 28 Nov 2012 14:17:30 +0000 (+0000)
Subject: Compilation fix for wxDocManager after r73004.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8f2a8df48f5553be94c52a125880147badb63739?ds=sidebyside

Compilation fix for wxDocManager after r73004.

Define GetXXXVector() methods after all the classes are fully declared to
ensure that static_cast<> inside wxList::AsVector() they use compiles with the
OpenVMS compiler.

See #14814.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/docview.h b/include/wx/docview.h
index ae45ba71cd..420355df5f 100644
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -147,10 +147,7 @@ public:
     virtual bool RemoveView(wxView *view);
 
 #ifndef __VISUALC6__
-    wxViewVector GetViewsVector() const
-    {
-        return m_documentViews.AsVector<wxView*>();
-    }
+    wxViewVector GetViewsVector() const;
 #endif // !__VISUALC6__
 
     wxList& GetViews() { return m_documentViews; }
@@ -470,15 +467,8 @@ public:
     virtual wxView *GetCurrentView() const { return m_currentView; }
 
 #ifndef __VISUALC6__
-    wxDocVector GetDocumentsVector() const
-    {
-        return m_docs.AsVector<wxDocument*>();
-    }
-
-    wxDocTemplateVector GetTemplatesVector() const
-    {
-        return m_templates.AsVector<wxDocTemplate*>();
-    }
+    wxDocVector GetDocumentsVector() const;
+    wxDocTemplateVector GetTemplatesVector() const;
 #endif // !__VISUALC6__
 
     wxList& GetDocuments() { return m_docs; }
@@ -1021,6 +1011,23 @@ enum
 };
 #endif // WXWIN_COMPATIBILITY_2_8
 
+#ifndef __VISUALC6__
+inline wxViewVector wxDocument::GetViewsVector() const
+{
+    return m_documentViews.AsVector<wxView*>();
+}
+
+inline wxDocVector wxDocManager::GetDocumentsVector() const
+{
+    return m_docs.AsVector<wxDocument*>();
+}
+
+inline wxDocTemplateVector wxDocManager::GetTemplatesVector() const
+{
+    return m_templates.AsVector<wxDocTemplate*>();
+}
+#endif // !__VISUALC6__
+
 #endif // wxUSE_DOC_VIEW_ARCHITECTURE
 
 #endif // _WX_DOCH__