X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/375abe3dac3d7816738ccd1ab495d9a0441550d4..08670ea85abf4b4946a9ce64971b591d7b1ee30b:/src/common/sckstrm.cpp diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp index 8dde4ba92e..f060b3fd1f 100644 --- a/src/common/sckstrm.cpp +++ b/src/common/sckstrm.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: sckstrm.h +// Name: src/common/sckstrm.cpp // Purpose: wxSocket*Stream // Author: Guilhem Lavaux // Modified by: @@ -8,23 +8,23 @@ // Copyright: (c) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "sckstrm.h" -#endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_SOCKETS && wxUSE_STREAMS + +#include "wx/sckstrm.h" + #ifndef WX_PRECOMP + #include "wx/stream.h" #endif -#include "wx/stream.h" #include "wx/socket.h" -#include "wx/sckstrm.h" // --------------------------------------------------------------------------- // wxSocketOutputStream @@ -39,15 +39,14 @@ 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) { - return m_o_socket->Write((const char *)buffer, size).LastCount(); + const size_t ret = m_o_socket->Write(buffer, size).LastCount(); + m_lasterror = m_o_socket->Error() + ? m_o_socket->IsClosed() ? wxSTREAM_EOF + : wxSTREAM_WRITE_ERROR + : wxSTREAM_NO_ERROR; + return ret; } // --------------------------------------------------------------------------- @@ -63,15 +62,14 @@ 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) { - return m_i_socket->Read((char *)buffer, size).LastCount(); + const size_t ret = m_i_socket->Read(buffer, size).LastCount(); + m_lasterror = m_i_socket->Error() + ? m_i_socket->IsClosed() ? wxSTREAM_EOF + : wxSTREAM_READ_ERROR + : wxSTREAM_NO_ERROR; + return ret; } // --------------------------------------------------------------------------- @@ -86,3 +84,5 @@ wxSocketStream::wxSocketStream(wxSocketBase& s) wxSocketStream::~wxSocketStream() { } + +#endif // wxUSE_STREAMS && wxUSE_SOCKETS