X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d89d4059c815fa6eba5a36be1c471dc3f9486300..42800de660b1fd2b358119a76e9f838610ad224e:/src/cocoa/app.mm

diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm
index 4be00d75ab..fc253712db 100644
--- a/src/cocoa/app.mm
+++ b/src/cocoa/app.mm
@@ -31,6 +31,7 @@
 #include "wx/module.h"
 
 #include "wx/cocoa/ObjcPose.h"
+#include "wx/cocoa/autorelease.h"
 
 #if wxUSE_WX_RESOURCES
 #  include "wx/resource.h"
@@ -40,6 +41,7 @@
 #import <Foundation/NSRunLoop.h>
 #import <Foundation/NSArray.h>
 #import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSThread.h>
 
 // ----------------------------------------------------------------------------
 // globals
@@ -97,21 +99,6 @@ wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL;
 @end // wxPoserNSApplication
 WX_IMPLEMENT_POSER(wxPoserNSApplication);
 
-class wxAutoNSAutoreleasePool
-{
-public:
-    wxAutoNSAutoreleasePool()
-    {
-        m_pool = [[NSAutoreleasePool alloc] init];
-    }
-    ~wxAutoNSAutoreleasePool()
-    {
-        [m_pool release];
-    }
-protected:
-    NSAutoreleasePool *m_pool;
-};
-
 // ============================================================================
 // functions
 // ============================================================================
@@ -134,7 +121,7 @@ void wxApp::Exit()
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-    EVT_IDLE(wxApp::OnIdle)
+    EVT_IDLE(wxAppBase::OnIdle)
 //    EVT_END_SESSION(wxApp::OnEndSession)
 //    EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
 END_EVENT_TABLE()
@@ -147,6 +134,7 @@ END_EVENT_TABLE()
 bool wxApp::Initialize(int& argc, wxChar **argv)
 {
     wxAutoNSAutoreleasePool pool;
+    m_cocoaMainThread = [NSThread currentThread];
     // Mac OS X passes a process serial number command line argument when
     // the application is launched from the Finder. This argument must be
     // removed from the command line arguments before being handled by the
@@ -182,7 +170,6 @@ void wxApp::CleanUp()
 wxApp::wxApp()
 {
     m_topWindow = NULL;
-    wxTheApp = this;
 
     m_isIdle = true;
 #if WXWIN_COMPATIBILITY_2_2
@@ -196,6 +183,15 @@ wxApp::wxApp()
 
 void wxApp::CocoaInstallIdleHandler()
 {
+    // If we're not the main thread, don't install the idle handler
+    if(m_cocoaMainThread != [NSThread currentThread])
+    {
+        wxLogDebug("Attempt to install idle handler from secondary thread");
+        return;
+    }
+    // If we're supposed to be stopping, don't add more idle events
+    if(![m_cocoaApp isRunning])
+        return;
     wxLogDebug("wxApp::CocoaInstallIdleHandler");
     m_isIdle = false;
     // Call doIdle for EVERYTHING dammit
@@ -223,7 +219,7 @@ bool wxApp::OnInitGui()
 
 bool wxApp::CallOnInit()
 {
-    wxAutoNSAutoreleasePool pool;
+//    wxAutoNSAutoreleasePool pool;
     return OnInit();
 }
 
@@ -249,16 +245,6 @@ int wxApp::MainLoop()
     return 0;
 }
 
-// Returns TRUE if more time is needed.
-bool wxApp::ProcessIdle()
-{
-    wxIdleEvent event;
-    event.SetEventObject(this);
-    ProcessEvent(event);
-
-    return event.MoreRequested();
-}
-
 void wxApp::ExitMainLoop()
 {
     wxLogDebug("wxApp::ExitMailLoop m_isIdle=%d, isRunning=%d",(int)m_isIdle,(int)[m_cocoaApp isRunning]);
@@ -271,7 +257,7 @@ void wxApp::ExitMainLoop()
     if(!m_isIdle)
         [[ NSRunLoop currentRunLoop ] cancelPerformSelector:@selector(doIdle:) target:m_cocoaApp argument:NULL];
 #endif
-    [m_cocoaApp terminate: m_cocoaApp];
+    [m_cocoaApp stop: m_cocoaApp];
 }
 
 // Is a message/event pending?
@@ -285,75 +271,6 @@ void wxApp::Dispatch()
 {
 }
 
-void wxApp::OnIdle(wxIdleEvent& event)
-{
-    wxLogDebug("wxApp::OnIdle");
-   static bool s_inOnIdle = FALSE;
-
-    // Avoid recursion (via ProcessEvent default case)
-    if ( s_inOnIdle )
-        return;
-    s_inOnIdle = TRUE;
-
-
-    DeletePendingObjects();
-
-    // flush the logged messages if any
-    wxLog *pLog = wxLog::GetActiveTarget();
-    if ( pLog != NULL && pLog->HasPendingMessages() )
-        pLog->Flush();
-
-    // Send OnIdle events to all windows
-    bool needMore = SendIdleEvents();
-
-    if (needMore)
-      event.RequestMore(TRUE);
-
-    s_inOnIdle = FALSE;
-}
-
-// Send idle event to all top-level windows
-bool wxApp::SendIdleEvents()
-{
-    bool needMore = FALSE;
-    wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
-    while (node)
-    {
-        wxWindow* win = node->GetData();
-        if (SendIdleEvents(win))
-            needMore = TRUE;
-
-        node = node->GetNext();
-    }
-    return needMore;
-}
-
-// Send idle event to window and all subwindows
-bool wxApp::SendIdleEvents(wxWindow* win)
-{
-//    wxLogDebug("SendIdleEvents win=%p",win);
-    bool needMore = FALSE;
-
-    wxIdleEvent event;
-    event.SetEventObject(win);
-    win->ProcessEvent(event);
-
-    if (event.MoreRequested())
-        needMore = TRUE;
-
-    wxWindowList::Node* node = win->GetChildren().GetFirst();
-    while (node)
-    {
-//        wxLogDebug("child=%p",node->Data());
-        wxWindow* win = node->GetData();
-        if (SendIdleEvents(win))
-            needMore = TRUE;
-
-        node = node->GetNext();
-    }
-    return needMore;
-}
-
 // Yield to other processes
 
 bool wxApp::Yield(bool onlyIfNeeded)