moved wxDash typedef to gdicmn.h

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index c02adfc698ceaa5d1585dbaa84c4c9ed48b7e0e6..0f13466c0c327c85c8f3059586a5744a1f76e2a0 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -198,7 +198,7 @@ bool wxSocketBase::Destroy()
 bool wxSocketBase::Close()
 {
   // Interrupt pending waits
 bool wxSocketBase::Close()
 {
   // Interrupt pending waits

-  InterruptAllWaits();
+  InterruptWait();

 
   if (m_socket)
   {
 
   if (m_socket)
   {


@@ -466,7 +466,7 @@ wxUint32 wxSocketBase::_Write(const void *buffer, wxUint32 nbytes)
           break;
 
       ret = GSocket_Write(m_socket, (const char *)buffer, nbytes);
           break;
 
       ret = GSocket_Write(m_socket, (const char *)buffer, nbytes);

-
+      

       if (ret > 0)
       {
         total  += ret;
       if (ret > 0)
       {
         total  += ret;


@@ -653,7 +653,7 @@ bool wxSocketBase::_Wait(long seconds,
     {
       m_connected = FALSE;
       m_establishing = FALSE;
     {
       m_connected = FALSE;
       m_establishing = FALSE;

-      return (flags & GSOCK_LOST_FLAG);
+      return (flags & GSOCK_LOST_FLAG) != 0;

     }
 
     // Wait more?
     }
 
     // Wait more?