GTK 1.2 compilo/link error.

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

diff --git a/src/os2/gsockpm.cpp b/src/os2/gsockpm.cpp
index 83a916149ce6126c3c087e1546355ef641d2b6fe..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"
-
-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 +50,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 +76,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);
     }
 }
 
@@ -107,7 +103,7 @@ void GSocketGUIFunctionsTableConcrete::Uninstall_Callback(GSocket *socket, GSock
        default: return;
     }
     if (m_id[c] != -1)
-        wxAppRemoveSocketHandler(m_id[c]);
+        wxTheApp->RemoveSocketHandler(m_id[c]);
 
     m_id[c] = -1;
 }