X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb43b372fb1567caf7ccfa523aca10c676ceaec4..87d34730704b8dc72402ad091251b1178b16ecc7:/include/wx/sckstrm.h?ds=sidebyside

diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h
index 83e8010280..60fced8eb2 100644
--- a/include/wx/sckstrm.h
+++ b/include/wx/sckstrm.h
@@ -11,56 +11,62 @@
 #ifndef __SCK_STREAM_H__
 #define __SCK_STREAM_H__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "wx/stream.h"
+
+#if wxUSE_SOCKETS && wxUSE_STREAMS
+
 #include "wx/socket.h"
 
-class WXDLLEXPORT wxSocketOutputStream : public virtual wxOutputStream
+class WXDLLIMPEXP_NET wxSocketOutputStream : public wxOutputStream
 {
  public:
   wxSocketOutputStream(wxSocketBase& s);
   virtual ~wxSocketOutputStream();
 
-  wxOutputStream& Write(const void *buffer, size_t size);
-  off_t SeekO( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) ) 
+  wxFileOffset SeekO( wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
     { return -1; }
-  off_t TellO() 
+  wxFileOffset TellO() const
     { return -1; }
 
-  bool Bad() { return m_o_socket->IsDisconnected(); }
-  size_t LastWrite() { return m_o_socket->LastCount(); }
  protected:
   wxSocketBase *m_o_socket;
+
+  size_t OnSysWrite(const void *buffer, size_t bufsize);
+
+    DECLARE_NO_COPY_CLASS(wxSocketOutputStream)
 };
 
-class WXDLLEXPORT wxSocketInputStream : public virtual wxInputStream
+class WXDLLIMPEXP_NET wxSocketInputStream : public wxInputStream
 {
  public:
   wxSocketInputStream(wxSocketBase& s);
-  ~wxSocketInputStream();
+  virtual ~wxSocketInputStream();
 
-  wxInputStream& Read(void *buffer, size_t size);
-  off_t SeekI( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) ) 
+  wxFileOffset SeekI( wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
     { return -1; }
-  off_t TellI() 
+  wxFileOffset TellI() const
     { return -1; }
 
-  bool Eof() { return m_i_socket->IsDisconnected(); }
-  size_t LastRead() { return m_i_socket->LastCount(); }
  protected:
   wxSocketBase *m_i_socket;
-};
 
-class WXDLLEXPORT wxSocketStream : public wxSocketInputStream,
-                                   public wxSocketOutputStream,
-				   public wxStream {
+  size_t OnSysRead(void *buffer, size_t bufsize);
 
+    DECLARE_NO_COPY_CLASS(wxSocketInputStream)
+};
+
+class WXDLLIMPEXP_NET wxSocketStream : public wxSocketInputStream,
+                   public wxSocketOutputStream
+{
  public:
-  wxSocketStream(wxSocketBase& i_s, wxSocketBase& o_s);
   wxSocketStream(wxSocketBase& s);
+  virtual ~wxSocketStream();
+
+  DECLARE_NO_COPY_CLASS(wxSocketStream)
 };
 
 #endif
+  // wxUSE_SOCKETS && wxUSE_STREAMS
+
+#endif
+  // __SCK_STREAM_H__