Try to better revert to the original string value in wxBitmapComboBox::RecreateControl()

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

diff --git a/src/os2/sockpm.cpp b/src/os2/sockpm.cpp
index 540f647a36c5af8ba5fe752e5538476974a14f0c..8aa2c2f0080cf210074c6d8a06dc72420704dabf 100644 (file)
--- a/src/os2/sockpm.cpp
+++ b/src/os2/sockpm.cpp
@@ -23,22 +23,24 @@
 
 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)
 {
-    wxSocketImpl *handler = static_cast<wxSocketImpl *>(data);
+    wxFDIOHandler *handler = static_cast<wxSocketImplUnix *>(data);
 
     handler->OnWriteWaiting();
 }
 
-class PMSocketManager : public wxSocketInputBasedManager
+class PMFDIOManager : public wxFDIOManager
 {
 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,
@@ -48,15 +50,18 @@ public:
                                             wxSocket_PM_Input, handler);
     }
 
-    virtual void RemoveInput(int fd)
+    virtual void
+    RemoveInput(wxFDIOHandler * WXUNUSED(handler),
+                int fd,
+                wxFDIOManager::Direction WXUNUSED(dir))
     {
         wxTheApp->RemoveSocketHandler(fd);
     }
 };
 
-wxSocketManager *wxGUIAppTraits::GetSocketManager()
+wxFDIOManager *wxGUIAppTraits::GetFDIOManager()
 {
-    static PMSocketManager s_manager;
+    static PMFDIOManager s_manager;
     return &s_manager;
 }