deal with the situation when a (dynamic) event handler disconnects itself during...

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

diff --git a/src/x11/gsockx11.cpp b/src/x11/gsockx11.cpp
index e42fd4942b43b9a59c7eed0ed205927550cc4f5c..faf91d0e21fe4e982c782423d27f6e1d1eab5e49 100644 (file)
--- a/src/x11/gsockx11.cpp
+++ b/src/x11/gsockx11.cpp
@@ -1,12 +1,17 @@
 /* -------------------------------------------------------------------------
  * Project: GSocket (Generic Socket) for WX
 /* -------------------------------------------------------------------------
  * Project: GSocket (Generic Socket) for WX

- * Name:    gsockmot.c
+ * Name:    src/x11/gsockx11.cpp

  * Purpose: GSocket: X11 part
  * Licence: The wxWindows licence
  * CVSID:   $Id$
  * ------------------------------------------------------------------------- */
 
  * Purpose: GSocket: X11 part
  * Licence: The wxWindows licence
  * CVSID:   $Id$
  * ------------------------------------------------------------------------- */
 

-#include "wx/setup.h"
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if defined(__BORLANDC__)
+#pragma hdrstop
+#endif

 
 #if wxUSE_SOCKETS
 
 
 #if wxUSE_SOCKETS
 


@@ -31,27 +36,30 @@ extern "C" void wxUnregisterSocketCallback(int fd, wxSocketTableType socketType)
 static void _GSocket_X11_Input(int *fid, void* data)
 {
   GSocket *socket = (GSocket *)data;
 static void _GSocket_X11_Input(int *fid, void* data)
 {
   GSocket *socket = (GSocket *)data;

-  
-  socket->m_functions->Detected_Read(socket);
+
+  socket->Detected_Read();

 }
 
 static void _GSocket_X11_Output(int *fid, void* data)
 {
   GSocket *socket = (GSocket *)data;
 
 }
 
 static void _GSocket_X11_Output(int *fid, void* data)
 {
   GSocket *socket = (GSocket *)data;
 

-  socket->m_functions->Detected_Write(socket);
+  socket->Detected_Write();

 }
 
 }
 

-int _GSocket_GUI_Init(void)
+bool GSocketGUIFunctionsTableConcrete::CanUseEventLoop()
+{   return true; }
+
+bool GSocketGUIFunctionsTableConcrete::OnInit(void)

 {
     return 1;
 }
 
 {
     return 1;
 }
 

-void _GSocket_GUI_Cleanup(void)
+void GSocketGUIFunctionsTableConcrete::OnExit(void)

 {
 }
 
 {
 }
 

-int _GSocket_GUI_Init_Socket(GSocket *socket)
+bool GSocketGUIFunctionsTableConcrete::Init_Socket(GSocket *socket)

 {
   int *m_id;
 
 {
   int *m_id;
 


@@ -61,15 +69,15 @@ int _GSocket_GUI_Init_Socket(GSocket *socket)
   m_id[0] = -1;
   m_id[1] = -1;
 
   m_id[0] = -1;
   m_id[1] = -1;
 

-  return TRUE;
+  return true;

 }
 
 }
 

-void _GSocket_GUI_Destroy_Socket(GSocket *socket)
+void GSocketGUIFunctionsTableConcrete::Destroy_Socket(GSocket *socket)

 {
   free(socket->m_gui_dependent);
 }
 
 {
   free(socket->m_gui_dependent);
 }
 

-void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event)
+void GSocketGUIFunctionsTableConcrete::Install_Callback(GSocket *socket, GSocketEvent event)

 {
   int *m_id = (int *)(socket->m_gui_dependent);
   int c;
 {
   int *m_id = (int *)(socket->m_gui_dependent);
   int c;


@@ -107,7 +115,7 @@ void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event)
   }
 }
 
   }
 }
 

-void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event)
+void GSocketGUIFunctionsTableConcrete::Uninstall_Callback(GSocket *socket, GSocketEvent event)

 {
   int *m_id = (int *)(socket->m_gui_dependent);
   int c;
 {
   int *m_id = (int *)(socket->m_gui_dependent);
   int c;


@@ -132,16 +140,16 @@ void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event)
   m_id[c] = -1;
 }
 
   m_id[c] = -1;
 }
 

-void _GSocket_Enable_Events(GSocket *socket)
+void GSocketGUIFunctionsTableConcrete::Enable_Events(GSocket *socket)

 {
 {

-  _GSocket_Install_Callback(socket, GSOCK_INPUT);
-  _GSocket_Install_Callback(socket, GSOCK_OUTPUT);
+  Install_Callback(socket, GSOCK_INPUT);
+  Install_Callback(socket, GSOCK_OUTPUT);

 }
 
 }
 

-void _GSocket_Disable_Events(GSocket *socket)
+void GSocketGUIFunctionsTableConcrete::Disable_Events(GSocket *socket)

 {
 {

-  _GSocket_Uninstall_Callback(socket, GSOCK_INPUT);
-  _GSocket_Uninstall_Callback(socket, GSOCK_OUTPUT);
+  Uninstall_Callback(socket, GSOCK_INPUT);
+  Uninstall_Callback(socket, GSOCK_OUTPUT);

 }
 
 #else /* !wxUSE_SOCKETS */
 }
 
 #else /* !wxUSE_SOCKETS */