From bb27b3726242d56078b99e7b6b1cd5112018b9fb Mon Sep 17 00:00:00 2001 From: Ryan Norton Date: Thu, 7 Oct 2004 09:01:23 +0000 Subject: [PATCH] revert badly screwed up commit :\ git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/cocoa/app.mm | 74 +++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 39 deletions(-) diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm index 0d66e8f44a..f8f064934f 100644 --- a/src/cocoa/app.mm +++ b/src/cocoa/app.mm @@ -6,15 +6,13 @@ // Created: 2002/11/27 // RCS-ID: $Id$ // Copyright: (c) David Elliott -// Licence: wxWindows licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" #ifndef WX_PRECOMP #include "wx/defs.h" #include "wx/app.h" - #include "wx/frame.h" - #include "wx/dialog.h" #include "wx/dc.h" #include "wx/intl.h" #include "wx/log.h" @@ -25,6 +23,7 @@ #include "wx/cocoa/ObjcPose.h" #include "wx/cocoa/autorelease.h" #include "wx/cocoa/mbarman.h" +#include "wx/cocoa/NSApplication.h" #if wxUSE_WX_RESOURCES # include "wx/resource.h" @@ -32,11 +31,11 @@ #import #import -#import -#import #import #import #import +#import +#import // ======================================================================== // wxPoseAsInitializer @@ -71,49 +70,45 @@ 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. - - RN: We used to use nil as the untilDate in previous versions since nil - is a shorter and more concise way of specifying an infinite amount of - time than [NSDate distantPast]. However, Apple neglects to mention in - their documentation that nil is not handled correctly in OSX 10.2 - (and possibly lower) and when the call is reached the system comes to - a screeching halt, therefore we need to specify [NSDate distantPast] - explicitly so that wxCocoa will work correctly in OSX 10.2. */ - (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:[NSDate distantPast] inMode:mode dequeue:flag]; + NSEvent *event = [super nextEventMatchingMask:mask untilDate:nil/* equivalent to [NSDate distantPast] */ inMode:mode dequeue:flag]; // If we got one, simply return it if(event) return event; // No events, try doing some idle stuff - if(sg_needIdle /*&& !wxTheApp->IsInAssert()*/ && ([NSDefaultRunLoopMode isEqualToString:mode] || [NSModalPanelRunLoopMode isEqualToString:mode])) + if(sg_needIdle +#ifdef __WXDEBUG__ + && !wxTheApp->IsInAssert() +#endif + && ([NSDefaultRunLoopMode isEqualToString:mode] || [NSModalPanelRunLoopMode isEqualToString:mode])) { sg_needIdle = false; - wxLogDebug(wxT("Processing idle events")); + wxLogTrace(wxTRACE_COCOA,wxT("Processing idle events")); while(wxTheApp->ProcessIdle()) { // Get the same events except don't block - NSEvent *event = [super nextEventMatchingMask:mask untilDate:[NSDate distantPast]/* equivalent to [NSDate distantPast] */ inMode:mode dequeue:flag]; + NSEvent *event = [super nextEventMatchingMask:mask untilDate:nil/* equivalent to [NSDate distantPast] */ inMode:mode dequeue:flag]; // If we got one, simply return it if(event) return event; // we didn't get one, do some idle work - wxLogDebug(wxT("Looping idle events")); + wxLogTrace(wxTRACE_COCOA,wxT("Looping idle events")); } // No more idle work requested, block - wxLogDebug(wxT("Finished idle processing")); + wxLogTrace(wxTRACE_COCOA,wxT("Finished idle processing")); } else - wxLogDebug(wxT("Avoiding idle processing sg_needIdle=%d"),sg_needIdle); + wxLogTrace(wxTRACE_COCOA,wxT("Avoiding idle processing sg_needIdle=%d"),sg_needIdle); return [super nextEventMatchingMask:mask untilDate:expiration inMode:mode dequeue:flag]; } - (void)sendEvent: (NSEvent*)anEvent { - wxLogDebug(wxT("SendEvent")); + wxLogTrace(wxTRACE_COCOA,wxT("SendEvent")); sg_needIdle = true; [super sendEvent: anEvent]; } @@ -123,22 +118,10 @@ WX_IMPLEMENT_POSER(wxPoserNSApplication); // ======================================================================== // wxNSApplicationDelegate // ======================================================================== -@interface wxNSApplicationDelegate : NSObject -{ -} - -// Delegate methods -- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication; -- (void)applicationWillBecomeActive:(NSNotification *)notification; -- (void)applicationDidBecomeActive:(NSNotification *)notification; -- (void)applicationWillResignActive:(NSNotification *)notification; -- (void)applicationDidResignActive:(NSNotification *)notification; -@end // interface wxNSApplicationDelegate : NSObject - @implementation wxNSApplicationDelegate : NSObject // NOTE: Terminate means that the event loop does NOT return and thus -// cleanup code doesn't properly execute. Furthermore, wxWindows has its +// cleanup code doesn't properly execute. Furthermore, wxWidgets has its // own exit on frame delete mechanism. - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication { @@ -165,6 +148,11 @@ WX_IMPLEMENT_POSER(wxPoserNSApplication); wxTheApp->CocoaDelegate_applicationDidResignActive(); } +- (void)controlTintChanged:(NSNotification *)notification +{ + wxLogDebug("TODO: send EVT_SYS_COLOUR_CHANGED as appropriate"); +} + @end // implementation wxNSApplicationDelegate : NSObject // ======================================================================== @@ -218,6 +206,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; @@ -271,11 +261,13 @@ bool wxApp::OnInitGui() 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; } @@ -325,12 +317,16 @@ bool wxApp::Yield(bool onlyIfNeeded) s_inYield = true; // Run the event loop until it is out of events - while(NSEvent *event = [GetNSApplication() + while(1) + { + wxAutoNSAutoreleasePool pool; + NSEvent *event = [GetNSApplication() nextEventMatchingMask:NSAnyEventMask - untilDate:[NSDate distantPast] + untilDate:nil /* ==[NSDate distantPast] */ inMode:NSDefaultRunLoopMode - dequeue: YES]) - { + dequeue: YES]; + if(!event) + break; [GetNSApplication() sendEvent: event]; } -- 2.45.2