Applied part of [ 1575767 ] Init/size/check fixes for sockets

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

diff --git a/src/os2/gsockpm.cpp b/src/os2/gsockpm.cpp
index 5effe2cb2ab9c1bfd34be0eba21cffeea9bbc3c5..c0281d2ac1d36dca240ee2b9475ca47e6777e079 100644 (file)
--- a/src/os2/gsockpm.cpp
+++ b/src/os2/gsockpm.cpp
@@ -6,18 +6,15 @@
  * CVSID:   $Id$
  * ------------------------------------------------------------------------- */
 
  * 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"
 
 #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
 
 #define wxSockReadMask  0x01
 #define wxSockWriteMask 0x02


@@ -80,17 +77,17 @@ void GSocketGUIFunctionsTableConcrete::Install_Callback(GSocket *socket, GSocket
     }
 
     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);

     }
 }
 
     }
 }
 


@@ -100,14 +97,14 @@ void GSocketGUIFunctionsTableConcrete::Uninstall_Callback(GSocket *socket, GSock
     int c;
     switch (event)
     {
     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)
     }
     if (m_id[c] != -1)

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

 
     m_id[c] = -1;
 }
 
     m_id[c] = -1;
 }