fixing osx_carbon

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

diff --git a/src/os2/sockpm.cpp b/src/os2/sockpm.cpp
index 540f647a36c5af8ba5fe752e5538476974a14f0c..a06ad87081a48f13eea15ca31410780be7ef2961 100644 (file)
--- a/src/os2/sockpm.cpp
+++ b/src/os2/sockpm.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        os2/sockpm.cpp
+// Name:        src/os2/sockpm.cpp

 // Purpose:     implementation of OS-2-specific handler event handling
 // Author:      Guilhem Lavaux, Vadim Zeitlin
 // Created:     1999
 // Purpose:     implementation of OS-2-specific handler event handling
 // Author:      Guilhem Lavaux, Vadim Zeitlin
 // Created:     1999


@@ -23,22 +23,24 @@
 
 static void wxSocket_PM_Input(void *data)
 {
 
 static void wxSocket_PM_Input(void *data)
 {

-    wxSocketImpl *handler = static_cast<wxSocketImpl *>(data);
+    wxFDIOHandler *handler = static_cast<wxSocketImplUnix *>(data);

 
     handler->OnReadWaiting();
 }
 
 static void wxSocket_PM_Output(void *data)
 {
 
     handler->OnReadWaiting();
 }
 
 static void wxSocket_PM_Output(void *data)
 {

-    wxSocketImpl *handler = static_cast<wxSocketImpl *>(data);
+    wxFDIOHandler *handler = static_cast<wxSocketImplUnix *>(data);

 
     handler->OnWriteWaiting();
 }
 
 
     handler->OnWriteWaiting();
 }
 

-class PMSocketManager : public wxSocketInputBasedManager
+class PMFDIOManager : public wxFDIOManager

 {
 public:
 {
 public:

-    virtual int AddInput(wxSocketImpl *handler, int fd, SocketDir d)
+    virtual int AddInput(wxFDIOHandler *handler,
+                         int fd,
+                         wxFDIOManager::Direction d)

     {
       if (d == FD_OUTPUT)
           return wxTheApp->AddSocketHandler(fd, wxSockWriteMask,
     {
       if (d == FD_OUTPUT)
           return wxTheApp->AddSocketHandler(fd, wxSockWriteMask,


@@ -48,15 +50,18 @@ public:
                                             wxSocket_PM_Input, handler);
     }
 
                                             wxSocket_PM_Input, handler);
     }
 

-    virtual void RemoveInput(int fd)
+    virtual void
+    RemoveInput(wxFDIOHandler * WXUNUSED(handler),
+                int fd,
+                wxFDIOManager::Direction WXUNUSED(dir))

     {
         wxTheApp->RemoveSocketHandler(fd);
     }
 };
 
     {
         wxTheApp->RemoveSocketHandler(fd);
     }
 };
 

-wxSocketManager *wxGUIAppTraits::GetSocketManager()
+wxFDIOManager *wxGUIAppTraits::GetFDIOManager()

 {
 {

-    static PMSocketManager s_manager;
+    static PMFDIOManager s_manager;

     return &s_manager;
 }
 
     return &s_manager;
 }