X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/375abe3dac3d7816738ccd1ab495d9a0441550d4..56b6cf265c5930dee9505aa5f2ed5c233f91bd23:/src/common/sckstrm.cpp

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index 8dde4ba92e..56ce74de65 100644
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        sckstrm.h
+// Name:        src/common/sckstrm.cpp
 // Purpose:     wxSocket*Stream
 // Author:      Guilhem Lavaux
 // Modified by:
@@ -8,17 +8,16 @@
 // 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 && wxUSE_STREAMS
+
 #ifndef WX_PRECOMP
 #endif
 
@@ -39,15 +38,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;
 }
 
 // ---------------------------------------------------------------------------
@@ -63,15 +60,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;
 }
 
 // ---------------------------------------------------------------------------
@@ -86,3 +81,6 @@ wxSocketStream::wxSocketStream(wxSocketBase& s)
 wxSocketStream::~wxSocketStream()
 {
 }
+
+#endif
+  // wxUSE_STREAMS && wxUSE_SOCKETS