Fixed menu creation in eVC3

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

diff --git a/src/cocoa/evtloop.mm b/src/cocoa/evtloop.mm
index d7870baa9adc0eff06552fde406ea4487c6a9b51..c6ab3ea5c6a83c54a90d64a9188c8289d9857b48 100644 (file)
--- a/src/cocoa/evtloop.mm
+++ b/src/cocoa/evtloop.mm
@@ -12,6 +12,7 @@
 #include "wx/wxprec.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"
@@ -88,6 +89,19 @@ void wxEventLoop::Exit(int rc)
 
     NSApplication *cocoaApp = [NSApplication sharedApplication];
     wxLogDebug("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];
 }