fixed debug assert in VC 7.1 CRT due to calling isalnum() with 8bit chars

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

diff --git a/src/cocoa/evtloop.mm b/src/cocoa/evtloop.mm
index bd1611587bf2d4bc245266f4e67d6b409252f968..32f9ccbfa13bc4c8a897e9386a6e2a2aaeab7e54 100644 (file)
--- a/src/cocoa/evtloop.mm
+++ b/src/cocoa/evtloop.mm
@@ -12,11 +12,14 @@
 #include "wx/wxprec.h"
 #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>
 
 // ========================================================================
 // wxEventLoopImpl
@@ -85,7 +88,20 @@ void wxEventLoop::Exit(int rc)
     m_impl->SetExitCode(rc);
 
     NSApplication *cocoaApp = [NSApplication sharedApplication];
-    wxLogDebug("wxEventLoop::Exit isRunning=%d", (int)[cocoaApp isRunning]);
+    wxLogTrace(wxTRACE_COCOA,wxT("wxEventLoop::Exit isRunning=%d"), (int)[cocoaApp isRunning]);
+    wxTheApp->WakeUpIdle();
+    /* Notes:
+    If we're being called from idle time (which occurs while checking the
+    queue for new events) there may or may not be any events in the queue.
+    In order to successfully stop the event loop, at least one event must
+    be processed.  To ensure this always happens, WakeUpIdle is called.
+
+    If the application was active when closed then this is unnecessary
+    because it would receive a deactivate event anyway.  However, if the
+    application was not active when closed, then no events would be
+    added to the queue by Cocoa and thus the application would wait
+    indefinitely for the next event.
+    */
     [cocoaApp stop: cocoaApp];
 }
 
@@ -95,12 +111,30 @@ void wxEventLoop::Exit(int rc)
 
 bool wxEventLoop::Pending() const
 {
-    return 0;
+    // a pointer to the event is returned if there is one, or nil if not
+    return [[NSApplication sharedApplication]
+            nextEventMatchingMask: NSAnyEventMask
+            untilDate: nil /* Equivalent to [NSDate distantPast] */
+            inMode: NSDefaultRunLoopMode
+            dequeue: NO];
 }
 
 bool wxEventLoop::Dispatch()
 {
+    // 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") );
+    NSApplication *cocoaApp = [NSApplication sharedApplication];
+    // Block to retrieve an event then send it
+    if(NSEvent *event = [cocoaApp
+                nextEventMatchingMask:NSAnyEventMask
+                untilDate:[NSDate distantFuture]
+                inMode:NSDefaultRunLoopMode
+                dequeue: YES])
+    {
+        [cocoaApp sendEvent: event];
+        return true;
+    }
     return false;
 }