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

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-02-27 13:12:25 +00:00
parent a9e2e6e52b
commit 27d77a5990
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/docmdi.h
View File

@@ -59,6 +59,14 @@ private:
// otherwise we could simply typedef it // 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 typedef
wxDocChildFrameAny<wxMDIChildFrame, wxMDIParentFrame> wxDocMDIChildFrameBase; wxDocChildFrameAny<wxMDIChildFrame, wxMDIParentFrame> wxDocMDIChildFrameBase;
@@ -84,8 +92,9 @@ private:
wxDECLARE_NO_COPY_CLASS(wxDocMDIChildFrame); wxDECLARE_NO_COPY_CLASS(wxDocMDIChildFrame);
}; };
WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxDocMDIChildFrameBase ) #ifdef __VISUALC6__
#pragma warning (default:4275)
#endif
#endif // wxUSE_MDI_ARCHITECTURE #endif // wxUSE_MDI_ARCHITECTURE

12
include/wx/docview.h
View File

@@ -636,6 +636,14 @@ private:
// otherwise we could simply typedef it // 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; typedef wxDocChildFrameAny<wxFrame, wxFrame> wxDocChildFrameBase;
class WXDLLIMPEXP_CORE wxDocChildFrame : public wxDocChildFrameBase class WXDLLIMPEXP_CORE wxDocChildFrame : public wxDocChildFrameBase
@@ -660,7 +668,9 @@ private:
wxDECLARE_NO_COPY_CLASS(wxDocChildFrame); wxDECLARE_NO_COPY_CLASS(wxDocChildFrame);
}; };
WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxDocChildFrameBase ) #ifdef __VISUALC6__
#pragma warning (default:4275)
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// A default parent frame // A default parent frame