A few tweaks and cleanups

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

diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h
index 86782eddf2e8d80ea4543fa9c49be548a3b7469d..6ef70e4e91b0dfdab398189519e3d58fe439271b 100644 (file)
--- a/include/wx/sckstrm.h
+++ b/include/wx/sckstrm.h
@@ -16,24 +16,26 @@
 #endif
 
 #include "wx/stream.h"
 #endif
 
 #include "wx/stream.h"

+
+#if wxUSE_SOCKETS && wxUSE_STREAMS
+

 #include "wx/socket.h"
 
 class WXDLLEXPORT wxSocketOutputStream : public wxOutputStream
 {
  public:
   wxSocketOutputStream(wxSocketBase& s);
 #include "wx/socket.h"
 
 class WXDLLEXPORT wxSocketOutputStream : public wxOutputStream
 {
  public:
   wxSocketOutputStream(wxSocketBase& s);

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

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


@@ -42,25 +44,27 @@ 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; }
 
     { 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;

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

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

-                                   public wxSocketOutputStream,
-                                  public wxStream {
-
+                   public wxSocketOutputStream
+{

  public:
  public:

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

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

+  ~wxSocketStream();

 };
 
 #endif
 };
 
 #endif

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