X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fcc6dddd1f1da49f94767ff148eaa3f1d3ca9367..a4a6984d5e2d8ae424cc8f31c223304b260d7670:/src/common/sckstrm.cpp

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index 9224fe1765..1e1417c416 100644
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -16,12 +16,15 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+  #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
+  #include "wx/defs.h"
 #endif
 
+#if wxUSE_SOCKETS && wxUSE_STREAMS
+
 #include "wx/stream.h"
 #include "wx/socket.h"
 #include "wx/sckstrm.h"
@@ -39,10 +42,19 @@ wxSocketOutputStream::~wxSocketOutputStream()
 {
 }
 
-wxOutputStream& wxSocketOutputStream::Write(const void *buffer, size_t size)
+size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
-  m_o_socket->Write((const char *)buffer, size);
-  return *this;
+  size_t ret;
+
+  ret = m_o_socket->Write((const char *)buffer, size).LastCount();
+
+  if (m_o_socket->Error())
+    m_lasterror = wxStream_WRITE_ERR;
+  else
+    m_lasterror = wxStream_NOERROR;
+
+  return ret;
+
 }
 
 // ---------------------------------------------------------------------------
@@ -58,21 +70,32 @@ wxSocketInputStream::~wxSocketInputStream()
 {
 }
 
-wxInputStream& wxSocketInputStream::Read(void *buffer, size_t size)
+size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)
 {
-  m_i_socket->Read((char *)buffer, size);
-  return *this;
+  size_t ret;
+
+  ret = m_i_socket->Read((char *)buffer, size).LastCount();
+
+  if (m_i_socket->Error())
+    m_lasterror = wxStream_READ_ERR;
+  else
+    m_lasterror = wxStream_NOERROR;
+
+  return ret;
 }
 
 // ---------------------------------------------------------------------------
-// wxSocketStream (IO)
+// wxSocketStream
 // ---------------------------------------------------------------------------
-wxSocketStream::wxSocketStream(wxSocketBase& i_s, wxSocketBase& o_s)
-  : wxSocketInputStream(i_s), wxSocketOutputStream(o_s)
-{
-}
 
 wxSocketStream::wxSocketStream(wxSocketBase& s)
   : wxSocketInputStream(s), wxSocketOutputStream(s)
 {
 }
+
+wxSocketStream::~wxSocketStream()
+{
+}
+
+#endif
+  // wxUSE_STREAMS && wxUSE_SOCKETS