make wxSocketImplUnix inherit from wxFDIOHandler as they're used for almost the same...

[wxWidgets.git] / src / common / socketiohandler.cpp

diff --git a/src/common/socketiohandler.cpp b/src/common/socketiohandler.cpp
index baa797a74e85c173e26376adde21f989bd37558d..97af802a370fe28c11c25e6e840ebee047f824fe 100644 (file)
--- a/src/common/socketiohandler.cpp
+++ b/src/common/socketiohandler.cpp
@@ -23,8 +23,7 @@
 #if wxUSE_SOCKETS && wxUSE_SELECT_DISPATCHER
 
 #include "wx/apptrait.h"
-#include "wx/unix/private.h"
-#include "wx/private/socketiohandler.h"
+#include "wx/private/socket.h"
 
 // ============================================================================
 // implementation
@@ -40,15 +39,14 @@ public:
     wxSocketImplFDIO(wxSocketBase& wxsocket)
         : wxSocketImplUnix(wxsocket)
     {
-        m_handler = NULL;
     }
 
-    virtual ~wxSocketImplFDIO()
-    {
-        delete m_handler;
-    }
+    int GetFlags() const { return m_flags; }
+    void RemoveFlag(wxFDIODispatcherEntryFlags flag) { m_flags &= ~flag; }
+    void AddFlag(wxFDIODispatcherEntryFlags flag) { m_flags |= flag; }
 
-    wxSocketIOHandler *m_handler;
+private:
+    int m_flags;
 };
 
 // ----------------------------------------------------------------------------
@@ -83,34 +81,18 @@ void wxSocketSelectManager::Install_Callback(wxSocketImpl *socket_,
     if ( !dispatcher )
         return;
 
-    wxSocketIOHandler *& handler = socket->m_handler;
+    FD(socket, d) = fd;
 
-    // we should register the new handlers but modify the existing ones in place
-    bool registerHandler;
-    if ( handler )
-    {
-        registerHandler = false;
-    }
-    else // no existing handler
-    {
-        registerHandler = true;
-        handler = new wxSocketIOHandler(socket);
-    }
+    // register it when it's used for the first time, update it if it had been
+    // previously registered
+    const bool registerHandler = socket->GetFlags() == 0;
 
-    FD(socket, d) = fd;
-    if (d == FD_INPUT)
-    {
-        handler->AddFlag(wxFDIO_INPUT);
-    }
-    else
-    {
-        handler->AddFlag(wxFDIO_OUTPUT);
-    }
+    socket->AddFlag(d == FD_INPUT ? wxFDIO_INPUT : wxFDIO_OUTPUT);
 
     if ( registerHandler )
-        dispatcher->RegisterFD(fd, handler, handler->GetFlags());
+        dispatcher->RegisterFD(fd, socket, socket->GetFlags());
     else
-        dispatcher->ModifyFD(fd, handler, handler->GetFlags());
+        dispatcher->ModifyFD(fd, socket, socket->GetFlags());
 }
 
 void wxSocketSelectManager::Uninstall_Callback(wxSocketImpl *socket_,
@@ -133,25 +115,15 @@ void wxSocketSelectManager::Uninstall_Callback(wxSocketImpl *socket_,
     if ( !dispatcher )
         return;
 
-    wxSocketIOHandler *& handler = socket->m_handler;
-    if ( handler )
+    socket->RemoveFlag(flag);
+
+    if ( !socket->GetFlags() )
     {
-        handler->RemoveFlag(flag);
-
-        if ( !handler->GetFlags() )
-        {
-            dispatcher->UnregisterFD(fd);
-            delete handler;
-            socket->m_handler = NULL;
-        }
-        else
-        {
-            dispatcher->ModifyFD(fd, handler, handler->GetFlags());
-        }
+        dispatcher->UnregisterFD(fd);
     }
     else
     {
-        dispatcher->UnregisterFD(fd);
+        dispatcher->ModifyFD(fd, socket, socket->GetFlags());
     }
 }