X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1ad0f6be8529b118be780609e849656523f0c3b..cf283a470ab3eb4bc69959e3b5ae0edf30337fa5:/src/os2/gsockpm.cpp?ds=sidebyside diff --git a/src/os2/gsockpm.cpp b/src/os2/gsockpm.cpp index 83a916149c..c0281d2ac1 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 #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 @@ -54,7 +51,7 @@ bool GSocketGUIFunctionsTableConcrete::Init_Socket(GSocket *socket) m_id[0] = -1; m_id[1] = -1; - return TRUE; + return true; } void GSocketGUIFunctionsTableConcrete::Destroy_Socket(GSocket *socket) @@ -80,17 +77,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 +97,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; }