Fixed delete operator for VC++ 6.

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

diff --git a/include/wx/stream.h b/include/wx/stream.h
index b467990588641fa6b0c43d9b558a80328a4b7299..b6862e4f7f6119779dce8cb46acd4dbebec605bd 100644 (file)
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -29,6 +29,13 @@ typedef wxOutputStream& (*__wxOutputManip)(wxOutputStream&);
 
 wxOutputStream& WXDLLEXPORT wxEndL(wxOutputStream& o_stream);
 
+// Disable warnings such as
+// 'wxFilterStream' : inherits 'wxFilterInputStream::Peek' via dominance
+
+#ifdef _MSC_VER
+#pragma warning(disable:4250)
+#endif
+
 // ---------------------------------------------------------------------------
 // Stream buffer
 // ---------------------------------------------------------------------------
@@ -183,7 +190,7 @@ class WXDLLEXPORT wxOutputStream {
   wxStreamBuffer *m_o_streambuf;
 };
 
-class wxStream: public virtual wxInputStream,
+class WXDLLEXPORT wxStream: public virtual wxInputStream,
                public virtual wxOutputStream
 {
  public:
@@ -244,4 +251,8 @@ class WXDLLEXPORT wxFilterStream: public wxStream,
   wxFilterStream();
 };
 
+#ifdef _MSC_VER
+#pragma warning(default:4250)
+#endif
+
 #endif