X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9670dfc4bebf107fff652a8facab25524ef4c0eb..302c73511a6819c5a56269ba95cb18eb11e994f0:/src/cocoa/evtloop.mm diff --git a/src/cocoa/evtloop.mm b/src/cocoa/evtloop.mm index 9381f37e59..b46b1ffcee 100644 --- a/src/cocoa/evtloop.mm +++ b/src/cocoa/evtloop.mm @@ -6,12 +6,14 @@ // Created: 2003/10/02 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// License: wxWindows licence +// License: wxWidgets licence /////////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + #ifndef WX_PRECOMP #include "wx/log.h" + #include "wx/app.h" #endif //WX_PRECOMP #include "wx/evtloop.h" @@ -21,84 +23,41 @@ #import // ======================================================================== -// wxEventLoopImpl -// ======================================================================== - -class WXDLLEXPORT wxEventLoopImpl -{ -public: - // ctor - wxEventLoopImpl() { SetExitCode(0); } - - // set/get the exit code - void SetExitCode(int exitcode) { m_exitcode = exitcode; } - int GetExitCode() const { return m_exitcode; } - -private: - // the exit code of the event loop - int m_exitcode; -}; - -// ======================================================================== -// wxEventLoop +// wxGUIEventLoop // ======================================================================== // ---------------------------------------------------------------------------- -// wxEventLoop running and exiting +// wxGUIEventLoop running and exiting // ---------------------------------------------------------------------------- -wxEventLoop *wxEventLoop::ms_activeLoop = NULL; - -wxEventLoop::~wxEventLoop() -{ - wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") ); -} - -bool wxEventLoop::IsRunning() const -{ - return m_impl; -} - -int wxEventLoop::Run() +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") ); - wxEventLoop *oldLoop = ms_activeLoop; - ms_activeLoop = this; - - m_impl = new wxEventLoopImpl; + wxEventLoopActivator activate(this); [[NSApplication sharedApplication] run]; - int exitcode = m_impl->GetExitCode(); - delete m_impl; - m_impl = NULL; - - ms_activeLoop = oldLoop; + OnExit(); - return exitcode; + return m_exitcode; } -void wxEventLoop::Exit(int rc) +void wxGUIEventLoop::Exit(int rc) { wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") ); - m_impl->SetExitCode(rc); + m_exitcode = 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: - 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 @@ -113,7 +72,7 @@ void wxEventLoop::Exit(int rc) // wxEventLoop message processing dispatching // ---------------------------------------------------------------------------- -bool wxEventLoop::Pending() const +bool wxGUIEventLoop::Pending() const { // a pointer to the event is returned if there is one, or nil if not return [[NSApplication sharedApplication] @@ -123,7 +82,7 @@ bool wxEventLoop::Pending() const dequeue: NO]; } -bool wxEventLoop::Dispatch() +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 @@ -137,8 +96,24 @@ bool wxEventLoop::Dispatch() dequeue: YES]) { [cocoaApp sendEvent: event]; - return true; } - return false; + + return true; +} + +int wxGUIEventLoop::DispatchTimeout(unsigned long timeout) +{ + NSApplication *cocoaApp = [NSApplication sharedApplication]; + NSEvent *event = [cocoaApp + nextEventMatchingMask:NSAnyEventMask + untilDate:[[NSDate alloc] initWithTimeIntervalSinceNow:timeout/1000] + inMode:NSDefaultRunLoopMode + dequeue: YES]; + if ( !event ) + return -1; + + [cocoaApp sendEvent: event]; + + return true; }