UMADrawControl is not to be used anymore

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

diff --git a/src/motif/gsockmot.cpp b/src/motif/gsockmot.cpp
index d7ed9ebf908c1e5f77e945772dd33247cfd9e3e7..e4904f6610c70c0852149e2d271a89f01bdf1638 100644 (file)
--- a/src/motif/gsockmot.cpp
+++ b/src/motif/gsockmot.cpp
@@ -1,9 +1,10 @@
-// -------------------------------------------------------------------------
-// Project: GSocket (Generic Socket) for WX
-// Name:    gsockmot.cpp
-// Purpose: GSocket: Motif part
-// CVSID:   $Id$
-// -------------------------------------------------------------------------
+/* -------------------------------------------------------------------------
+ * Project: GSocket (Generic Socket) for WX
+ * Name:    gsockmot.c
+ * Purpose: GSocket: Motif part
+ * CVSID:   $Id$
+ * Licence: The wxWindows licence
+ * ------------------------------------------------------------------------- */

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


@@ -12,17 +13,16 @@
 #include <stdlib.h>
 #include <X11/Intrinsic.h>
 #include "wx/gsocket.h"
 #include <stdlib.h>
 #include <X11/Intrinsic.h>
 #include "wx/gsocket.h"

-#include "wx/app.h"

 #include "wx/unix/gsockunx.h"
 
 #include "wx/unix/gsockunx.h"
 

-#define wxAPP_CONTEXT ((XtAppContext)wxTheApp->GetAppContext())
+extern 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;
 

-  _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,


@@ -30,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);


@@ -43,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);
 }


@@ -61,7 +71,7 @@ void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event)
   switch (event)
   {
     case GSOCK_LOST:       /* fall-through */
   switch (event)
   {
     case GSOCK_LOST:       /* fall-through */

-    case GSOCK_INPUT:      c = 0; break; 
+    case GSOCK_INPUT:      c = 0; break;

     case GSOCK_OUTPUT:     c = 1; break;
     case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break;
     default: return;
     case GSOCK_OUTPUT:     c = 1; break;
     case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break;
     default: return;


@@ -72,14 +82,14 @@ void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event)
 
   if (c == 0)
   {
 
   if (c == 0)
   {

-     m_id[0] = XtAppAddInput(wxAPP_CONTEXT, socket->m_fd,
+     m_id[0] = XtAppAddInput(wxGetAppContext(), socket->m_fd,

                              (XtPointer *)XtInputReadMask,
                              (XtInputCallbackProc) _GSocket_Motif_Input,
                              (XtPointer) socket);
   }
   else
   {
                              (XtPointer *)XtInputReadMask,
                              (XtInputCallbackProc) _GSocket_Motif_Input,
                              (XtPointer) socket);
   }
   else
   {

-     m_id[1] = XtAppAddInput(wxAPP_CONTEXT, socket->m_fd,
+     m_id[1] = XtAppAddInput(wxGetAppContext(), socket->m_fd,

                              (XtPointer *)XtInputWriteMask,
                              (XtInputCallbackProc) _GSocket_Motif_Output,
                              (XtPointer) socket);
                              (XtPointer *)XtInputWriteMask,
                              (XtInputCallbackProc) _GSocket_Motif_Output,
                              (XtPointer) socket);


@@ -94,7 +104,7 @@ void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event)
   switch (event)
   {
     case GSOCK_LOST:       /* fall-through */
   switch (event)
   {
     case GSOCK_LOST:       /* fall-through */

-    case GSOCK_INPUT:      c = 0; break; 
+    case GSOCK_INPUT:      c = 0; break;

     case GSOCK_OUTPUT:     c = 1; break;
     case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break;
     default: return;
     case GSOCK_OUTPUT:     c = 1; break;
     case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break;
     default: return;


@@ -118,4 +128,9 @@ void _GSocket_Disable_Events(GSocket *socket)
   _GSocket_Uninstall_Callback(socket, GSOCK_OUTPUT);
 }
 
   _GSocket_Uninstall_Callback(socket, GSOCK_OUTPUT);
 }
 

-#endif // wxUSE_SOCKETS
+#else /* !wxUSE_SOCKETS */
+
+/* some compilers don't like having empty source files */
+static int wxDummyGsockVar = 0;
+
+#endif /* wxUSE_SOCKETS/!wxUSE_SOCKETS */