X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a557d1ea0c466ea01d8d934d3de8800a625b86a..e1ef506e13b7c8e96483b7fc0852dcb46688badd:/include/wx/private/selectdispatcher.h

diff --git a/include/wx/private/selectdispatcher.h b/include/wx/private/selectdispatcher.h
index a704b8a83c..1dc1ed290f 100644
--- a/include/wx/private/selectdispatcher.h
+++ b/include/wx/private/selectdispatcher.h
@@ -56,8 +56,9 @@ public:
     // select() itself
     int Select(int nfds, struct timeval *tv);
 
-    // call the handler methods corresponding to the sets having this fd
-    void Handle(int fd, wxFDIOHandler& handler) const;
+    // call the handler methods corresponding to the sets having this fd if it
+    // is present in any set and return true if it is
+    bool Handle(int fd, wxFDIOHandler& handler) const;
 
 private:
     typedef void (wxFDIOHandler::*Callback)();
@@ -91,20 +92,25 @@ public:
     virtual bool RegisterFD(int fd, wxFDIOHandler *handler, int flags = wxFDIO_ALL);
     virtual bool ModifyFD(int fd, wxFDIOHandler *handler, int flags = wxFDIO_ALL);
     virtual bool UnregisterFD(int fd);
-    virtual bool Dispatch(int timeout = TIMEOUT_INFINITE);
+    virtual bool HasPending() const;
+    virtual int Dispatch(int timeout = TIMEOUT_INFINITE);
 
 private:
     // common part of RegisterFD() and ModifyFD()
     bool DoUpdateFDAndHandler(int fd, wxFDIOHandler *handler, int flags);
 
-    // call the handlers for the fds present in the given sets, return true if
-    // we called any handlers
-    bool ProcessSets(const wxSelectSets& sets);
+    // call the handlers for the fds present in the given sets, return the
+    // number of handlers we called
+    int ProcessSets(const wxSelectSets& sets);
 
     // helper of ProcessSets(): call the handler if its fd is in the set
     void DoProcessFD(int fd, const fd_set& fds, wxFDIOHandler *handler,
                      const char *name);
 
+    // common part of HasPending() and Dispatch(): calls select() with the
+    // specified timeout
+    int DoSelect(wxSelectSets& sets, int timeout) const;
+
 
     // the select sets containing all the registered fds
     wxSelectSets m_sets;