Added missing include to os2/private.h.

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

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index c0b5332b046e59d7779858b18bd833bafe70c19c..1e1417c416d411155459f7b0890279031ba968c5 100644 (file)
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -16,14 +16,15 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #endif
 

-#if wxUSE_SOCKETS
-

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+  #include "wx/defs.h"

 #endif
 
 #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"


@@ -41,15 +42,19 @@ wxSocketOutputStream::~wxSocketOutputStream()
 {
 }
 
 {
 }
 

-wxOutputStream& wxSocketOutputStream::Write(const void *buffer, size_t size)
-{
-  m_lastcount = m_o_socket->Write((const char *)buffer, size).LastCount();
-  return *this;
-}
-

 size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
 size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
 {

-  return m_o_socket->Write((const char *)buffer, size).LastCount();
+  size_t ret;
+
+  ret = m_o_socket->Write((const char *)buffer, size).LastCount();
+
+  if (m_o_socket->Error())
+    m_lasterror = wxStream_WRITE_ERR;
+  else
+    m_lasterror = wxStream_NOERROR;
+
+  return ret;
+

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


@@ -65,15 +70,18 @@ wxSocketInputStream::~wxSocketInputStream()
 {
 }
 
 {
 }
 

-wxInputStream& wxSocketInputStream::Read(void *buffer, size_t size)
-{
-  m_lastcount = m_i_socket->Read((char *)buffer, size).LastCount();
-  return *this;
-}
-

 size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)
 {
 size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)
 {

-  return m_i_socket->Read((char *)buffer, size).LastCount();
+  size_t ret;
+
+  ret = m_i_socket->Read((char *)buffer, size).LastCount();
+
+  if (m_i_socket->Error())
+    m_lasterror = wxStream_READ_ERR;
+  else
+    m_lasterror = wxStream_NOERROR;
+
+  return ret;

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


@@ -90,3 +98,4 @@ wxSocketStream::~wxSocketStream()
 }
 
 #endif
 }
 
 #endif

+  // wxUSE_STREAMS && wxUSE_SOCKETS