projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1. more warnings fixes in gtk/region.cpp and common/tbarsmpl.cpp
[wxWidgets.git]
/
src
/
common
/
sckstrm.cpp
diff --git
a/src/common/sckstrm.cpp
b/src/common/sckstrm.cpp
index f7796cea3b7ca45f01d6952dc64696fb6855e9a8..1e1417c416d411155459f7b0890279031ba968c5 100644
(file)
--- 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)
{
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)
{
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;
}
// ---------------------------------------------------------------------------
}
// ---------------------------------------------------------------------------