don't check whether the window is shown and enabled in AcceptsFocus() itself

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

diff --git a/src/common/selectdispatcher.cpp b/src/common/selectdispatcher.cpp
index f58665f8ee89b9f33f8eb00fcad5f3efacb423d3..5ee2f0242df4bcc4b8f495c78f7edb36a250f84f 100644 (file)
--- a/src/common/selectdispatcher.cpp
+++ b/src/common/selectdispatcher.cpp
@@ -198,13 +198,19 @@ void wxSelectDispatcher::RunLoop(int timeout)
         fd_set writeset = m_writeset;
         fd_set exeptset = m_exeptset;
         wxStopWatch sw;
         fd_set writeset = m_writeset;
         fd_set exeptset = m_exeptset;
         wxStopWatch sw;

-        if ( ptv )
+        if ( ptv && timeout )

           sw.Start(ptv->tv_usec/10);
         ret = select(m_maxFD+1, &readset, &writeset, &exeptset, ptv);
         switch ( ret )
         {
             // TODO: handle unix signals here
             case -1:
           sw.Start(ptv->tv_usec/10);
         ret = select(m_maxFD+1, &readset, &writeset, &exeptset, ptv);
         switch ( ret )
         {
             // TODO: handle unix signals here
             case -1:

+                if ( !timeout )
+                {
+                    // it doesn't make sense to remain here
+                    return;
+                }
+

                 if ( ptv )
                 {
                     ptv->tv_sec = 0;
                 if ( ptv )
                 {
                     ptv->tv_sec = 0;