X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/35a4dab713ccc16c2414aa18d360aa40929fd60c..cb0b7b7d811356f729315fc14c7e0d311f43384d:/src/common/sckstrm.cpp

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index c0b5332b04..54d72931c8 100644
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -8,22 +8,20 @@
 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "sckstrm.h"
-#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+  #pragma hdrstop
 #endif
 
-#if wxUSE_SOCKETS
-
 #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"
@@ -41,15 +39,13 @@ wxSocketOutputStream::~wxSocketOutputStream()
 {
 }
 
-wxOutputStream& wxSocketOutputStream::Write(const void *buffer, size_t size)
-{
-  m_lastcount = m_o_socket->Write((const char *)buffer, size).LastCount();
-  return *this;
-}
-
 size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
-  return m_o_socket->Write((const char *)buffer, size).LastCount();
+  size_t ret = m_o_socket->Write((const char *)buffer, size).LastCount();
+
+  m_lasterror = m_o_socket->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR;
+
+  return ret;
 }
 
 // ---------------------------------------------------------------------------
@@ -65,15 +61,13 @@ wxSocketInputStream::~wxSocketInputStream()
 {
 }
 
-wxInputStream& wxSocketInputStream::Read(void *buffer, size_t size)
-{
-  m_lastcount = m_i_socket->Read((char *)buffer, size).LastCount();
-  return *this;
-}
-
 size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)
 {
-  return m_i_socket->Read((char *)buffer, size).LastCount();
+  size_t ret = m_i_socket->Read((char *)buffer, size).LastCount();
+
+  m_lasterror = m_i_socket->Error() ? wxSTREAM_READ_ERROR : wxSTREAM_NO_ERROR;
+
+  return ret;
 }
 
 // ---------------------------------------------------------------------------
@@ -90,3 +84,4 @@ wxSocketStream::~wxSocketStream()
 }
 
 #endif
+  // wxUSE_STREAMS && wxUSE_SOCKETS