Updated font dialog constructors to use a reference to the font data

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

diff --git a/src/msw/gsockmsw.c b/src/msw/gsockmsw.c
index 0d9c591cb683850940341e3b85d9b8c3c9520fd1..32131c214a0c58f32feffafb2273eca237a9b1ef 100644 (file)
--- a/src/msw/gsockmsw.c
+++ b/src/msw/gsockmsw.c
@@ -55,12 +55,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
-

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


@@ -194,7 +188,7 @@ LRESULT CALLBACK _GSocket_Internal_WinProc(HWND hWnd,
   {
     EnterCriticalSection(&critical);
     socket = socketList[(uMsg - WM_USER)];
   {
     EnterCriticalSection(&critical);
     socket = socketList[(uMsg - WM_USER)];

-    event = -1;
+    event = (GSocketEvent) -1;

     cback = NULL;
     data = NULL;
 
     cback = NULL;
     data = NULL;