Switch to wxCHECK so the bad code isn't still executed if the assert

[wxWidgets.git] / src / x11 / gsockx11.c

diff --git a/src/x11/gsockx11.c b/src/x11/gsockx11.c
index fa848319955a26360314cea0d25fbe65bce9a8d4..ae2384234702935830fdc229d58a1ec14ad8b9ad 100644 (file)
--- a/src/x11/gsockx11.c
+++ b/src/x11/gsockx11.c
@@ -2,6 +2,7 @@
  * Project: GSocket (Generic Socket) for WX
  * Name:    gsockmot.c
  * Purpose: GSocket: X11 part
+ * Licence: The wxWindows licence
  * CVSID:   $Id$
  * ------------------------------------------------------------------------- */
 
@@ -14,7 +15,7 @@
 #include "wx/unix/gsockunx.h"
 
 /*
- * TODO: have these in a common header instead of being repeated
+ * FIXME: have these in a common header instead of being repeated
  * in evtloop.cpp and gsockx11.c
  */
 
@@ -30,18 +31,27 @@ void wxUnregisterSocketCallback(int fd, wxSocketTableType socketType);
 static void _GSocket_X11_Input(int *fid, void* data)
 {
   GSocket *socket = (GSocket *)data;
-
-  _GSocket_Detected_Read(socket);
+  
+  socket->m_functions->Detected_Read(socket);
 }
 
 static void _GSocket_X11_Output(int *fid, void* data)
 {
   GSocket *socket = (GSocket *)data;
 
-  _GSocket_Detected_Write(socket);
+  socket->m_functions->Detected_Write(socket);
+}
+
+int _GSocket_GUI_Init(void)
+{
+    return 1;
+}
+
+void _GSocket_GUI_Cleanup(void)
+{
 }
 
-int _GSocket_GUI_Init(GSocket *socket)
+int _GSocket_GUI_Init_Socket(GSocket *socket)
 {
   int *m_id;
 
@@ -54,7 +64,7 @@ int _GSocket_GUI_Init(GSocket *socket)
   return TRUE;
 }
 
-void _GSocket_GUI_Destroy(GSocket *socket)
+void _GSocket_GUI_Destroy_Socket(GSocket *socket)
 {
   free(socket->m_gui_dependent);
 }
@@ -76,8 +86,10 @@ void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event)
     default: return;
   }
 
-  //  if (m_id[c] != -1)
-  //    XtRemoveInput(m_id[c]);
+#if 0
+  if (m_id[c] != -1)
+      XtRemoveInput(m_id[c]);
+#endif /* 0 */
 
   if (c == 0)
   {