X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75ed1d15d0d866cac78f7c0da176db8dd5288bc8..ca6a9a148646fb024d76b3e19c940ace56eec1f8:/src/common/sckstrm.cpp?ds=sidebyside

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index 85562ae51c..a65f0a0c03 100644
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -8,7 +8,7 @@
 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "sckstrm.h"
 #endif
 
@@ -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,13 @@ wxSocketOutputStream::~wxSocketOutputStream()
 {
 }
 
-wxOutputStream& wxSocketOutputStream::Write(const void *buffer, size_t size)
+size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
-  m_lastcount = m_o_socket->Write((const char *)buffer, size).LastCount();
-  return *this;
+  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;
 }
 
 // ---------------------------------------------------------------------------
@@ -58,10 +64,13 @@ wxSocketInputStream::~wxSocketInputStream()
 {
 }
 
-wxInputStream& wxSocketInputStream::Read(void *buffer, size_t size)
+size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)
 {
-  m_lastcount = m_i_socket->Read((char *)buffer, size).LastCount();
-  return *this;
+  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;
 }
 
 // ---------------------------------------------------------------------------
@@ -76,3 +85,6 @@ wxSocketStream::wxSocketStream(wxSocketBase& s)
 wxSocketStream::~wxSocketStream()
 {
 }
+
+#endif
+  // wxUSE_STREAMS && wxUSE_SOCKETS