Fixes for WXWIN_COMPATIBILITY, and BC++ fix for event.cpp

[wxWidgets.git] / src / common / sckstrm.cpp

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index 9224fe1765b6a623187303ca4286d381b08cca5e..85562ae51c8685232be9d4e38fd91210c3681bc1 100644 (file)
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -41,7 +41,7 @@ wxSocketOutputStream::~wxSocketOutputStream()
 
 wxOutputStream& wxSocketOutputStream::Write(const void *buffer, size_t size)
 {
-  m_o_socket->Write((const char *)buffer, size);
+  m_lastcount = m_o_socket->Write((const char *)buffer, size).LastCount();
   return *this;
 }
 
@@ -60,19 +60,19 @@ wxSocketInputStream::~wxSocketInputStream()
 
 wxInputStream& wxSocketInputStream::Read(void *buffer, size_t size)
 {
-  m_i_socket->Read((char *)buffer, size);
+  m_lastcount = m_i_socket->Read((char *)buffer, size).LastCount();
   return *this;
 }
 
 // ---------------------------------------------------------------------------
-// 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()
+{
+}