wxMemoryDC constructor now optionally accepts a wxBitmap parameter,

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 43a51d19a17fde6ecff4d9b7517e98e5a83635d8..28a929198ce9ed97b8680ef100b52a537d5df2d8 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -29,14 +29,14 @@
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/event.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/timer.h"
+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/app.h"

 #include "wx/apptrait.h"
 #include "wx/apptrait.h"

-#include "wx/timer.h"
-#include "wx/utils.h"
-#include "wx/module.h"
-#include "wx/event.h"

 
 #include "wx/sckaddr.h"
 #include "wx/datetime.h"
 
 #include "wx/sckaddr.h"
 #include "wx/datetime.h"


@@ -330,11 +330,9 @@ wxUint32 wxSocketBase::_Read(void* buffer, wxUint32 nbytes)
 
   // Return now in one of the following cases:
   // - the socket is invalid,
 
   // Return now in one of the following cases:
   // - the socket is invalid,

-  // - we got all the data,
-  // - we got *some* data and we are not using wxSOCKET_WAITALL.
+  // - we got all the data

   if ( !m_socket ||
   if ( !m_socket ||

-       !nbytes ||
-       ((total != 0) && !(m_flags & wxSOCKET_WAITALL)) )
+       !nbytes )

     return total;
 
   // Possible combinations (they are checked in this order)
     return total;
 
   // Possible combinations (they are checked in this order)