From: Vadim Zeitlin Date: Fri, 2 Jan 2009 16:59:23 +0000 (+0000) Subject: rename wxSocketSelectManager to wxSocketFDIOManager, the old name was confusing as... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/39b61b058123378e0e132f7f75f53f042d96eca0 rename wxSocketSelectManager to wxSocketFDIOManager, the old name was confusing as it could be either select()- or epoll()-based git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/unix/private/sockunix.h b/include/wx/unix/private/sockunix.h index 5e910a4cf1..afdcc4e0cf 100644 --- a/include/wx/unix/private/sockunix.h +++ b/include/wx/unix/private/sockunix.h @@ -36,7 +36,7 @@ public: virtual void OnWriteWaiting(); virtual void OnExceptionWaiting(); - // Unix-specific functions + // Unix-specific functions used by wxSocketFDIOManager only bool HasAnyEnabledCallbacks() const { return m_enabledCallbacks != 0; } void EnableCallback(wxFDIODispatcherEntryFlags flag) { m_enabledCallbacks |= flag; } diff --git a/src/common/socketiohandler.cpp b/src/common/socketiohandler.cpp index 87a9c457bb..89f8edafee 100644 --- a/src/common/socketiohandler.cpp +++ b/src/common/socketiohandler.cpp @@ -30,17 +30,17 @@ // ============================================================================ // ---------------------------------------------------------------------------- -// wxSocketSelectManager +// wxSocketFDIOManager: socket manager using wxFDIODispatcher // ---------------------------------------------------------------------------- -class wxSocketSelectManager : public wxSocketFDBasedManager +class wxSocketFDIOManager : public wxSocketFDBasedManager { public: virtual void Install_Callback(wxSocketImpl *socket, wxSocketNotify event); virtual void Uninstall_Callback(wxSocketImpl *socket, wxSocketNotify event); }; -void wxSocketSelectManager::Install_Callback(wxSocketImpl *socket_, +void wxSocketFDIOManager::Install_Callback(wxSocketImpl *socket_, wxSocketNotify event) { wxSocketImplUnix * const socket = static_cast(socket_); @@ -70,7 +70,7 @@ void wxSocketSelectManager::Install_Callback(wxSocketImpl *socket_, dispatcher->RegisterFD(fd, socket, socket->GetEnabledCallbacks()); } -void wxSocketSelectManager::Uninstall_Callback(wxSocketImpl *socket_, +void wxSocketFDIOManager::Uninstall_Callback(wxSocketImpl *socket_, wxSocketNotify event) { wxSocketImplUnix * const socket = static_cast(socket_); @@ -106,7 +106,7 @@ static struct ManagerSetter { ManagerSetter() { - static wxSocketSelectManager s_manager; + static wxSocketFDIOManager s_manager; wxAppTraits::SetDefaultSocketManager(&s_manager); } } gs_managerSetter;