reverted Chris' MSW additions patch (we should use IPC, not Windows-only functions...

[wxWidgets.git] / src / gtk / gsockgtk.c

diff --git a/src/gtk/gsockgtk.c b/src/gtk/gsockgtk.c
index 5bfb166c1596475e5f62bb6dfcbfaca2685096e8..3202c6b42139cfae3f9a269aef5b5db625938997 100644 (file)
--- a/src/gtk/gsockgtk.c
+++ b/src/gtk/gsockgtk.c
@@ -11,8 +11,10 @@
 
 #include <stdlib.h>
 #include <stdio.h>
 
 #include <stdlib.h>
 #include <stdio.h>

-#include "gdk/gdk.h"
-#include "glib.h"
+
+#include <gdk/gdk.h>
+#include <glib.h>
+

 #include "wx/gsocket.h"
 #include "wx/unix/gsockunx.h"
 
 #include "wx/gsocket.h"
 #include "wx/unix/gsockunx.h"
 


@@ -29,9 +31,8 @@ void _GSocket_GDK_Input(gpointer data,
     _GSocket_Detected_Write(socket);
 }
 
     _GSocket_Detected_Write(socket);
 }
 

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

 {
 {

-  int i;

   gint *m_id;
 
   socket->m_gui_dependent = (char *)malloc(sizeof(gint)*2);
   gint *m_id;
 
   socket->m_gui_dependent = (char *)malloc(sizeof(gint)*2);


@@ -39,6 +40,8 @@ void _GSocket_GUI_Init(GSocket *socket)
 
   m_id[0] = -1;
   m_id[1] = -1;
 
   m_id[0] = -1;
   m_id[1] = -1;

+
+  return TRUE;

 }
 
 void _GSocket_GUI_Destroy(GSocket *socket)
 }
 
 void _GSocket_GUI_Destroy(GSocket *socket)


@@ -57,7 +60,7 @@ void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event)
   switch (event)
   {
     case GSOCK_LOST:       /* fall-through */
   switch (event)
   {
     case GSOCK_LOST:       /* fall-through */

-    case GSOCK_INPUT:      c = 0; break; 
+    case GSOCK_INPUT:      c = 0; break;

     case GSOCK_OUTPUT:     c = 1; break;
     case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break;
     default: return;
     case GSOCK_OUTPUT:     c = 1; break;
     case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break;
     default: return;


@@ -80,7 +83,7 @@ void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event)
   switch (event)
   {
     case GSOCK_LOST:       /* fall-through */
   switch (event)
   {
     case GSOCK_LOST:       /* fall-through */

-    case GSOCK_INPUT:      c = 0; break; 
+    case GSOCK_INPUT:      c = 0; break;

     case GSOCK_OUTPUT:     c = 1; break;
     case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break;
     default: return;
     case GSOCK_OUTPUT:     c = 1; break;
     case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break;
     default: return;


@@ -104,4 +107,9 @@ void _GSocket_Disable_Events(GSocket *socket)
   _GSocket_Uninstall_Callback(socket, GSOCK_OUTPUT);
 }
 
   _GSocket_Uninstall_Callback(socket, GSOCK_OUTPUT);
 }
 

-#endif /* wxUSE_SOCKETS */
+#else /* !wxUSE_SOCKETS */
+
+/* some compilers don't like having empty source files */
+static int wxDummyGsockVar = 0;
+
+#endif /* wxUSE_SOCKETS/!wxUSE_SOCKETS */