use of div_t.quot and div_t.rem were changed to / and %

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

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index c0846c46aae239699675810fde43529ee00d09f0..df9392287032f0045abcff4d706f728e33f3ffdd 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"


@@ -29,10 +42,21 @@ wxSocketOutputStream::~wxSocketOutputStream()
 {
 }
 
 {
 }
 

-wxOutputStream& wxSocketOutputStream::Write(const void *buffer, size_t size)
+size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)

 {
 {

-  m_o_socket->Write((const char *)buffer, size);
-  return *this;
+  size_t ret;
+
+  ret = m_o_socket->Write((const char *)buffer, size).LastCount();
+  switch (m_o_socket->LastError()) {
+  case GSOCK_NOERROR:
+    m_lasterror = wxStream_NOERROR;
+    break;
+  default:
+    m_lasterror = wxStream_READ_ERR;
+    break;
+  }
+  return ret;
+

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -48,21 +72,34 @@ wxSocketInputStream::~wxSocketInputStream()
 {
 }
 
 {
 }
 

-wxInputStream& wxSocketInputStream::Read(void *buffer, size_t size)
+size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)

 {
 {

-  m_i_socket->Read((char *)buffer, size);
-  return *this;
+  size_t ret;
+
+  ret = m_i_socket->Read((char *)buffer, size).LastCount();
+  switch (m_i_socket->LastError()) {
+  case GSOCK_NOERROR:
+    m_lasterror = wxStream_NOERROR;
+    break;
+  default:
+    m_lasterror = wxStream_WRITE_ERR;
+    break;
+  }
+  return ret;

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------

-// 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(wxSocketBase& s)
   : wxSocketInputStream(s), wxSocketOutputStream(s)
 {
 }

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