Don't install idle event handler in secondary threads.

I've not seen this happen yet, but it can, and I'm taking this precaution.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cocoa/app.h b/include/wx/cocoa/app.h
index ac4078563f0f38c93894aa58f0387cdb0932433c..8f4eb674f00e6e7afc3287c89a5a5275851b855b 100644 (file)
--- a/include/wx/cocoa/app.h
+++ b/include/wx/cocoa/app.h
@@ -34,6 +34,7 @@ public:
     inline void CocoaRequestIdle() { m_isIdle = true; }
 protected:
     WX_NSApplication m_cocoaApp;
     inline void CocoaRequestIdle() { m_isIdle = true; }
 protected:
     WX_NSApplication m_cocoaApp;

+    WX_NSThread m_cocoaMainThread;

     void CocoaInstallIdleHandler();
     bool m_isIdle;
 
     void CocoaInstallIdleHandler();
     bool m_isIdle;
 

diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm
index 89a375eb1a290ed006f3c40bd45044472005c3cf..fc253712dbf0e9c4f0573b91ea2037ac18c87a55 100644 (file)
--- a/src/cocoa/app.mm
+++ b/src/cocoa/app.mm
@@ -41,6 +41,7 @@
 #import <Foundation/NSRunLoop.h>
 #import <Foundation/NSArray.h>
 #import <Foundation/NSAutoreleasePool.h>
 #import <Foundation/NSRunLoop.h>
 #import <Foundation/NSArray.h>
 #import <Foundation/NSAutoreleasePool.h>

+#import <Foundation/NSThread.h>

 
 // ----------------------------------------------------------------------------
 // globals
 
 // ----------------------------------------------------------------------------
 // globals


@@ -133,6 +134,7 @@ END_EVENT_TABLE()
 bool wxApp::Initialize(int& argc, wxChar **argv)
 {
     wxAutoNSAutoreleasePool pool;
 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
     // 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


@@ -181,6 +183,12 @@ wxApp::wxApp()
 
 void wxApp::CocoaInstallIdleHandler()
 {
 
 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;
     // If we're supposed to be stopping, don't add more idle events
     if(![m_cocoaApp isRunning])
         return;