projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use MoreFiles under Mac OS X
[wxWidgets.git]
/
src
/
common
/
sckstrm.cpp
diff --git
a/src/common/sckstrm.cpp
b/src/common/sckstrm.cpp
index 85562ae51c8685232be9d4e38fd91210c3681bc1..1e1417c416d411155459f7b0890279031ba968c5 100644
(file)
--- a/
src/common/sckstrm.cpp
+++ b/
src/common/sckstrm.cpp
@@
-16,12
+16,15
@@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#endif
#ifndef WX_PRECOMP
+ #include "wx/defs.h"
#endif
#endif
+#if wxUSE_SOCKETS && wxUSE_STREAMS
+
#include "wx/stream.h"
#include "wx/socket.h"
#include "wx/sckstrm.h"
#include "wx/stream.h"
#include "wx/socket.h"
#include "wx/sckstrm.h"
@@
-39,10
+42,19
@@
wxSocketOutputStream::~wxSocketOutputStream()
{
}
{
}
-
wxOutputStream& wxSocketOutputStream::
Write(const void *buffer, size_t size)
+
size_t wxSocketOutputStream::OnSys
Write(const void *buffer, size_t size)
{
{
- m_lastcount = m_o_socket->Write((const char *)buffer, size).LastCount();
- return *this;
+ 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;
+
}
// ---------------------------------------------------------------------------
}
// ---------------------------------------------------------------------------
@@
-58,10
+70,18
@@
wxSocketInputStream::~wxSocketInputStream()
{
}
{
}
-
wxInputStream& wxSocketInputStream::
Read(void *buffer, size_t size)
+
size_t wxSocketInputStream::OnSys
Read(void *buffer, size_t size)
{
{
- m_lastcount = m_i_socket->Read((char *)buffer, size).LastCount();
- return *this;
+ 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;
}
// ---------------------------------------------------------------------------
}
// ---------------------------------------------------------------------------
@@
-76,3
+96,6
@@
wxSocketStream::wxSocketStream(wxSocketBase& s)
wxSocketStream::~wxSocketStream()
{
}
wxSocketStream::~wxSocketStream()
{
}
+
+#endif
+ // wxUSE_STREAMS && wxUSE_SOCKETS