X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5ef33b2aed3f6aea3b7b71189a93985bfda3b3a..1a5cd56aacbfcd5480929e4646e6e97f63add8c8:/src/unix/epolldispatcher.cpp diff --git a/src/unix/epolldispatcher.cpp b/src/unix/epolldispatcher.cpp index 294f89f1cb..533d15b45a 100644 --- a/src/unix/epolldispatcher.cpp +++ b/src/unix/epolldispatcher.cpp @@ -86,9 +86,6 @@ wxEpollDispatcher::wxEpollDispatcher() bool wxEpollDispatcher::RegisterFD(int fd, wxFDIOHandler* handler, int flags) { - if ( !wxFDIODispatcher::RegisterFD(fd, handler, flags) ) - return false; - epoll_event ev; ev.events = GetEpollMask(flags, fd); ev.data.ptr = handler; @@ -107,9 +104,6 @@ bool wxEpollDispatcher::RegisterFD(int fd, wxFDIOHandler* handler, int flags) bool wxEpollDispatcher::ModifyFD(int fd, wxFDIOHandler* handler, int flags) { - if ( !wxFDIODispatcher::ModifyFD(fd, handler, flags) ) - return false; - epoll_event ev; ev.events = GetEpollMask(flags, fd); ev.data.ptr = handler; @@ -126,12 +120,8 @@ bool wxEpollDispatcher::ModifyFD(int fd, wxFDIOHandler* handler, int flags) return true; } -wxFDIOHandler *wxEpollDispatcher::UnregisterFD(int fd, int flags) +bool wxEpollDispatcher::UnregisterFD(int fd, int flags) { - wxFDIOHandler * const handler = wxFDIODispatcher::UnregisterFD(fd, flags); - if ( !handler ) - return NULL; - epoll_event ev; ev.events = 0; ev.data.ptr = NULL; @@ -142,7 +132,7 @@ wxFDIOHandler *wxEpollDispatcher::UnregisterFD(int fd, int flags) fd, m_epollDescriptor); } - return handler; + return true; } void wxEpollDispatcher::RunLoop(int timeout)