X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/065e208ec09e3d08d51d9604497f92f53c210f93..9c8cfcb9c56798ebd29184e40227451a194c0c49:/src/cocoa/app.mm?ds=sidebyside

diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm
index 2e01d10558..18570e9c94 100644
--- a/src/cocoa/app.mm
+++ b/src/cocoa/app.mm
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cocoa/app.mm
+// Name:        src/cocoa/app.mm
 // Purpose:     wxApp
 // Author:      David Elliott
 // Modified by:
@@ -10,8 +10,8 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/app.h"
     #include "wx/dc.h"
     #include "wx/intl.h"
@@ -34,6 +34,8 @@
 #import <Foundation/NSThread.h>
 #import <AppKit/NSEvent.h>
 #import <Foundation/NSString.h>
+#import <Foundation/NSNotification.h>
+#import <AppKit/NSCell.h>
 
 // ========================================================================
 // wxPoseAsInitializer
@@ -68,12 +70,23 @@ WX_IMPLEMENT_POSER(wxPoserNSApplication);
     plan on stopping the event loop, it is wise to send an event through
     the queue to ensure this method will return.
     See wxEventLoop::Exit() for more information.
+
+    This overridden method calls the superclass method with an untilDate
+    parameter that indicates nil should be returned if there are no pending
+    events.  That is, nextEventMatchingMask: should not wait for an event.
+    If nil is returned then idle event processing occurs until the user
+    does not request anymore idle events or until a real event comes through.
+
+    RN: Even though Apple documentation states that nil can be passed in place
+    of [NSDate distantPast] in the untilDate parameter, this causes Jaguar (10.2)
+    to get stuck in some kind of loop deep within nextEventMatchingMask:, thus we
+    need to explicitly pass [NSDate distantPast] instead.
 */
-   
+
 - (NSEvent *)nextEventMatchingMask:(unsigned int)mask untilDate:(NSDate *)expiration inMode:(NSString *)mode dequeue:(BOOL)flag
 {
     // Get the same events except don't block
-    NSEvent *event = [super nextEventMatchingMask:mask untilDate:nil/* equivalent to [NSDate distantPast] */ inMode:mode dequeue:flag];
+    NSEvent *event = [super nextEventMatchingMask:mask untilDate:[NSDate distantPast] inMode:mode dequeue:flag];
     // If we got one, simply return it
     if(event)
         return event;
@@ -89,7 +102,7 @@ WX_IMPLEMENT_POSER(wxPoserNSApplication);
         while(wxTheApp->ProcessIdle())
         {
             // Get the same events except don't block
-            NSEvent *event = [super nextEventMatchingMask:mask untilDate:nil/* equivalent to [NSDate distantPast] */ inMode:mode dequeue:flag];
+            NSEvent *event = [super nextEventMatchingMask:mask untilDate:[NSDate distantPast] inMode:mode dequeue:flag];
             // If we got one, simply return it
             if(event)
                 return event;
@@ -146,6 +159,11 @@ WX_IMPLEMENT_POSER(wxPoserNSApplication);
     wxTheApp->CocoaDelegate_applicationDidResignActive();
 }
 
+- (void)controlTintChanged:(NSNotification *)notification
+{
+    wxLogDebug(wxT("TODO: send EVT_SYS_COLOUR_CHANGED as appropriate"));
+}
+
 @end // implementation wxNSApplicationDelegate : NSObject
 
 // ========================================================================
@@ -199,6 +217,8 @@ void wxApp::CleanUp()
     wxMenuBarManager::DestroyInstance();
 
     [m_cocoaApp setDelegate:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:m_cocoaAppDelegate
+        name:NSControlTintDidChangeNotification object:nil];
     [m_cocoaAppDelegate release];
     m_cocoaAppDelegate = NULL;
 
@@ -212,11 +232,8 @@ wxApp::wxApp()
 {
     m_topWindow = NULL;
 
-#if WXWIN_COMPATIBILITY_2_2
-    m_wantDebugOutput = TRUE;
-#endif
 #ifdef __WXDEBUG__
-    m_isInAssert = FALSE;
+    m_isInAssert = false;
 #endif // __WXDEBUG__
 
     argc = 0;
@@ -246,18 +263,20 @@ bool wxApp::OnInitGui()
 {
     wxAutoNSAutoreleasePool pool;
     if(!wxAppBase::OnInitGui())
-        return FALSE;
+        return false;
 
     // Create the app using the sharedApplication method
     m_cocoaApp = [NSApplication sharedApplication];
     m_cocoaAppDelegate = [[wxNSApplicationDelegate alloc] init];
     [m_cocoaApp setDelegate:m_cocoaAppDelegate];
+    [[NSNotificationCenter defaultCenter] addObserver:m_cocoaAppDelegate
+        selector:@selector(controlTintChanged:)
+        name:NSControlTintDidChangeNotification object:nil];
 
     wxMenuBarManager::CreateInstance();
 
     wxDC::CocoaInitializeTextSystem();
-//    [ m_cocoaApp setDelegate:m_cocoaApp ];
-    return TRUE;
+    return true;
 }
 
 bool wxApp::CallOnInit()
@@ -269,9 +288,9 @@ bool wxApp::CallOnInit()
 bool wxApp::OnInit()
 {
     if(!wxAppBase::OnInit())
-        return FALSE;
+        return false;
 
-    return TRUE;
+    return true;
 }
 
 void wxApp::Exit()
@@ -311,7 +330,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
         wxAutoNSAutoreleasePool pool;
         NSEvent *event = [GetNSApplication()
                 nextEventMatchingMask:NSAnyEventMask
-                untilDate:nil /* ==[NSDate distantPast] */
+                untilDate:[NSDate distantPast]
                 inMode:NSDefaultRunLoopMode
                 dequeue: YES];
         if(!event)
@@ -340,9 +359,8 @@ void wxApp::WakeUpIdle()
 #ifdef __WXDEBUG__
 void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
 {
-    m_isInAssert = TRUE;
+    m_isInAssert = true;
     wxAppBase::OnAssert(file, line, cond, msg);
-    m_isInAssert = FALSE;
+    m_isInAssert = false;
 }
 #endif // __WXDEBUG__
-