Commented out code that seems to produce choice/combobox height problems

[wxWidgets.git] / src / msw / gsocket.c

diff --git a/src/msw/gsocket.c b/src/msw/gsocket.c
index 9bfb770422f62752847e9148fc8f011d80f2857f..86cfc7b913e4a03e8c2c96823f364e834fabc3b3 100644 (file)
--- a/src/msw/gsocket.c
+++ b/src/msw/gsocket.c
@@ -25,12 +25,22 @@
     * warning: unreferenced formal parameter.
     */
 #  pragma warning(disable:4100)
     * warning: unreferenced formal parameter.
     */
 #  pragma warning(disable:4100)

+
+#ifdef __WXWINCE__
+    /*
+       "unreferenced inline function has been removed": this is not
+       suppressed by push above as it is given at the end of the
+       compilation unit
+     */
+#   pragma warning(disable:4514)
+#endif /* __WXWINCE__ */

 #endif /* _MSC_VER */
 
 #include <winsock.h>
 
 #ifndef __GSOCKET_STANDALONE__
 #endif /* _MSC_VER */
 
 #include <winsock.h>
 
 #ifndef __GSOCKET_STANDALONE__

-#  include "wx/setup.h"
+#   include "wx/platform.h"
+#   include "wx/setup.h"

 #endif
 
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 #endif
 
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)


@@ -375,6 +385,11 @@ GSocketError GSocket_SetServer(GSocket *sck)
   ioctlsocket(sck->m_fd, FIONBIO, (u_long FAR *) &arg);
   _GSocket_Enable_Events(sck);
 
   ioctlsocket(sck->m_fd, FIONBIO, (u_long FAR *) &arg);
   _GSocket_Enable_Events(sck);
 

+  /* allow a socket to re-bind if the socket is in the TIME_WAIT
+     state after being previously closed.
+   */
+  setsockopt(sck->m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(u_long));
+

   /* Bind to the local address,
    * retrieve the actual address bound,
    * and listen up to 5 connections.
   /* Bind to the local address,
    * retrieve the actual address bound,
    * and listen up to 5 connections.


@@ -758,15 +773,15 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
     fd_set readfds;
     fd_set writefds;
     fd_set exceptfds;
     fd_set readfds;
     fd_set writefds;
     fd_set exceptfds;

-    static const struct timeval tv = { 0, 0 };
-
+    

     assert(socket != NULL);
 
     FD_ZERO(&readfds);
     FD_ZERO(&writefds);
     FD_ZERO(&exceptfds);
     FD_SET(socket->m_fd, &readfds);
     assert(socket != NULL);
 
     FD_ZERO(&readfds);
     FD_ZERO(&writefds);
     FD_ZERO(&exceptfds);
     FD_SET(socket->m_fd, &readfds);

-    FD_SET(socket->m_fd, &writefds);
+       if (flags & GSOCK_OUTPUT_FLAG || flags & GSOCK_CONNECTION_FLAG)
+      FD_SET(socket->m_fd, &writefds);

     FD_SET(socket->m_fd, &exceptfds);
 
     /* Check 'sticky' CONNECTION flag first */
     FD_SET(socket->m_fd, &exceptfds);
 
     /* Check 'sticky' CONNECTION flag first */


@@ -783,7 +798,8 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
     }
 
     /* Try select now */
     }
 
     /* Try select now */

-    if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds, &tv) <= 0)
+    if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds,
+           &socket->m_timeout) <= 0)

     {
       /* What to do here? */
       return (result & flags);
     {
       /* What to do here? */
       return (result & flags);


@@ -794,7 +810,7 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
     {
       char c;
 
     {
       char c;
 

-      if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0)
+      if (!socket->m_stream || recv(socket->m_fd, &c, 1, MSG_PEEK) > 0)

       {
         result |= GSOCK_INPUT_FLAG;
       }
       {
         result |= GSOCK_INPUT_FLAG;
       }


@@ -1345,7 +1361,7 @@ GSocketError GAddress_INET_SetHostAddress(GAddress *address,
   CHECK_ADDRESS(address, INET);
 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
   CHECK_ADDRESS(address, INET);
 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);

-  addr->s_addr = hostaddr;
+  addr->s_addr = htonl(hostaddr);;

 
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }


@@ -1434,7 +1450,7 @@ unsigned long GAddress_INET_GetHostAddress(GAddress *address)
 
   addr = (struct sockaddr_in *)address->m_addr;
 
 
   addr = (struct sockaddr_in *)address->m_addr;
 

-  return addr->sin_addr.s_addr;
+  return ntohl(addr->sin_addr.s_addr);

 }
 
 unsigned short GAddress_INET_GetPort(GAddress *address)
 }
 
 unsigned short GAddress_INET_GetPort(GAddress *address)