destroy the abort dialog when done with it

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

diff --git a/src/cocoa/evtloop.mm b/src/cocoa/evtloop.mm
index 00e19abb629d5a1e9f2c77203e0d2bd5efe9053d..b46b1ffcee7ee74e46a2fdb0fdbb9e615dcaf3fb 100644 (file)
--- a/src/cocoa/evtloop.mm
+++ b/src/cocoa/evtloop.mm
@@ -6,10 +6,11 @@
 // Created:     2003/10/02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott <dfe@cox.net>
-// License:     wxWindows licence
+// License:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
@@ -22,73 +23,35 @@
 #import <Foundation/NSRunLoop.h>
 
 // ========================================================================
-// 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(wxT("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
@@ -109,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]
@@ -119,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
@@ -133,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;
 }