Committing in .

[wxWidgets.git] / src / os2 / gsockpm.cpp

diff --git a/src/os2/gsockpm.cpp b/src/os2/gsockpm.cpp
index c210cb0b2893b62e9e6585a06b05e15beb10e14d..e7af117f0560250ad2023d85a62a440f7a255dff 100644 (file)
--- a/src/os2/gsockpm.cpp
+++ b/src/os2/gsockpm.cpp
@@ -13,11 +13,7 @@
 #include <stdlib.h>
 #include "wx/unix/gsockunx.h"
 #include "wx/gsocket.h"
 #include <stdlib.h>
 #include "wx/unix/gsockunx.h"
 #include "wx/gsocket.h"

-
-extern int wxAppAddSocketHandler(int handle, int mask,
-                                void (*callback)(void*), void * gsock);
-
-extern void wxAppRemoveSocketHandler(int handle);
+#include "wx/app.h"

 
 #define wxSockReadMask  0x01
 #define wxSockWriteMask 0x02
 
 #define wxSockReadMask  0x01
 #define wxSockWriteMask 0x02


@@ -25,25 +21,28 @@ extern void wxAppRemoveSocketHandler(int handle);
 static void _GSocket_PM_Input(void *data)
 {
     GSocket *socket = (GSocket *) data;
 static void _GSocket_PM_Input(void *data)
 {
     GSocket *socket = (GSocket *) data;

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

 }
 
 static void _GSocket_PM_Output(void *data)
 {
     GSocket *socket = (GSocket *) data;
 }
 
 static void _GSocket_PM_Output(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;
     socket->m_gui_dependent = (char *)malloc(sizeof(int)*2);
 {
     int *m_id;
     socket->m_gui_dependent = (char *)malloc(sizeof(int)*2);


@@ -51,15 +50,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;


@@ -77,21 +76,21 @@ void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event)
     }
 
     if (m_id[c] != -1)
     }
 
     if (m_id[c] != -1)

-        wxAppRemoveSocketHandler(m_id[c]);
+        wxTheApp->RemoveSocketHandler(m_id[c]);

 
     if (c == 0)
     {
 
     if (c == 0)
     {

-       m_id[0] = wxAppAddSocketHandler(socket->m_fd, wxSockReadMask,
-                                       _GSocket_PM_Input, (void *)socket);
+        m_id[0] = wxTheApp->AddSocketHandler(socket->m_fd, wxSockReadMask,
+                                             _GSocket_PM_Input, (void *)socket);

     }
     else
     {
     }
     else
     {

-       m_id[1] = wxAppAddSocketHandler(socket->m_fd, wxSockWriteMask,
-                                       _GSocket_PM_Output, (void *)socket);
+        m_id[1] = wxTheApp->AddSocketHandler(socket->m_fd, wxSockWriteMask,
+                                             _GSocket_PM_Output, (void *)socket);

     }
 }
 
     }
 }
 

-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;


@@ -104,21 +103,21 @@ void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event)
        default: return;
     }
     if (m_id[c] != -1)
        default: return;
     }
     if (m_id[c] != -1)

-        wxAppRemoveSocketHandler(m_id[c]);
+        wxTheApp->RemoveSocketHandler(m_id[c]);

 
     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 */