factor out the fd<->handlers map from wxFDIODispatcher into a separate wxMappedFDIODispatcher class (patch 1729395)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-06-02 13:51:05 +00:00
parent f463afe347
commit ad8d42f83c
6 changed files with 49 additions and 43 deletions

View File

@@ -32,7 +32,7 @@
// implementation
// ============================================================================
wxFDIOHandler *wxFDIODispatcher::FindHandler(int fd) const
wxFDIOHandler *wxMappedFDIODispatcher::FindHandler(int fd) const
{
const wxFDIOHandlerMap::const_iterator it = m_handlers.find(fd);
@@ -40,7 +40,7 @@ wxFDIOHandler *wxFDIODispatcher::FindHandler(int fd) const
}
bool wxFDIODispatcher::RegisterFD(int fd, wxFDIOHandler *handler, int flags)
bool wxMappedFDIODispatcher::RegisterFD(int fd, wxFDIOHandler *handler, int flags)
{
wxUnusedVar(flags);
@@ -63,7 +63,7 @@ bool wxFDIODispatcher::RegisterFD(int fd, wxFDIOHandler *handler, int flags)
return true;
}
bool wxFDIODispatcher::ModifyFD(int fd, wxFDIOHandler *handler, int flags)
bool wxMappedFDIODispatcher::ModifyFD(int fd, wxFDIOHandler *handler, int flags)
{
wxUnusedVar(flags);
@@ -78,13 +78,12 @@ bool wxFDIODispatcher::ModifyFD(int fd, wxFDIOHandler *handler, int flags)
return true;
}
wxFDIOHandler *wxFDIODispatcher::UnregisterFD(int fd, int flags)
bool wxMappedFDIODispatcher::UnregisterFD(int fd, int flags)
{
wxFDIOHandlerMap::iterator i = m_handlers.find(fd);
wxCHECK_MSG( i != m_handlers.end(), NULL,
_T("unregistering unregistered handler?") );
if( i == m_handlers.end())
return false;
wxFDIOHandler * const handler = i->second.handler;
i->second.flags &= ~flags;
if ( !i->second.flags )
{
@@ -92,6 +91,6 @@ wxFDIOHandler *wxFDIODispatcher::UnregisterFD(int fd, int flags)
m_handlers.erase(i);
}
return handler;
return true;
}