No real changes, just replace -1 with wxNOT_FOUND in wxBookCtrl code.

[wxWidgets.git] / src / cocoa / evtloop.mm

diff --git a/src/cocoa/evtloop.mm b/src/cocoa/evtloop.mm
index b46b1ffcee7ee74e46a2fdb0fdbb9e615dcaf3fb..b7650077777176e45e334a092a0dfe3e9875e3ad 100644 (file)
--- a/src/cocoa/evtloop.mm
+++ b/src/cocoa/evtloop.mm
@@ -6,18 +6,18 @@
 // Created:     2003/10/02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott <dfe@cox.net>
 // Created:     2003/10/02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott <dfe@cox.net>

-// License:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 

+#include "wx/evtloop.h"
+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #endif //WX_PRECOMP
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #endif //WX_PRECOMP
 

-#include "wx/evtloop.h"
-

 #import <AppKit/NSApplication.h>
 #import <AppKit/NSEvent.h>
 #import <Foundation/NSRunLoop.h>
 #import <AppKit/NSApplication.h>
 #import <AppKit/NSEvent.h>
 #import <Foundation/NSRunLoop.h>


@@ -33,7 +33,7 @@
 int wxGUIEventLoop::Run()
 {
     // event loops are not recursive, you need to create another loop!
 int wxGUIEventLoop::Run()
 {
     // event loops are not recursive, you need to create another loop!

-    wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
+    wxCHECK_MSG( !IsRunning(), -1, wxT("can't reenter a message loop") );

 
     wxEventLoopActivator activate(this);
 
 
     wxEventLoopActivator activate(this);
 


@@ -46,7 +46,7 @@ int wxGUIEventLoop::Run()
 
 void wxGUIEventLoop::Exit(int rc)
 {
 
 void wxGUIEventLoop::Exit(int rc)
 {

-    wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") );
+    wxCHECK_RET( IsRunning(), wxT("can't call Exit() if not running") );

 
     m_exitcode = rc;
 
 
     m_exitcode = rc;
 


@@ -86,7 +86,7 @@ bool wxGUIEventLoop::Dispatch()
 {
     // This check is required by wxGTK but probably not really for wxCocoa
     // Keep it here to encourage developers to write cross-platform code
 {
     // This check is required by wxGTK but probably not really for wxCocoa
     // Keep it here to encourage developers to write cross-platform code

-    wxCHECK_MSG( IsRunning(), false, _T("can't call Dispatch() if not running") );
+    wxCHECK_MSG( IsRunning(), false, wxT("can't call Dispatch() if not running") );

     NSApplication *cocoaApp = [NSApplication sharedApplication];
     // Block to retrieve an event then send it
     if(NSEvent *event = [cocoaApp
     NSApplication *cocoaApp = [NSApplication sharedApplication];
     // Block to retrieve an event then send it
     if(NSEvent *event = [cocoaApp


@@ -117,3 +117,61 @@ int wxGUIEventLoop::DispatchTimeout(unsigned long timeout)
     return true;
 }
 
     return true;
 }
 

+bool wxGUIEventLoop::YieldFor(long 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
+
+    m_isInsideYield = true;
+    m_eventsToProcessInsideYield = eventsToProcess;
+
+    // Run the event loop until it is out of events
+    while (1)
+    {
+        // TODO: implement event filtering using the eventsToProcess mask
+
+        wxAutoNSAutoreleasePool pool;
+        /*  NOTE: It may be better to use something like
+            NSEventTrackingRunLoopMode since we don't necessarily want all
+            timers/sources/observers to run, only those which would
+            run while tracking events.  However, it should be noted that
+            NSEventTrackingRunLoopMode is in the common set of modes
+            so it may not effectively make much of a difference.
+         */
+        NSEvent *event = [GetNSApplication()
+                nextEventMatchingMask:NSAnyEventMask
+                untilDate:[NSDate distantPast]
+                inMode:NSDefaultRunLoopMode
+                dequeue: YES];
+        if(!event)
+            break;
+        [GetNSApplication() sendEvent: event];
+    }
+
+    /*
+        Because we just told NSApplication to avoid blocking it will in turn
+        run the CFRunLoop with a timeout of 0 seconds.  In that case, our
+        run loop observer on kCFRunLoopBeforeWaiting never fires because
+        no waiting occurs.  Therefore, no idle events are sent.
+
+        Believe it or not, this is actually desirable because we do not want
+        to process idle from here.  However, we do want to process pending
+        events because some user code expects to do work in a thread while
+        the main thread waits and then notify the main thread by posting
+        an event.
+     */
+    if (wxTheApp)
+        wxTheApp->ProcessPendingEvents();
+
+#if wxUSE_LOG
+    // let the logs be flashed again
+    wxLog::Resume();
+#endif // wxUSE_LOG
+
+    m_isInsideYield = false;
+
+    return true;
+}