X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c146c3ae4417af540d85a53eace698f6bb5f5660..5f65ba36570e9cf4296673391472cf11b9f0c673:/src/osx/cocoa/evtloop.mm

diff --git a/src/osx/cocoa/evtloop.mm b/src/osx/cocoa/evtloop.mm
index a1c1f613d6..92f08d178e 100644
--- a/src/osx/cocoa/evtloop.mm
+++ b/src/osx/cocoa/evtloop.mm
@@ -24,12 +24,13 @@
     #pragma hdrstop
 #endif
 
+#include "wx/evtloop.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #endif // WX_PRECOMP
 
-#include "wx/evtloop.h"
+#include "wx/log.h"
 
 #include "wx/osx/private.h"
 
@@ -94,6 +95,43 @@ bool wxGUIEventLoop::Dispatch()
     return true;
 }
 
+bool wxGUIEventLoop::YieldFor(long eventsToProcess)
+{
+#if wxUSE_THREADS
+    // Yielding from a non-gui thread needs to bail out, otherwise we end up
+    // possibly sending events in the thread too.
+    if ( !wxThread::IsMain() )
+    {
+        return true;
+    }
+#endif // wxUSE_THREADS
+
+    m_isInsideYield = true;
+    m_eventsToProcessInsideYield = eventsToProcess;
+
+#if wxUSE_LOG
+    // disable log flushing from here because a call to wxYield() shouldn't
+    // normally result in message boxes popping up &c
+    wxLog::Suspend();
+#endif // wxUSE_LOG
+
+    // process all pending events:
+    while ( Pending() )
+        Dispatch();
+
+    // it's necessary to call ProcessIdle() to update the frames sizes which
+    // might have been changed (it also will update other things set from
+    // OnUpdateUI() which is a nice (and desired) side effect)
+    while ( ProcessIdle() ) {}
+
+#if wxUSE_LOG
+    wxLog::Resume();
+#endif // wxUSE_LOG
+    m_isInsideYield = false;
+
+    return true;
+}
+
 int wxGUIEventLoop::DispatchTimeout(unsigned long timeout)
 {
     wxMacAutoreleasePool autoreleasepool;