made GetColourFromGTKWidget() more general, it is now used for all colours

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

diff --git a/src/msw/gsockmsw.c b/src/msw/gsockmsw.c
index b8a3bda68329918916693a48616506ee689dcf75..60d54c682c1395e96269dc8bda9de8e48a0ae646 100644 (file)
--- a/src/msw/gsockmsw.c
+++ b/src/msw/gsockmsw.c
@@ -11,7 +11,16 @@
  * PLEASE don't put C++ comments here - this is a C source file.
  */
 
  * PLEASE don't put C++ comments here - this is a C source file.
  */
 

+/* including rasasync.h (included from windows.h itself included from
+ * wx/setup.h and/or winsock.h results in this warning for
+ * RPCNOTIFICATION_ROUTINE
+ */
+#ifdef _MSC_VER
+#  pragma warning(disable:4115) /* named type definition in parentheses */
+#endif
+

 #ifndef __GSOCKET_STANDALONE__
 #ifndef __GSOCKET_STANDALONE__

+#include "wx/defs.h"

 #include "wx/setup.h"
 #endif
 
 #include "wx/setup.h"
 #endif
 


@@ -30,7 +39,7 @@
 #include "gsocket.h"
 
 /* If not using wxWindows, a global var called hInst must
 #include "gsocket.h"
 
 /* If not using wxWindows, a global var called hInst must

- * be available and it must containt the app's instance
+ * be available and it must contain the app's instance

  * handle.
  */
 #define INSTANCE hInst
  * handle.
  */
 #define INSTANCE hInst


@@ -43,8 +52,13 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <ctype.h>

+

 #include <winsock.h>
 
 #include <winsock.h>
 

+#ifdef _MSC_VER
+#  pragma warning(default:4115) /* named type definition in parentheses */
+#endif
+

 #define CLASSNAME  "_GSocket_Internal_Window_Class"
 #define WINDOWNAME "_GSocket_Internal_Window_Name"
 
 #define CLASSNAME  "_GSocket_Internal_Window_Class"
 #define WINDOWNAME "_GSocket_Internal_Window_Name"
 


@@ -69,7 +83,7 @@ static int firstAvailable;
 
 /* Global initializers */
 
 
 /* Global initializers */
 

-bool GSocket_Init(void)
+int GSocket_Init(void)

 {
   WSADATA wsaData;
   WNDCLASS winClass;
 {
   WSADATA wsaData;
   WNDCLASS winClass;


@@ -123,7 +137,7 @@ void GSocket_Cleanup(void)
 
 /* Per-socket GUI initialization / cleanup */
 
 
 /* Per-socket GUI initialization / cleanup */
 

-bool _GSocket_GUI_Init(GSocket *socket)
+int _GSocket_GUI_Init(GSocket *socket)

 {
   int i;
 
 {
   int i;
 


@@ -265,7 +279,7 @@ void _GSocket_Disable_Events(GSocket *socket)
 
 #else /* !wxUSE_SOCKETS */
 
 
 #else /* !wxUSE_SOCKETS */
 

-/* 
+/*

  * Translation unit shouldn't be empty, so include this typedef to make the
  * compiler (VC++ 6.0, for example) happy
  */
  * Translation unit shouldn't be empty, so include this typedef to make the
  * compiler (VC++ 6.0, for example) happy
  */