X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b46b1d59d6f69ad80dcf5955375578a6504d100a..302c73511a6819c5a56269ba95cb18eb11e994f0:/src/cocoa/evtloop.mm?ds=sidebyside

diff --git a/src/cocoa/evtloop.mm b/src/cocoa/evtloop.mm
index c0ffc11666..b46b1ffcee 100644
--- a/src/cocoa/evtloop.mm
+++ b/src/cocoa/evtloop.mm
@@ -10,6 +10,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
@@ -21,25 +22,6 @@
 #import <AppKit/NSEvent.h>
 #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;
-};
-
 // ========================================================================
 // wxGUIEventLoop
 // ========================================================================
@@ -48,11 +30,6 @@ private:
 // wxGUIEventLoop running and exiting
 // ----------------------------------------------------------------------------
 
-wxGUIEventLoop::~wxGUIEventLoop()
-{
-    wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
-}
-
 int wxGUIEventLoop::Run()
 {
     // event loops are not recursive, you need to create another loop!
@@ -60,24 +37,18 @@ int wxGUIEventLoop::Run()
 
     wxEventLoopActivator activate(this);
 
-    m_impl = new wxEventLoopImpl;
-
     [[NSApplication sharedApplication] run];
 
     OnExit();
 
-    int exitcode = m_impl->GetExitCode();
-    delete m_impl;
-    m_impl = NULL;
-
-    return exitcode;
+    return m_exitcode;
 }
 
 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];
     wxLogTrace(wxTRACE_COCOA,wxT("wxEventLoop::Exit isRunning=%d"), (int)[cocoaApp isRunning]);
@@ -125,8 +96,24 @@ bool wxGUIEventLoop::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;
 }