X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9e2e6e52b9c2371413597a92ccc4f8352963c32..e5cfb314ae1cadac46cc50d37d9f6d15d8260a29:/include/wx/docview.h diff --git a/include/wx/docview.h b/include/wx/docview.h index 2a08d2c0ff..0ff527c403 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -520,7 +520,7 @@ inline size_t wxDocManager::GetNoHistoryFiles() const // wxDocChildFrameAny does // ---------------------------------------------------------------------------- -class wxDocChildFrameAnyBase +class WXDLLIMPEXP_CORE wxDocChildFrameAnyBase { public: wxDocChildFrameAnyBase(wxDocument *doc, wxView *view) @@ -636,6 +636,14 @@ private: // otherwise we could simply typedef it // ---------------------------------------------------------------------------- +#ifdef __VISUALC6__ + // "non dll-interface class 'wxDocChildFrameAny<>' used as base interface + // for dll-interface class 'wxDocChildFrame'" -- this is bogus as the + // template will be DLL-exported but only once it is used as base class + // here! + #pragma warning (disable:4275) +#endif + typedef wxDocChildFrameAny wxDocChildFrameBase; class WXDLLIMPEXP_CORE wxDocChildFrame : public wxDocChildFrameBase @@ -660,7 +668,9 @@ private: wxDECLARE_NO_COPY_CLASS(wxDocChildFrame); }; -WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxDocChildFrameBase ) +#ifdef __VISUALC6__ + #pragma warning (default:4275) +#endif // ---------------------------------------------------------------------------- // A default parent frame