More doxygen topic overview cleanup.

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

diff --git a/src/cocoa/evtloop.mm b/src/cocoa/evtloop.mm
index c6ab3ea5c6a83c54a90d64a9188c8289d9857b48..c0ffc1166649210b615f8f30fae93761837342d7 100644 (file)
--- a/src/cocoa/evtloop.mm
+++ b/src/cocoa/evtloop.mm
@@ -6,7 +6,7 @@
 // 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"
@@ -41,54 +41,46 @@ private:
 };
 
 // ========================================================================
-// wxEventLoop
+// wxGUIEventLoop
 // ========================================================================
 
 // ----------------------------------------------------------------------------
-// wxEventLoop running and exiting
+// wxGUIEventLoop running and exiting
 // ----------------------------------------------------------------------------
 
-wxEventLoop *wxEventLoop::ms_activeLoop = NULL;
-
-wxEventLoop::~wxEventLoop()
+wxGUIEventLoop::~wxGUIEventLoop()
 {
     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;
+    wxEventLoopActivator activate(this);
 
     m_impl = new wxEventLoopImpl;
 
     [[NSApplication sharedApplication] run];
 
+    OnExit();
+
     int exitcode = m_impl->GetExitCode();
     delete m_impl;
     m_impl = NULL;
 
-    ms_activeLoop = oldLoop;
-
     return 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);
 
     NSApplication *cocoaApp = [NSApplication sharedApplication];
-    wxLogDebug("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 +101,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 +111,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