fixing osx_carbon

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

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index df9392287032f0045abcff4d706f728e33f3ffdd..f060b3fd1f0c3662c8e6f8effd446e785c839b71 100644 (file)
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        sckstrm.h
+// Name:        src/common/sckstrm.cpp
 // Purpose:     wxSocket*Stream
 // Author:      Guilhem Lavaux
 // Modified by:
@@ -8,26 +8,23 @@
 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "sckstrm.h"
-#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#if wxUSE_SOCKETS && wxUSE_STREAMS
+
+#include "wx/sckstrm.h"
+
 #ifndef WX_PRECOMP
-  #include "wx/defs.h"
+    #include "wx/stream.h"
 #endif
 
-#if wxUSE_SOCKETS && wxUSE_STREAMS
-
-#include "wx/stream.h"
 #include "wx/socket.h"
-#include "wx/sckstrm.h"
 
 // ---------------------------------------------------------------------------
 // wxSocketOutputStream
@@ -44,19 +41,12 @@ wxSocketOutputStream::~wxSocketOutputStream()
 
 size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
-  size_t ret;
-
-  ret = m_o_socket->Write((const char *)buffer, size).LastCount();
-  switch (m_o_socket->LastError()) {
-  case GSOCK_NOERROR:
-    m_lasterror = wxStream_NOERROR;
-    break;
-  default:
-    m_lasterror = wxStream_READ_ERR;
-    break;
-  }
-  return ret;
-
+    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;
 }
 
 // ---------------------------------------------------------------------------
@@ -74,18 +64,12 @@ wxSocketInputStream::~wxSocketInputStream()
 
 size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)
 {
-  size_t ret;
-
-  ret = m_i_socket->Read((char *)buffer, size).LastCount();
-  switch (m_i_socket->LastError()) {
-  case GSOCK_NOERROR:
-    m_lasterror = wxStream_NOERROR;
-    break;
-  default:
-    m_lasterror = wxStream_WRITE_ERR;
-    break;
-  }
-  return ret;
+    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;
 }
 
 // ---------------------------------------------------------------------------
@@ -101,5 +85,4 @@ wxSocketStream::~wxSocketStream()
 {
 }
 
-#endif
-  // wxUSE_STREAMS && wxUSE_SOCKETS
+#endif // wxUSE_STREAMS && wxUSE_SOCKETS