* wxSocket fixes
* wxStream: - new inheritance, new stream buffer, nearly the same API for the end user - updated other streams consequently * wxGTK: some change to make it compile on GTK 1.0 and GTK 1.1 * small changes on wxThread to prepare a more reentrant lib * wxVariant works with wxStream too now git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -41,7 +41,7 @@ wxSocketOutputStream::~wxSocketOutputStream()
|
||||
|
||||
wxOutputStream& wxSocketOutputStream::Write(const void *buffer, size_t size)
|
||||
{
|
||||
m_o_socket->Write((const char *)buffer, size);
|
||||
m_lastcount = m_o_socket->Write((const char *)buffer, size).LastCount();
|
||||
return *this;
|
||||
}
|
||||
|
||||
@@ -60,19 +60,19 @@ wxSocketInputStream::~wxSocketInputStream()
|
||||
|
||||
wxInputStream& wxSocketInputStream::Read(void *buffer, size_t size)
|
||||
{
|
||||
m_i_socket->Read((char *)buffer, size);
|
||||
m_lastcount = m_i_socket->Read((char *)buffer, size).LastCount();
|
||||
return *this;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// 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()
|
||||
{
|
||||
}
|
||||
|
Reference in New Issue
Block a user