From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 27 Feb 2009 13:12:25 +0000 (+0000)
Subject: VC6 compilation fix after last change: WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE is not... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/27d77a5990d815f5cd7a31ee4c7cb680eec64d54

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
---

diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h
index b389b44d74..513f2d6ea9 100644
--- a/include/wx/docmdi.h
+++ b/include/wx/docmdi.h
@@ -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
 
diff --git a/include/wx/docview.h b/include/wx/docview.h
index 2a08d2c0ff..e008bfe036 100644
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -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