renamed wxComboControl to wxComboCtrl and related wxUSE_XXX and configure switches...

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

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index c0b5332b046e59d7779858b18bd833bafe70c19c..5b1fcac0ca1a2f63187caa51a55944ed9b173f91 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,25 +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
+#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
@@ -41,15 +39,13 @@ 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)
 {
-  return m_o_socket->Write((const char *)buffer, size).LastCount();
+    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;
 }
 
 // ---------------------------------------------------------------------------
@@ -65,15 +61,13 @@ 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)
 {
-  return m_i_socket->Read((char *)buffer, size).LastCount();
+    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;
 }
 
 // ---------------------------------------------------------------------------
@@ -90,3 +84,4 @@ wxSocketStream::~wxSocketStream()
 }
 
 #endif
+  // wxUSE_STREAMS && wxUSE_SOCKETS