X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/948c96efa139d919e03cfa699d3d4a4258876d82..d9359369af901bf2146b5ad6575f7aae13389a15:/src/os2/gsockpm.cpp

diff --git a/src/os2/gsockpm.cpp b/src/os2/gsockpm.cpp
index 5effe2cb2a..d51227e843 100644
--- a/src/os2/gsockpm.cpp
+++ b/src/os2/gsockpm.cpp
@@ -6,18 +6,15 @@
  * CVSID:   $Id$
  * ------------------------------------------------------------------------- */
 
-#include "wx/setup.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #if wxUSE_SOCKETS
 
 #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
@@ -34,34 +31,6 @@ static void _GSocket_PM_Output(void *data)
     socket->Detected_Write();
 }
 
-bool GSocketGUIFunctionsTableConcrete::CanUseEventLoop()
-{   return true; }
-
-bool GSocketGUIFunctionsTableConcrete::OnInit(void)
-{
-    return 1;
-}
-
-void GSocketGUIFunctionsTableConcrete::OnExit(void)
-{
-}
-
-bool GSocketGUIFunctionsTableConcrete::Init_Socket(GSocket *socket)
-{
-    int *m_id;
-    socket->m_gui_dependent = (char *)malloc(sizeof(int)*2);
-    m_id = (int *)(socket->m_gui_dependent);
-
-    m_id[0] = -1;
-    m_id[1] = -1;
-    return true;
-}
-
-void GSocketGUIFunctionsTableConcrete::Destroy_Socket(GSocket *socket)
-{
-    free(socket->m_gui_dependent);
-}
-
 void GSocketGUIFunctionsTableConcrete::Install_Callback(GSocket *socket, GSocketEvent event)
 {
     int *m_id = (int *)(socket->m_gui_dependent);
@@ -80,17 +49,17 @@ void GSocketGUIFunctionsTableConcrete::Install_Callback(GSocket *socket, GSocket
     }
 
     if (m_id[c] != -1)
-        wxAppRemoveSocketHandler(m_id[c]);
+        wxTheApp->RemoveSocketHandler(m_id[c]);
 
     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
     {
-	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);
     }
 }
 
@@ -100,14 +69,14 @@ void GSocketGUIFunctionsTableConcrete::Uninstall_Callback(GSocket *socket, GSock
     int c;
     switch (event)
     {
-	case GSOCK_LOST:       /* fall-through */
-	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_LOST:       /* fall-through */
+        case GSOCK_INPUT:      c = 0; break;
+        case GSOCK_OUTPUT:     c = 1; break;
+        case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break;
+        default: return;
     }
     if (m_id[c] != -1)
-        wxAppRemoveSocketHandler(m_id[c]);
+        wxTheApp->RemoveSocketHandler(m_id[c]);
 
     m_id[c] = -1;
 }