Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename wxSocketSelectManager to wxSocketFDIOManager, the old name was confusing as it could be either select()- or epoll()-based

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-02 16:59:23 +00:00
parent 6f405b31b2
commit 39b61b0581
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/unix/private/sockunix.h
View File

@@ -36,7 +36,7 @@ public:
virtual void OnWriteWaiting(); virtual void OnWriteWaiting();
virtual void OnExceptionWaiting(); virtual void OnExceptionWaiting();
// Unix-specific functions // Unix-specific functions used by wxSocketFDIOManager only
bool HasAnyEnabledCallbacks() const { return m_enabledCallbacks != 0; } bool HasAnyEnabledCallbacks() const { return m_enabledCallbacks != 0; }
void EnableCallback(wxFDIODispatcherEntryFlags flag) void EnableCallback(wxFDIODispatcherEntryFlags flag)
{ m_enabledCallbacks |= flag; } { m_enabledCallbacks |= flag; }

10
src/common/socketiohandler.cpp
View File

@@ -30,17 +30,17 @@
// ============================================================================ // ============================================================================
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxSocketSelectManager // wxSocketFDIOManager: socket manager using wxFDIODispatcher
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class wxSocketSelectManager : public wxSocketFDBasedManager class wxSocketFDIOManager : public wxSocketFDBasedManager
{ {
public: public:
virtual void Install_Callback(wxSocketImpl *socket, wxSocketNotify event); virtual void Install_Callback(wxSocketImpl *socket, wxSocketNotify event);
virtual void Uninstall_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) wxSocketNotify event)
{ {
wxSocketImplUnix * const socket = static_cast<wxSocketImplUnix *>(socket_); wxSocketImplUnix * const socket = static_cast<wxSocketImplUnix *>(socket_);
@@ -70,7 +70,7 @@ void wxSocketSelectManager::Install_Callback(wxSocketImpl *socket_,
dispatcher->RegisterFD(fd, socket, socket->GetEnabledCallbacks()); dispatcher->RegisterFD(fd, socket, socket->GetEnabledCallbacks());
} }
void wxSocketSelectManager::Uninstall_Callback(wxSocketImpl *socket_, void wxSocketFDIOManager::Uninstall_Callback(wxSocketImpl *socket_,
wxSocketNotify event) wxSocketNotify event)
{ {
wxSocketImplUnix * const socket = static_cast<wxSocketImplUnix *>(socket_); wxSocketImplUnix * const socket = static_cast<wxSocketImplUnix *>(socket_);
@@ -106,7 +106,7 @@ static struct ManagerSetter
{ {
ManagerSetter() ManagerSetter()
{ {
static wxSocketSelectManager s_manager; static wxSocketFDIOManager s_manager;
wxAppTraits::SetDefaultSocketManager(&s_manager); wxAppTraits::SetDefaultSocketManager(&s_manager);
} }
} gs_managerSetter; } gs_managerSetter;