prevent the parent window from losing activation when a popup is shown

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

diff --git a/src/msw/gsocket.c b/src/msw/gsocket.c
index fc5f87c83dd05b7cfb7a571a02d3ffa4745c66f2..4490c43ada30305c9d7d9a9d9ad50393b83a30e3 100644 (file)
--- a/src/msw/gsocket.c
+++ b/src/msw/gsocket.c
@@ -60,12 +60,6 @@
 
 #include <winsock.h>
 
 
 #include <winsock.h>
 

-/* don't use C++ TRUE/FALSE definition which we get from wx/defs.h */
-#undef TRUE
-#undef FALSE
-#define TRUE 1
-#define FALSE 0
-

 /* if we use configure for MSW SOCKLEN_T will be already defined */
 #ifndef SOCKLEN_T
 #  define SOCKLEN_T int
 /* if we use configure for MSW SOCKLEN_T will be already defined */
 #ifndef SOCKLEN_T
 #  define SOCKLEN_T int


@@ -519,7 +513,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
         /* sck->m_error is set in _GSocket_Connect_Timeout */
       }
 
         /* sck->m_error is set in _GSocket_Connect_Timeout */
       }
 

-      return err;
+      return (GSocketError) err;

     }
 
     /* If connect failed with EWOULDBLOCK and the GSocket object
     }
 
     /* If connect failed with EWOULDBLOCK and the GSocket object