Changes related to stream includes

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

diff --git a/include/wx/stream.h b/include/wx/stream.h
index e23ef48a58f014e58332d0ce8049103c7063dbd2..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);
 
 
 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
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // Stream buffer
 // ---------------------------------------------------------------------------


@@ -99,7 +106,7 @@ class WXDLLEXPORT wxInputStream {
   wxInputStream& operator>>(int& i);
   wxInputStream& operator>>(long& i);
   wxInputStream& operator>>(float& i);
   wxInputStream& operator>>(int& i);
   wxInputStream& operator>>(long& i);
   wxInputStream& operator>>(float& i);

-#if USE_SERIAL
+#if wxUSE_SERIAL

   wxInputStream& operator>>(wxObject *& obj);
 #endif
 
   wxInputStream& operator>>(wxObject *& obj);
 #endif
 


@@ -115,8 +122,9 @@ class WXDLLEXPORT wxInputStream {
 
   wxInputStream(wxStreamBuffer *buffer);
 
 
   wxInputStream(wxStreamBuffer *buffer);
 

-  virtual size_t DoRead(void *buffer, size_t size) { return 0; }
-  virtual off_t DoSeekInput(off_t pos, wxSeekMode mode)
+  virtual size_t DoRead(void *WXUNUSED(buffer), size_t WXUNUSED(size) ) 
+         { return 0; }
+  virtual off_t DoSeekInput( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )

          { return wxInvalidOffset; }
   virtual off_t DoTellInput() const
          { return wxInvalidOffset; }
          { return wxInvalidOffset; }
   virtual off_t DoTellInput() const
          { return wxInvalidOffset; }


@@ -152,7 +160,7 @@ class WXDLLEXPORT wxOutputStream {
   wxOutputStream& operator<<(int i);
   wxOutputStream& operator<<(long i);
   wxOutputStream& operator<<(double f);
   wxOutputStream& operator<<(int i);
   wxOutputStream& operator<<(long i);
   wxOutputStream& operator<<(double f);

-#if USE_SERIAL
+#if wxUSE_SERIAL

   wxOutputStream& operator<<(wxObject& obj);
 #endif
 
   wxOutputStream& operator<<(wxObject& obj);
 #endif
 


@@ -169,8 +177,9 @@ class WXDLLEXPORT wxOutputStream {
 
   wxOutputStream(wxStreamBuffer *buffer);
 
 
   wxOutputStream(wxStreamBuffer *buffer);
 

-  virtual size_t DoWrite(const void *buffer, size_t size) { return 0; }
-  virtual off_t DoSeekOutput(off_t pos, wxSeekMode mode)
+  virtual size_t DoWrite( const void *WXUNUSED(buffer), size_t WXUNUSED(size) ) 
+            { return 0; }
+  virtual off_t DoSeekOutput( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )

             { return wxInvalidOffset; }
   virtual off_t DoTellOutput() const
             { return wxInvalidOffset; }
             { return wxInvalidOffset; }
   virtual off_t DoTellOutput() const
             { return wxInvalidOffset; }


@@ -181,8 +190,8 @@ class WXDLLEXPORT wxOutputStream {
   wxStreamBuffer *m_o_streambuf;
 };
 
   wxStreamBuffer *m_o_streambuf;
 };
 

-class wxStream: virtual public wxInputStream,
-               virtual public wxOutputStream
+class WXDLLEXPORT wxStream: public virtual wxInputStream,
+               public virtual wxOutputStream

 {
  public:
   wxStream();
 {
  public:
   wxStream();


@@ -192,7 +201,7 @@ class wxStream: virtual public wxInputStream,
 // "Filter" streams
 // ---------------------------------------------------------------------------
 
 // "Filter" streams
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFilterInputStream: virtual public wxInputStream {
+class WXDLLEXPORT wxFilterInputStream: public virtual wxInputStream {

  public:
   wxFilterInputStream();
   wxFilterInputStream(wxInputStream& stream);
  public:
   wxFilterInputStream();
   wxFilterInputStream(wxInputStream& stream);


@@ -213,7 +222,7 @@ class WXDLLEXPORT wxFilterInputStream: virtual public wxInputStream {
   wxInputStream *m_parent_i_stream;
 };
 
   wxInputStream *m_parent_i_stream;
 };
 

-class WXDLLEXPORT wxFilterOutputStream: virtual public wxOutputStream {
+class WXDLLEXPORT wxFilterOutputStream: public virtual wxOutputStream {

  public:
   wxFilterOutputStream();
   wxFilterOutputStream(wxOutputStream& stream);
  public:
   wxFilterOutputStream();
   wxFilterOutputStream(wxOutputStream& stream);


@@ -235,11 +244,15 @@ class WXDLLEXPORT wxFilterOutputStream: virtual public wxOutputStream {
 };
 
 class WXDLLEXPORT wxFilterStream: public wxStream,
 };
 
 class WXDLLEXPORT wxFilterStream: public wxStream,

-                                 virtual public wxFilterInputStream,
-                                 virtual public wxFilterOutputStream {
+                                 public virtual wxFilterInputStream,
+                                 public virtual wxFilterOutputStream {

  public:
   wxFilterStream(wxStream& stream);
   wxFilterStream();
 };
 
  public:
   wxFilterStream(wxStream& stream);
   wxFilterStream();
 };
 

+#ifdef _MSC_VER
+#pragma warning(default:4250)
+#endif
+

 #endif
 #endif