X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9e2e6e52b9c2371413597a92ccc4f8352963c32..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/docmdi.h diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h index b389b44d74..3d4e437fbe 100644 --- a/include/wx/docmdi.h +++ b/include/wx/docmdi.h @@ -59,6 +59,15 @@ private: // otherwise we could simply typedef it // ---------------------------------------------------------------------------- +#ifdef __VISUALC6__ + // "non dll-interface class 'wxDocChildFrameAny<>' used as base interface + // for dll-interface class 'wxDocMDIChildFrame'" -- this is bogus as the + // template will be DLL-exported but only once it is used as base class + // here! + #pragma warning (push) + #pragma warning (disable:4275) +#endif + typedef wxDocChildFrameAny wxDocMDIChildFrameBase; @@ -84,8 +93,9 @@ private: wxDECLARE_NO_COPY_CLASS(wxDocMDIChildFrame); }; -WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxDocMDIChildFrameBase ) - +#ifdef __VISUALC6__ + #pragma warning (pop) +#endif #endif // wxUSE_MDI_ARCHITECTURE