Make Eof() consistent with other streams

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

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index f7796cea3b7ca45f01d6952dc64696fb6855e9a8..54d72931c8e15f093350372e33f96f11ab638513 100644 (file)
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -8,9 +8,6 @@
 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifdef __GNUG__
-#pragma implementation "sckstrm.h"
-#endif

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"


@@ -42,15 +39,13 @@ 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 = m_o_socket->Write((const char *)buffer, size).LastCount();
+
+  m_lasterror = m_o_socket->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR;
+
+  return ret;

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


@@ -66,15 +61,13 @@ 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 = m_i_socket->Read((char *)buffer, size).LastCount();
+
+  m_lasterror = m_i_socket->Error() ? wxSTREAM_READ_ERROR : wxSTREAM_NO_ERROR;
+
+  return ret;

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