Changes related to stream includes

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

diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h
index 3d55f1b85e2ca9f4ece372d06b744a56cdc9348b..83e801028054ec3487f283526dcae42975d248ab 100644 (file)
--- a/include/wx/sckstrm.h
+++ b/include/wx/sckstrm.h
@@ -18,15 +18,17 @@
 #include "wx/stream.h"
 #include "wx/socket.h"
 
-class WXDLLEXPORT wxSocketOutputStream : public wxOutputStream
+class WXDLLEXPORT wxSocketOutputStream : public virtual wxOutputStream
 {
  public:
   wxSocketOutputStream(wxSocketBase& s);
   virtual ~wxSocketOutputStream();
 
   wxOutputStream& Write(const void *buffer, size_t size);
-  off_t SeekO(off_t pos, wxSeekMode mode) { return -1; }
-  off_t TellO() { return -1; }
+  off_t SeekO( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) ) 
+    { return -1; }
+  off_t TellO() 
+    { return -1; }
 
   bool Bad() { return m_o_socket->IsDisconnected(); }
   size_t LastWrite() { return m_o_socket->LastCount(); }
@@ -34,15 +36,17 @@ class WXDLLEXPORT wxSocketOutputStream : public wxOutputStream
   wxSocketBase *m_o_socket;
 };
 
-class WXDLLEXPORT wxSocketInputStream : public wxInputStream
+class WXDLLEXPORT wxSocketInputStream : public virtual wxInputStream
 {
  public:
   wxSocketInputStream(wxSocketBase& s);
   ~wxSocketInputStream();
 
   wxInputStream& Read(void *buffer, size_t size);
-  off_t SeekI(off_t pos, wxSeekMode mode) { return -1; }
-  off_t TellI() { return -1; }
+  off_t SeekI( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) ) 
+    { return -1; }
+  off_t TellI() 
+    { return -1; }
 
   bool Eof() { return m_i_socket->IsDisconnected(); }
   size_t LastRead() { return m_i_socket->LastCount(); }