Implemented wxArrayString::Shrink() and stuff.

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

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index 9224fe1765b6a623187303ca4286d381b08cca5e..c0b5332b046e59d7779858b18bd833bafe70c19c 100644 (file)
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -19,6 +19,8 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_SOCKETS
+
 #ifndef WX_PRECOMP
 #endif
 
@@ -41,10 +43,15 @@ 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;
 }
 
+size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
+{
+  return m_o_socket->Write((const char *)buffer, size).LastCount();
+}
+
 // ---------------------------------------------------------------------------
 // wxSocketInputStream
 // ---------------------------------------------------------------------------
@@ -60,19 +67,26 @@ 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(wxSocketBase& i_s, wxSocketBase& o_s)
-  : wxSocketInputStream(i_s), wxSocketOutputStream(o_s)
+size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)
 {
+  return m_i_socket->Read((char *)buffer, size).LastCount();
 }
 
+// ---------------------------------------------------------------------------
+// wxSocketStream
+// ---------------------------------------------------------------------------
+
 wxSocketStream::wxSocketStream(wxSocketBase& s)
   : wxSocketInputStream(s), wxSocketOutputStream(s)
 {
 }
+
+wxSocketStream::~wxSocketStream()
+{
+}
+
+#endif