[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

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

- * Licence: The wxWidgets licence
+ * Licence: The wxWindows licence

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


@@ -15,14 +15,14 @@
 #include "wx/gsocket.h"
 #include "wx/unix/gsockunx.h"
 
 #include "wx/gsocket.h"
 #include "wx/unix/gsockunx.h"
 

-extern XtAppContext wxGetAppContext();
+extern "C" XtAppContext wxGetAppContext();

 
 static void _GSocket_Motif_Input(XtPointer data, int *fid,
                                  XtInputId *id)
 {
   GSocket *socket = (GSocket *)data;
 
 
 static void _GSocket_Motif_Input(XtPointer data, int *fid,
                                  XtInputId *id)
 {
   GSocket *socket = (GSocket *)data;
 

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

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


@@ -30,19 +30,22 @@ static void _GSocket_Motif_Output(XtPointer data, int *fid,
 {
   GSocket *socket = (GSocket *)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;
 


@@ -52,15 +55,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;


@@ -96,7 +99,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;


@@ -116,16 +119,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 */