Don't use "Cancel" button in the about dialog of the listctrl sample.

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 78e4c049a6c3321c9edb6fa7f93a3ca49f50a6fc..699d2881a148ec1caba28369c68e54a06b7bafcc 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -172,7 +172,9 @@ public:
           m_oldflags(socket->GetFlags())
 
     {
           m_oldflags(socket->GetFlags())
 
     {

-        wxASSERT_MSG( flag == wxSOCKET_WAITALL || flag == wxSOCKET_NOWAIT,
+        // We can be passed only wxSOCKET_WAITALL{_READ,_WRITE} or
+        // wxSOCKET_NOWAIT{_READ,_WRITE} normally.
+        wxASSERT_MSG( !(flag & wxSOCKET_WAITALL) || !(flag & wxSOCKET_NOWAIT),

                       "not a wait flag" );
 
         // preserve wxSOCKET_BLOCK value when switching to wxSOCKET_WAITALL
                       "not a wait flag" );
 
         // preserve wxSOCKET_BLOCK value when switching to wxSOCKET_WAITALL


@@ -986,7 +988,7 @@ wxUint32 wxSocketBase::DoRead(void* buffer_, wxUint32 nbytes)
             if ( m_impl->GetLastError() == wxSOCKET_WOULDBLOCK )
             {
                 // if we don't want to wait, just return immediately
             if ( m_impl->GetLastError() == wxSOCKET_WOULDBLOCK )
             {
                 // if we don't want to wait, just return immediately

-                if ( m_flags & (wxSOCKET_NOWAIT|wxSOCKET_NOWAIT_READ ))
+                if ( m_flags & wxSOCKET_NOWAIT_READ )

                 {
                     // this shouldn't be counted as an error in this case
                     SetError(wxSOCKET_NOERROR);
                 {
                     // this shouldn't be counted as an error in this case
                     SetError(wxSOCKET_NOERROR);


@@ -1022,7 +1024,7 @@ wxUint32 wxSocketBase::DoRead(void* buffer_, wxUint32 nbytes)
             // we're not going to read anything else and so if we haven't read
             // anything (or not everything in wxSOCKET_WAITALL case) already,
             // signal an error
             // we're not going to read anything else and so if we haven't read
             // anything (or not everything in wxSOCKET_WAITALL case) already,
             // signal an error

-            if ( (m_flags & (wxSOCKET_WAITALL|wxSOCKET_WAITALL_READ)) || !total )
+            if ( (m_flags & wxSOCKET_WAITALL_READ) || !total )

                 SetError(wxSOCKET_IOERR);
             break;
         }
                 SetError(wxSOCKET_IOERR);
             break;
         }


@@ -1031,7 +1033,7 @@ wxUint32 wxSocketBase::DoRead(void* buffer_, wxUint32 nbytes)
 
         // if we are happy to read something and not the entire nbytes bytes,
         // then we're done
 
         // if we are happy to read something and not the entire nbytes bytes,
         // then we're done

-        if ( !(m_flags & (wxSOCKET_WAITALL|wxSOCKET_WAITALL_READ)) )
+        if ( !(m_flags & wxSOCKET_WAITALL_READ) )

             break;
 
         nbytes -= ret;
             break;
 
         nbytes -= ret;


@@ -1051,7 +1053,7 @@ wxSocketBase& wxSocketBase::ReadMsg(void* buffer, wxUint32 nbytes)
 
     wxSocketReadGuard read(this);
 
 
     wxSocketReadGuard read(this);
 

-    wxSocketWaitModeChanger changeFlags(this, (wxSOCKET_WAITALL|wxSOCKET_WAITALL_READ));
+    wxSocketWaitModeChanger changeFlags(this, wxSOCKET_WAITALL_READ);

 
     bool ok = false;
     if ( DoRead(&msg, sizeof(msg)) == sizeof(msg) )
 
     bool ok = false;
     if ( DoRead(&msg, sizeof(msg)) == sizeof(msg) )


@@ -1156,7 +1158,7 @@ wxUint32 wxSocketBase::DoWrite(const void *buffer_, wxUint32 nbytes)
     {
         if ( m_impl->m_stream && !m_connected )
         {
     {
         if ( m_impl->m_stream && !m_connected )
         {

-            if ( (m_flags & (wxSOCKET_WAITALL|wxSOCKET_WAITALL_WRITE)) || !total )
+            if ( (m_flags & wxSOCKET_WAITALL_WRITE) || !total )

                 SetError(wxSOCKET_IOERR);
             break;
         }
                 SetError(wxSOCKET_IOERR);
             break;
         }


@@ -1166,7 +1168,7 @@ wxUint32 wxSocketBase::DoWrite(const void *buffer_, wxUint32 nbytes)
         {
             if ( m_impl->GetLastError() == wxSOCKET_WOULDBLOCK )
             {
         {
             if ( m_impl->GetLastError() == wxSOCKET_WOULDBLOCK )
             {

-                if ( m_flags & (wxSOCKET_NOWAIT|wxSOCKET_NOWAIT_WRITE) )
+                if ( m_flags & wxSOCKET_NOWAIT_WRITE )

                     break;
 
                 if ( !DoWaitWithTimeout(wxSOCKET_OUTPUT_FLAG) )
                     break;
 
                 if ( !DoWaitWithTimeout(wxSOCKET_OUTPUT_FLAG) )


@@ -1186,7 +1188,7 @@ wxUint32 wxSocketBase::DoWrite(const void *buffer_, wxUint32 nbytes)
 
         total += ret;
 
 
         total += ret;
 

-        if ( !(m_flags & (wxSOCKET_WAITALL|wxSOCKET_WAITALL_WRITE)) )
+        if ( !(m_flags & wxSOCKET_WAITALL_WRITE) )

             break;
 
         nbytes -= ret;
             break;
 
         nbytes -= ret;


@@ -1206,7 +1208,7 @@ wxSocketBase& wxSocketBase::WriteMsg(const void *buffer, wxUint32 nbytes)
 
     wxSocketWriteGuard write(this);
 
 
     wxSocketWriteGuard write(this);
 

-    wxSocketWaitModeChanger changeFlags(this, (wxSOCKET_WAITALL|wxSOCKET_WAITALL_WRITE));
+    wxSocketWaitModeChanger changeFlags(this, wxSOCKET_WAITALL_WRITE);

 
     msg.sig[0] = (unsigned char) 0xad;
     msg.sig[1] = (unsigned char) 0xde;
 
     msg.sig[0] = (unsigned char) 0xad;
     msg.sig[1] = (unsigned char) 0xde;