X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/483249fc1a9ab952054af5efa616ff9fb4151c9e..b2fcfd94d34b25233a0bf14f3ac388ae747bccb7:/src/gtk1/gsockgtk.c

diff --git a/src/gtk1/gsockgtk.c b/src/gtk1/gsockgtk.c
index 5bfb166c15..d7f4657741 100644
--- a/src/gtk1/gsockgtk.c
+++ b/src/gtk1/gsockgtk.c
@@ -2,6 +2,7 @@
  * Project: GSocket (Generic Socket) for WX
  * Name:    gsockgtk.c
  * Purpose: GSocket: GTK part
+ * Licence: The wxWidgets licence
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
@@ -9,10 +10,13 @@
 
 #if wxUSE_SOCKETS
 
+#include <assert.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"
 
@@ -24,14 +28,22 @@ void _GSocket_GDK_Input(gpointer data,
   GSocket *socket = (GSocket *)data;
 
   if (condition & GDK_INPUT_READ)
-    _GSocket_Detected_Read(socket);
+    socket->m_functions->Detected_Read(socket);
   if (condition & GDK_INPUT_WRITE)
-    _GSocket_Detected_Write(socket);
+    socket->m_functions->Detected_Write(socket);
+}
+
+int _GSocket_GUI_Init(void)
+{
+    return 1;
 }
 
-void _GSocket_GUI_Init(GSocket *socket)
+void _GSocket_GUI_Cleanup(void)
+{
+}
+    
+int _GSocket_GUI_Init_Socket(GSocket *socket)
 {
-  int i;
   gint *m_id;
 
   socket->m_gui_dependent = (char *)malloc(sizeof(gint)*2);
@@ -39,9 +51,11 @@ void _GSocket_GUI_Init(GSocket *socket)
 
   m_id[0] = -1;
   m_id[1] = -1;
+
+  return TRUE;
 }
 
-void _GSocket_GUI_Destroy(GSocket *socket)
+void _GSocket_GUI_Destroy_Socket(GSocket *socket)
 {
   free(socket->m_gui_dependent);
 }
@@ -57,7 +71,7 @@ void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event)
   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;
@@ -77,10 +91,12 @@ void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event)
   gint *m_id = (gint *)(socket->m_gui_dependent);
   int c;
 
+  assert( m_id != NULL );
+
   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;
@@ -104,4 +120,9 @@ void _GSocket_Disable_Events(GSocket *socket)
   _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 */