Implemented Enable for wxMenuBar to avoid assert

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

diff --git a/src/cocoa/evtloop.mm b/src/cocoa/evtloop.mm
index 9381f37e5950e712bf5db6170812e77fc3928d6a..32f9ccbfa13bc4c8a897e9386a6e2a2aaeab7e54 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/wxprec.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/app.h"

 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"
 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"


@@ -87,18 +88,13 @@ void wxEventLoop::Exit(int rc)
     m_impl->SetExitCode(rc);
 
     NSApplication *cocoaApp = [NSApplication sharedApplication];
     m_impl->SetExitCode(rc);
 
     NSApplication *cocoaApp = [NSApplication sharedApplication];

-    wxLogDebug("wxEventLoop::Exit isRunning=%d", (int)[cocoaApp isRunning]);
-    // This works around a bug in Cocoa.
-    [NSEvent startPeriodicEventsAfterDelay:0.0 withPeriod:5.0];
+    wxLogTrace(wxTRACE_COCOA,wxT("wxEventLoop::Exit isRunning=%d"), (int)[cocoaApp isRunning]);
+    wxTheApp->WakeUpIdle();

     /* Notes:
     /* Notes:

-    This function is most often called during idle time.  See
-    wxApp::CocoaInstallIdleHandler() for an overview of the implications
-    of idle event time.  In short, Cocoa must have at least one real event
-    in the queue (of which an idle "event" is not) in order for it to
-    realize that the application has been stopped.  The above method
-    generates the first periodic event immediately, and would generate
-    further events every 5 seconds if not for the fact that the next
-    method stops the event loop.
+    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
 
     If the application was active when closed then this is unnecessary
     because it would receive a deactivate event anyway.  However, if the