fix for assert when setting tooltip for a readonly combo

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index a3eec9aae2d8f2716c6ba41ade5cecb286fe1e8a..b2947da8e81de3cf518d23d2cdeb97f27cfef71a 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -477,18 +477,6 @@ wxUint32 wxSocketBase::_Write(const void *buffer, wxUint32 nbytes)
         buffer  = (const char *)buffer + ret;
       }
 
         buffer  = (const char *)buffer + ret;
       }
 

-      // Yes, this can happen even when the socket selects as writable!
-      // (probably due to a buggy kernel; Linux 2.0.36 seems to do this).
-      // Fake it so that we stay in the loop, but do it only for ret < 0,
-      // as ret == 0 means that the socket is closed. I'm not applying
-      // this hack for read calls as it seems unnecessary there.
-      //
-      if ((ret < 0) && (GSocket_GetError(m_socket) == GSOCK_WOULDBLOCK))
-      {
-        wxLogDebug(_("wxSocket: working around select() bug in Write."));
-        continue;
-      }
-

       // If we got here and wxSOCKET_WAITALL is not set, we can leave
       // now. Otherwise, wait until we send all the data or until there
       // is an error.
       // If we got here and wxSOCKET_WAITALL is not set, we can leave
       // now. Otherwise, wait until we send all the data or until there
       // is an error.


@@ -1254,7 +1242,7 @@ class WXDLLEXPORT wxSocketModule : public wxModule
   DECLARE_DYNAMIC_CLASS(wxSocketModule)
 
 public:
   DECLARE_DYNAMIC_CLASS(wxSocketModule)
 
 public:

-  bool OnInit() { return GSocket_Init(); }
+  bool OnInit() { return GSocket_Init() != 0; }

   void OnExit() { GSocket_Cleanup(); }
 };
 
   void OnExit() { GSocket_Cleanup(); }
 };