Fixed wxRichTextCtrl base class

[wxWidgets.git] / src / x11 / evtloop.cpp

diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp
index 4540e888da12d753ac7dba47e8b9cbaaf9dbac5b..bfcf4917afa6d0f7e7c43dfe25b88a0ab72c240d 100644 (file)
--- a/src/x11/evtloop.cpp
+++ b/src/x11/evtloop.cpp
@@ -29,16 +29,16 @@
     #include "wx/module.h"
 #endif
 
-#include "wx/private/selectdispatcher.h"
+#include "wx/private/fdiodispatcher.h"
 #include "wx/unix/private.h"
 #include "wx/x11/private.h"
-#include "X11/Xlib.h"
 #include "wx/generic/private/timer.h"
 
 #if wxUSE_THREADS
     #include "wx/thread.h"
 #endif
 
+#include <X11/Xlib.h>
 #include <sys/time.h>
 #include <unistd.h>
 
@@ -190,9 +190,6 @@ bool wxGUIEventLoop::Dispatch()
 {
     XEvent event;
 
-    // Start off by checking if any of our child processes have finished.
-    wxCheckForFinishedChildren();
-
     // TODO allowing for threads, as per e.g. wxMSW
 
     // This now waits until either an X event is received,
@@ -240,9 +237,39 @@ bool wxGUIEventLoop::Dispatch()
 
 #if wxUSE_SOCKETS
     // handle any pending socket events:
-    wxSelectDispatcher::DispatchPending();
+    wxFDIODispatcher::DispatchPending();
 #endif
 
     (void) m_impl->ProcessEvent( &event );
     return true;
 }
+
+bool wxGUIEventLoop::YieldFor(long eventsToProcess)
+{
+    // Sometimes only 2 yields seem
+    // to do the trick, e.g. in the
+    // progress dialog
+    int i;
+    for (i = 0; i < 2; i++)
+    {
+        m_isInsideYield = true;
+        m_eventsToProcessInsideYield = eventsToProcess;
+
+        // Call dispatch at least once so that sockets
+        // can be tested
+        wxTheApp->Dispatch();
+
+        // TODO: implement event filtering using the eventsToProcess mask
+        while (wxTheApp && wxTheApp->Pending())
+            wxTheApp->Dispatch();
+
+#if wxUSE_TIMER
+        wxGenericTimerImpl::NotifyTimers();
+#endif
+        ProcessIdle();
+
+        m_isInsideYield = false;
+    }
+
+    return true;
+}