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

Compilation fix for wxDocManager after r73004.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2012-11-28 14:17:30 +00:00
parent cb04da13bd
commit 8f2a8df48f
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
include/wx/docview.h
View File

@@ -147,10 +147,7 @@ public:
virtual bool RemoveView(wxView *view); virtual bool RemoveView(wxView *view);
#ifndef __VISUALC6__ #ifndef __VISUALC6__
wxViewVector GetViewsVector() const wxViewVector GetViewsVector() const;
{
return m_documentViews.AsVector<wxView*>();
}
#endif // !__VISUALC6__ #endif // !__VISUALC6__
wxList& GetViews() { return m_documentViews; } wxList& GetViews() { return m_documentViews; }
@@ -470,15 +467,8 @@ public:
virtual wxView *GetCurrentView() const { return m_currentView; } virtual wxView *GetCurrentView() const { return m_currentView; }
#ifndef __VISUALC6__ #ifndef __VISUALC6__
wxDocVector GetDocumentsVector() const wxDocVector GetDocumentsVector() const;
{ wxDocTemplateVector GetTemplatesVector() const;
return m_docs.AsVector<wxDocument*>();
}
wxDocTemplateVector GetTemplatesVector() const
{
return m_templates.AsVector<wxDocTemplate*>();
}
#endif // !__VISUALC6__ #endif // !__VISUALC6__
wxList& GetDocuments() { return m_docs; } wxList& GetDocuments() { return m_docs; }
@@ -1021,6 +1011,23 @@ enum
}; };
#endif // WXWIN_COMPATIBILITY_2_8 #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 // wxUSE_DOC_VIEW_ARCHITECTURE
#endif // _WX_DOCH__ #endif // _WX_DOCH__