Changes related to stream includes

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

diff --git a/include/wx/stream.h b/include/wx/stream.h
index b467990588641fa6b0c43d9b558a80328a4b7299..13bd256293def7095c4f2027bfee2ab17183b9d7 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
 // ---------------------------------------------------------------------------
@@ -99,7 +106,7 @@ class WXDLLEXPORT wxInputStream {
   wxInputStream& operator>>(int& i);
   wxInputStream& operator>>(long& i);
   wxInputStream& operator>>(float& i);
-#if USE_SERIAL
+#if wxUSE_SERIAL
   wxInputStream& operator>>(wxObject *& obj);
 #endif
 
@@ -153,7 +160,7 @@ class WXDLLEXPORT wxOutputStream {
   wxOutputStream& operator<<(int i);
   wxOutputStream& operator<<(long i);
   wxOutputStream& operator<<(double f);
-#if USE_SERIAL
+#if wxUSE_SERIAL
   wxOutputStream& operator<<(wxObject& obj);
 #endif
 
@@ -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