VC6 compilation fix after last change: WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE is not needed for template classes used as base classes apparently; do suppress some DLL export-related warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
a9e2e6e52b
commit
27d77a5990
@ -59,6 +59,14 @@ 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 (disable:4275)
|
||||
#endif
|
||||
|
||||
typedef
|
||||
wxDocChildFrameAny<wxMDIChildFrame, wxMDIParentFrame> wxDocMDIChildFrameBase;
|
||||
|
||||
@ -84,8 +92,9 @@ private:
|
||||
wxDECLARE_NO_COPY_CLASS(wxDocMDIChildFrame);
|
||||
};
|
||||
|
||||
WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxDocMDIChildFrameBase )
|
||||
|
||||
#ifdef __VISUALC6__
|
||||
#pragma warning (default:4275)
|
||||
#endif
|
||||
|
||||
#endif // wxUSE_MDI_ARCHITECTURE
|
||||
|
||||
|
@ -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<wxFrame, wxFrame> 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
|
||||
|
Loading…
Reference in New Issue
Block a user