fix parameter name

[wxWidgets.git] / src / common / selectdispatcher.cpp

diff --git a/src/common/selectdispatcher.cpp b/src/common/selectdispatcher.cpp
index d3461b2b2f68525c29f246079648d591d6a2c856..990b62c21c0fdf7eceae51b87574fe67f586a06a 100644 (file)
--- a/src/common/selectdispatcher.cpp
+++ b/src/common/selectdispatcher.cpp
@@ -131,17 +131,6 @@ void wxSelectSets::Handle(int fd, wxFDIOHandler& handler) const
 // wxSelectDispatcher
 // ----------------------------------------------------------------------------
 
 // wxSelectDispatcher
 // ----------------------------------------------------------------------------
 

-/* static */
-wxSelectDispatcher *wxSelectDispatcher::Create()
-{
-    return new wxSelectDispatcher;
-}
-
-wxSelectDispatcher::wxSelectDispatcher()
-{
-    m_maxFD = -1;
-}
-

 bool wxSelectDispatcher::RegisterFD(int fd, wxFDIOHandler *handler, int flags)
 {
     if ( !wxMappedFDIODispatcher::RegisterFD(fd, handler, flags) )
 bool wxSelectDispatcher::RegisterFD(int fd, wxFDIOHandler *handler, int flags)
 {
     if ( !wxMappedFDIODispatcher::RegisterFD(fd, handler, flags) )


@@ -201,8 +190,9 @@ bool wxSelectDispatcher::UnregisterFD(int fd)
     return true;
 }
 
     return true;
 }
 

-void wxSelectDispatcher::ProcessSets(const wxSelectSets& sets)
+bool wxSelectDispatcher::ProcessSets(const wxSelectSets& sets)

 {
 {

+    bool gotEvent = false;

     for ( int fd = 0; fd <= m_maxFD; fd++ )
     {
         if ( !sets.HasFD(fd) )
     for ( int fd = 0; fd <= m_maxFD; fd++ )
     {
         if ( !sets.HasFD(fd) )


@@ -215,11 +205,15 @@ void wxSelectDispatcher::ProcessSets(const wxSelectSets& sets)
             continue;
         }
 
             continue;
         }
 

+        gotEvent = true;
+

         sets.Handle(fd, *handler);
     }
         sets.Handle(fd, *handler);
     }

+
+    return gotEvent;

 }
 
 }
 

-void wxSelectDispatcher::Dispatch(int timeout)
+bool wxSelectDispatcher::Dispatch(int timeout)

 {
     struct timeval tv,
                   *ptv;
 {
     struct timeval tv,
                   *ptv;


@@ -251,8 +245,12 @@ void wxSelectDispatcher::Dispatch(int timeout)
             break;
 
         default:
             break;
 
         default:

-            ProcessSets(sets);
+            if ( ProcessSets(sets) )
+                return true;

     }
     }

+
+    // nothing happened
+    return false;

 }
 
 #endif // wxUSE_SELECT_DISPATCHER
 }
 
 #endif // wxUSE_SELECT_DISPATCHER