* Changed char to wxChar in operators.

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

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index c0846c46aae239699675810fde43529ee00d09f0..f7796cea3b7ca45f01d6952dc64696fb6855e9a8 100644 (file)
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -12,6 +12,19 @@
 #pragma implementation "sckstrm.h"
 #endif
 
 #pragma implementation "sckstrm.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+  #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"
 #include "wx/stream.h"
 #include "wx/socket.h"
 #include "wx/sckstrm.h"


@@ -31,10 +44,15 @@ wxSocketOutputStream::~wxSocketOutputStream()
 
 wxOutputStream& wxSocketOutputStream::Write(const void *buffer, size_t size)
 {
 
 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;
 }
 
   return *this;
 }
 

+size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
+{
+  return m_o_socket->Write((const char *)buffer, size).LastCount();
+}
+

 // ---------------------------------------------------------------------------
 // wxSocketInputStream
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxSocketInputStream
 // ---------------------------------------------------------------------------


@@ -50,19 +68,27 @@ wxSocketInputStream::~wxSocketInputStream()
 
 wxInputStream& wxSocketInputStream::Read(void *buffer, size_t size)
 {
 
 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;
 }
 
   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(wxSocketBase& s)
   : wxSocketInputStream(s), wxSocketOutputStream(s)
 {
 }

+
+wxSocketStream::~wxSocketStream()
+{
+}
+
+#endif
+  // wxUSE_STREAMS && wxUSE_SOCKETS