X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..11e3c6ef36393fb5863ea2f9601d8facd73acb12:/include/wx/sckstrm.h?ds=sidebyside

diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h
index a987d8c15e..c33e6143b7 100644
--- a/include/wx/sckstrm.h
+++ b/include/wx/sckstrm.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        sckstrm.h
+// Name:        wx/sckstrm.h
 // Purpose:     wxSocket*Stream
 // Author:      Guilhem Lavaux
 // Modified by:
@@ -11,10 +11,6 @@
 #ifndef __SCK_STREAM_H__
 #define __SCK_STREAM_H__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
 #include "wx/stream.h"
 
 #if wxUSE_SOCKETS && wxUSE_STREAMS
@@ -23,50 +19,53 @@
 
 class WXDLLIMPEXP_NET wxSocketOutputStream : public wxOutputStream
 {
- public:
-  wxSocketOutputStream(wxSocketBase& s);
-  ~wxSocketOutputStream();
+public:
+    wxSocketOutputStream(wxSocketBase& s);
+    virtual ~wxSocketOutputStream();
 
-  off_t SeekO( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
-    { return -1; }
-  off_t TellO() const
-    { return -1; }
+protected:
+    wxSocketBase *m_o_socket;
 
- protected:
-  wxSocketBase *m_o_socket;
+    size_t OnSysWrite(const void *buffer, size_t bufsize);
 
-  size_t OnSysWrite(const void *buffer, size_t bufsize);
+    // socket streams are both un-seekable and size-less streams:
+    wxFileOffset OnSysTell() const
+        { return wxInvalidOffset; }
+    wxFileOffset OnSysSeek(wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode))
+        { return wxInvalidOffset; }
 
-    DECLARE_NO_COPY_CLASS(wxSocketOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxSocketOutputStream);
 };
 
 class WXDLLIMPEXP_NET wxSocketInputStream : public wxInputStream
 {
- public:
-  wxSocketInputStream(wxSocketBase& s);
-  ~wxSocketInputStream();
+public:
+    wxSocketInputStream(wxSocketBase& s);
+    virtual ~wxSocketInputStream();
+
+protected:
+    wxSocketBase *m_i_socket;
 
-  off_t SeekI( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
-    { return -1; }
-  off_t TellI() const
-    { return -1; }
+    size_t OnSysRead(void *buffer, size_t bufsize);
 
- protected:
-  wxSocketBase *m_i_socket;
+    // socket streams are both un-seekable and size-less streams:
 
-  size_t OnSysRead(void *buffer, size_t bufsize);
+    wxFileOffset OnSysTell() const
+        { return wxInvalidOffset; }
+    wxFileOffset OnSysSeek(wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode))
+        { return wxInvalidOffset; }
 
-    DECLARE_NO_COPY_CLASS(wxSocketInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxSocketInputStream);
 };
 
 class WXDLLIMPEXP_NET wxSocketStream : public wxSocketInputStream,
                    public wxSocketOutputStream
 {
- public:
-  wxSocketStream(wxSocketBase& s);
-  ~wxSocketStream();
+public:
+    wxSocketStream(wxSocketBase& s);
+    virtual ~wxSocketStream();
 
-  DECLARE_NO_COPY_CLASS(wxSocketStream)
+    wxDECLARE_NO_COPY_CLASS(wxSocketStream);
 };
 
 #endif