Applied patch #876969: "Fixes to Borland warnings"; Minor code cleanup.

[wxWidgets.git] / src / motif / gsockmot.c

diff --git a/src/motif/gsockmot.c b/src/motif/gsockmot.c
index 0898bd4512158c420143f23a3a68825a10ef1eaa..e4904f6610c70c0852149e2d271a89f01bdf1638 100644 (file)
--- a/src/motif/gsockmot.c
+++ b/src/motif/gsockmot.c
@@ -3,6 +3,7 @@
  * Name:    gsockmot.c
  * Purpose: GSocket: Motif part
  * CVSID:   $Id$
  * Name:    gsockmot.c
  * Purpose: GSocket: Motif part
  * CVSID:   $Id$

+ * Licence: The wxWindows licence

  * ------------------------------------------------------------------------- */
 
 #include "wx/setup.h"
  * ------------------------------------------------------------------------- */
 
 #include "wx/setup.h"


@@ -21,7 +22,7 @@ static void _GSocket_Motif_Input(XtPointer data, int *fid,
 {
   GSocket *socket = (GSocket *)data;
 
 {
   GSocket *socket = (GSocket *)data;
 

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

 }
 
 static void _GSocket_Motif_Output(XtPointer data, int *fid,
 }
 
 static void _GSocket_Motif_Output(XtPointer data, int *fid,


@@ -29,12 +30,20 @@ static void _GSocket_Motif_Output(XtPointer data, int *fid,
 {
   GSocket *socket = (GSocket *)data;
 
 {
   GSocket *socket = (GSocket *)data;
 

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

 }
 
 }
 

-void _GSocket_GUI_Init(GSocket *socket)
+int _GSocket_GUI_Init(void)
+{
+    return 1;
+}
+
+void _GSocket_GUI_Cleanup(void)
+{
+}
+
+int _GSocket_GUI_Init_Socket(GSocket *socket)

 {
 {

-  int i;

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


@@ -42,9 +51,11 @@ 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_Socket(GSocket *socket)

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