src\unix\gsocket.c

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/unix/gsockunx.h b/include/wx/unix/gsockunx.h
index 1c18fc1726397c14e71aebebd25508e2b7d41e20..741b27327c8626f99d9576880c95ecd5e97e74b2 100644 (file)
--- a/include/wx/unix/gsockunx.h
+++ b/include/wx/unix/gsockunx.h
@@ -73,18 +73,19 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size);
 
 /* Callbacks */
 
-void _GSocket_Enable(GSocket *socket, GSocketEvent event);
-void _GSocket_Disable(GSocket *socket, GSocketEvent event);
-void _GSocket_Detected_Read(GSocket *socket);
-void _GSocket_Detected_Write(GSocket *socket);
-
-void _GSocket_GUI_Init(GSocket *socket);
+bool _GSocket_GUI_Init(GSocket *socket);
 void _GSocket_GUI_Destroy(GSocket *socket);
+
 void _GSocket_Enable_Events(GSocket *socket);
 void _GSocket_Disable_Events(GSocket *socket);
 void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event);
 void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event);
 
+void _GSocket_Enable(GSocket *socket, GSocketEvent event);
+void _GSocket_Disable(GSocket *socket, GSocketEvent event);
+void _GSocket_Detected_Read(GSocket *socket);
+void _GSocket_Detected_Write(GSocket *socket);
+
 /* GAddress */
 
 GSocketError _GAddress_translate_from(GAddress *address,

diff --git a/src/gtk/gsockgtk.c b/src/gtk/gsockgtk.c
index 65a462a348f1304a1db3cd7fd5d580fc08922f60..8551a7d13b08fa921aa85563829e64fc2e690be4 100644 (file)
--- a/src/gtk/gsockgtk.c
+++ b/src/gtk/gsockgtk.c
@@ -31,7 +31,7 @@ void _GSocket_GDK_Input(gpointer data,
     _GSocket_Detected_Write(socket);
 }
 
-void _GSocket_GUI_Init(GSocket *socket)
+bool _GSocket_GUI_Init(GSocket *socket)
 {
   gint *m_id;
 
@@ -40,6 +40,8 @@ void _GSocket_GUI_Init(GSocket *socket)
 
   m_id[0] = -1;
   m_id[1] = -1;
+
+  return TRUE;
 }
 
 void _GSocket_GUI_Destroy(GSocket *socket)

diff --git a/src/gtk1/gsockgtk.c b/src/gtk1/gsockgtk.c
index 65a462a348f1304a1db3cd7fd5d580fc08922f60..8551a7d13b08fa921aa85563829e64fc2e690be4 100644 (file)
--- a/src/gtk1/gsockgtk.c
+++ b/src/gtk1/gsockgtk.c
@@ -31,7 +31,7 @@ void _GSocket_GDK_Input(gpointer data,
     _GSocket_Detected_Write(socket);
 }
 
-void _GSocket_GUI_Init(GSocket *socket)
+bool _GSocket_GUI_Init(GSocket *socket)
 {
   gint *m_id;
 
@@ -40,6 +40,8 @@ void _GSocket_GUI_Init(GSocket *socket)
 
   m_id[0] = -1;
   m_id[1] = -1;
+
+  return TRUE;
 }
 
 void _GSocket_GUI_Destroy(GSocket *socket)

diff --git a/src/motif/gsockmot.c b/src/motif/gsockmot.c
index 0898bd4512158c420143f23a3a68825a10ef1eaa..a5ec3d5c816d6d79df95c37e9efc3aecf501efbf 100644 (file)
--- a/src/motif/gsockmot.c
+++ b/src/motif/gsockmot.c
@@ -32,7 +32,7 @@ static void _GSocket_Motif_Output(XtPointer data, int *fid,
   _GSocket_Detected_Write(socket);
 }
 
-void _GSocket_GUI_Init(GSocket *socket)
+bool _GSocket_GUI_Init(GSocket *socket)
 {
   int i;
   int *m_id;
@@ -42,6 +42,8 @@ void _GSocket_GUI_Init(GSocket *socket)
 
   m_id[0] = -1;
   m_id[1] = -1;
+
+  return TRUE;
 }
 
 void _GSocket_GUI_Destroy(GSocket *socket)