Misc validity fixes to samples/xrc/rc/*.xrc.

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

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index a65f0a0c032b184c49915651e54ab58b96c79fc2..8f64727d786c836683882fd35e17dd4cc9ac4888 100644 (file)
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -1,33 +1,29 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        sckstrm.h
+// Name:        src/common/sckstrm.cpp

 // Purpose:     wxSocket*Stream
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     17/07/97
 // Purpose:     wxSocket*Stream
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     17/07/97

-// RCS-ID:      $Id$

 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "sckstrm.h"
-#endif

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_SOCKETS && wxUSE_STREAMS
+
+#include "wx/sckstrm.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-  #include "wx/defs.h"
+    #include "wx/stream.h"

 #endif
 
 #endif
 

-#if wxUSE_SOCKETS && wxUSE_STREAMS
-
-#include "wx/stream.h"

 #include "wx/socket.h"
 #include "wx/socket.h"

-#include "wx/sckstrm.h"

 
 // ---------------------------------------------------------------------------
 // wxSocketOutputStream
 
 // ---------------------------------------------------------------------------
 // wxSocketOutputStream


@@ -44,11 +40,12 @@ wxSocketOutputStream::~wxSocketOutputStream()
 
 size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
 
 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;
-
-  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;

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -66,11 +63,12 @@ wxSocketInputStream::~wxSocketInputStream()
 
 size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)
 {
 
 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;
-
-  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;

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -86,5 +84,4 @@ wxSocketStream::~wxSocketStream()
 {
 }
 
 {
 }
 

-#endif
-  // wxUSE_STREAMS && wxUSE_SOCKETS
+#endif // wxUSE_STREAMS && wxUSE_SOCKETS