Fixed bug #859996: "Wrong path in BuildCVS.txt". As well as a couple of other minor...

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

diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h
index 3d55f1b85e2ca9f4ece372d06b744a56cdc9348b..a987d8c15e026b87a5556b22c384974b2d2898f7 100644 (file)
--- a/include/wx/sckstrm.h
+++ b/include/wx/sckstrm.h
@@ -11,52 +11,66 @@
 #ifndef __SCK_STREAM_H__
 #define __SCK_STREAM_H__
 
 #ifndef __SCK_STREAM_H__
 #define __SCK_STREAM_H__
 

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

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

+
+#if wxUSE_SOCKETS && wxUSE_STREAMS
+

 #include "wx/socket.h"
 
 #include "wx/socket.h"
 

-class WXDLLEXPORT wxSocketOutputStream : public wxOutputStream
+class WXDLLIMPEXP_NET wxSocketOutputStream : public wxOutputStream

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

-  virtual ~wxSocketOutputStream();
+  ~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() const
+    { return -1; }

 
 

-  bool Bad() { return m_o_socket->IsDisconnected(); }
-  size_t LastWrite() { return m_o_socket->LastCount(); }

  protected:
   wxSocketBase *m_o_socket;
  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 WXDLLIMPEXP_NET wxSocketInputStream : public wxInputStream

 {
  public:
   wxSocketInputStream(wxSocketBase& s);
   ~wxSocketInputStream();
 
 {
  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() const
+    { return -1; }

 
 

-  bool Eof() { return m_i_socket->IsDisconnected(); }
-  size_t LastRead() { return m_i_socket->LastCount(); }

  protected:
   wxSocketBase *m_i_socket;
  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:
  public:

-  wxSocketStream(wxSocketBase& i_s, wxSocketBase& o_s);

   wxSocketStream(wxSocketBase& s);
   wxSocketStream(wxSocketBase& s);

+  ~wxSocketStream();
+
+  DECLARE_NO_COPY_CLASS(wxSocketStream)

 };
 
 #endif
 };
 
 #endif

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