We surely don't need two debugging sections,

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

diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h
index 0f05c8c3f7b369d1cdbb9cc4e79480dfa9633d14..b6a060d29864b8d588ddb532ce8b0f3b7c08a654 100644 (file)
--- a/include/wx/sckstrm.h
+++ b/include/wx/sckstrm.h
@@ -11,11 +11,14 @@
 #ifndef __SCK_STREAM_H__
 #define __SCK_STREAM_H__
 
 #ifndef __SCK_STREAM_H__
 #define __SCK_STREAM_H__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface
 #endif
 
 #include "wx/stream.h"
 #pragma interface
 #endif
 
 #include "wx/stream.h"

+
+#if wxUSE_SOCKETS && wxUSE_STREAMS
+

 #include "wx/socket.h"
 
 class WXDLLEXPORT wxSocketOutputStream : public wxOutputStream
 #include "wx/socket.h"
 
 class WXDLLEXPORT wxSocketOutputStream : public wxOutputStream


@@ -24,14 +27,17 @@ class WXDLLEXPORT wxSocketOutputStream : public wxOutputStream
   wxSocketOutputStream(wxSocketBase& s);
   ~wxSocketOutputStream();
 
   wxSocketOutputStream(wxSocketBase& s);
   ~wxSocketOutputStream();
 

-  wxOutputStream& Write(const void *buffer, size_t size);
-  off_t SeekO( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) ) 
+  off_t SeekO( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )

     { return -1; }
     { return -1; }

-  off_t TellO() 
+  off_t TellO() const

     { return -1; }
 
  protected:
   wxSocketBase *m_o_socket;
     { return -1; }
 
  protected:
   wxSocketBase *m_o_socket;

+
+  size_t OnSysWrite(const void *buffer, size_t bufsize);
+
+    DECLARE_NO_COPY_CLASS(wxSocketOutputStream)

 };
 
 class WXDLLEXPORT wxSocketInputStream : public wxInputStream
 };
 
 class WXDLLEXPORT wxSocketInputStream : public wxInputStream


@@ -40,18 +46,21 @@ class WXDLLEXPORT wxSocketInputStream : public wxInputStream
   wxSocketInputStream(wxSocketBase& s);
   ~wxSocketInputStream();
 
   wxSocketInputStream(wxSocketBase& s);
   ~wxSocketInputStream();
 

-  wxInputStream& Read(void *buffer, size_t size);
-  off_t SeekI( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) ) 
+  off_t SeekI( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )

     { return -1; }
     { return -1; }

-  off_t TellI() 
+  off_t TellI() const

     { return -1; }
 
  protected:
   wxSocketBase *m_i_socket;
     { return -1; }
 
  protected:
   wxSocketBase *m_i_socket;

+
+  size_t OnSysRead(void *buffer, size_t bufsize);
+
+    DECLARE_NO_COPY_CLASS(wxSocketInputStream)

 };
 
 class WXDLLEXPORT wxSocketStream : public wxSocketInputStream,
 };
 
 class WXDLLEXPORT wxSocketStream : public wxSocketInputStream,

-                                  public wxSocketOutputStream
+                   public wxSocketOutputStream

 {
  public:
   wxSocketStream(wxSocketBase& s);
 {
  public:
   wxSocketStream(wxSocketBase& s);


@@ -59,3 +68,7 @@ class WXDLLEXPORT wxSocketStream : public wxSocketInputStream,
 };
 
 #endif
 };
 
 #endif

+  // wxUSE_SOCKETS && wxUSE_STREAMS
+
+#endif
+  // __SCK_STREAM_H__