X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce4169a4d129fc6cd165b2e9ccc5cf5d48356020..6842d18650b487249b4ae29d0d7e17231b24cde8:/src/common/sckstrm.cpp diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp index f7796cea3b..1e1417c416 100644 --- a/src/common/sckstrm.cpp +++ b/src/common/sckstrm.cpp @@ -42,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) { - 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; + } // --------------------------------------------------------------------------- @@ -66,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) { - 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; } // ---------------------------------------------------------------------------