fix wxEVT_SPIN_XXX definitions in a nicer (compatible with new events) way

[wxWidgets.git] / src / common / sckstrm.cpp

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index 56ce74de65b4c918ece96b193a2ded126b612962..f060b3fd1f0c3662c8e6f8effd446e785c839b71 100644 (file)
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -18,12 +18,13 @@
 
 #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
@@ -40,10 +41,11 @@ wxSocketOutputStream::~wxSocketOutputStream()
 
 size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
-    size_t ret = m_o_socket->Write((const char *)buffer, size).LastCount();
-
-    m_lasterror = m_o_socket->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR;
-
+    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;
 }
 
@@ -62,10 +64,11 @@ wxSocketInputStream::~wxSocketInputStream()
 
 size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)
 {
-    size_t ret = m_i_socket->Read((char *)buffer, size).LastCount();
-
-    m_lasterror = m_i_socket->Error() ? wxSTREAM_READ_ERROR : wxSTREAM_NO_ERROR;
-
+    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;
 }
 
@@ -82,5 +85,4 @@ wxSocketStream::~wxSocketStream()
 {
 }
 
-#endif
-  // wxUSE_STREAMS && wxUSE_SOCKETS
+#endif // wxUSE_STREAMS && wxUSE_SOCKETS