Use wxWebKitCtrlNameStr to adhere to the convention used by other wx classes.

[wxWidgets.git] / include / wx / docmdi.h

diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h
index b389b44d74aeffd7ea1ab52c0d8e076cc4bfb301..3d4e437fbe9d75f19e18dc9e7e6c7bd542974653 100644 (file)
--- 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<wxMDIChildFrame, wxMDIParentFrame> 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