X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af367f4640d0dba24b5bb1a647aa2150604b5a86..84968677abe36133a45e0426c2a365da18851f90:/src/cocoa/app.mm diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm index a71826f9e6..6a2c443ac4 100644 --- a/src/cocoa/app.mm +++ b/src/cocoa/app.mm @@ -9,14 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - #include "wx/wxprec.h" #ifndef WX_PRECOMP #include "wx/defs.h" @@ -43,24 +35,54 @@ #import #import #import +#import -// ---------------------------------------------------------------------------- -// globals -// ---------------------------------------------------------------------------- - +// ======================================================================== +// wxPoseAsInitializer +// ======================================================================== wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL; +// ======================================================================== +// wxPoserNSApplication +// ======================================================================== @interface wxPoserNSApplication : NSApplication { } -- (void)doIdle: (id)data; - (void)sendEvent: (NSEvent*)anEvent; -- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication; @end // wxPoserNSApplication +WX_IMPLEMENT_POSER(wxPoserNSApplication); + @implementation wxPoserNSApplication : NSApplication +- (void)sendEvent: (NSEvent*)anEvent +{ + wxLogDebug("SendEvent"); + wxTheApp->CocoaInstallRequestedIdleHandler(); + [super sendEvent: anEvent]; +} + +@end // wxPoserNSApplication + +// ======================================================================== +// wxNSApplicationDelegate +// ======================================================================== +@interface wxNSApplicationDelegate : NSObject +{ +} + +- (void)doIdle: (id)data; +// 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 + - (void)doIdle: (id)data { wxASSERT(wxTheApp); @@ -94,55 +116,53 @@ wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL; wxTheApp->CocoaRequestIdle(); } -- (void)sendEvent: (NSEvent*)anEvent +// NOTE: Terminate means that the event loop does NOT return and thus +// cleanup code doesn't properly execute. Furthermore, wxWindows has its +// own exit on frame delete mechanism. +- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication { - wxLogDebug("SendEvent"); - wxTheApp->CocoaInstallRequestedIdleHandler(); - [super sendEvent: anEvent]; + return NO; } -- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication +- (void)applicationWillBecomeActive:(NSNotification *)notification { - BOOL ret = wxTheApp->GetExitOnFrameDelete(); - wxLogDebug("applicationShouldTermintaeAfterLastWindowClosed=%d",ret); - return ret; + wxTheApp->CocoaDelegate_applicationWillBecomeActive(); } -@end // wxPoserNSApplication -WX_IMPLEMENT_POSER(wxPoserNSApplication); - -// ============================================================================ -// functions -// ============================================================================ +- (void)applicationDidBecomeActive:(NSNotification *)notification +{ + wxTheApp->CocoaDelegate_applicationDidBecomeActive(); +} -void wxApp::Exit() +- (void)applicationWillResignActive:(NSNotification *)notification { - wxApp::CleanUp(); + wxTheApp->CocoaDelegate_applicationWillResignActive(); +} - wxAppConsole::Exit(); +- (void)applicationDidResignActive:(NSNotification *)notification +{ + wxTheApp->CocoaDelegate_applicationDidResignActive(); } -// ============================================================================ -// wxApp implementation -// ============================================================================ +@end // implementation wxNSApplicationDelegate : NSObject + +// ======================================================================== +// wxApp +// ======================================================================== // ---------------------------------------------------------------------------- // wxApp Static member initialization // ---------------------------------------------------------------------------- - -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) EVT_IDLE(wxAppBase::OnIdle) // EVT_END_SESSION(wxApp::OnEndSession) // EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession) END_EVENT_TABLE() -#endif // ---------------------------------------------------------------------------- // wxApp initialization/cleanup // ---------------------------------------------------------------------------- - bool wxApp::Initialize(int& argc, wxChar **argv) { wxAutoNSAutoreleasePool pool; @@ -170,16 +190,21 @@ bool wxApp::Initialize(int& argc, wxChar **argv) void wxApp::CleanUp() { + wxAutoNSAutoreleasePool pool; + wxDC::CocoaShutdownTextSystem(); wxMenuBarManager::DestroyInstance(); + [m_cocoaApp setDelegate:nil]; + [m_cocoaAppDelegate release]; + m_cocoaAppDelegate = NULL; + wxAppBase::CleanUp(); } // ---------------------------------------------------------------------------- // wxApp creation // ---------------------------------------------------------------------------- - wxApp::wxApp() { m_topWindow = NULL; @@ -192,10 +217,10 @@ wxApp::wxApp() m_isInAssert = FALSE; #endif // __WXDEBUG__ - argc = 0; argv = NULL; m_cocoaApp = NULL; + m_cocoaAppDelegate = NULL; } void wxApp::CocoaInstallIdleHandler() @@ -213,7 +238,33 @@ void wxApp::CocoaInstallIdleHandler() m_isIdle = false; // Call doIdle for EVERYTHING dammit // We'd need Foundation/NSConnection.h for this next constant, do we need it? - [[ NSRunLoop currentRunLoop ] performSelector:@selector(doIdle:) target:m_cocoaApp argument:NULL order:0 modes:[NSArray arrayWithObjects:NSDefaultRunLoopMode, /* NSConnectionReplyRunLoopMode,*/ NSModalPanelRunLoopMode, /**/NSEventTrackingRunLoopMode,/**/ nil] ]; + [[ NSRunLoop currentRunLoop ] performSelector:@selector(doIdle:) target:m_cocoaAppDelegate argument:NULL order:0 modes:[NSArray arrayWithObjects:NSDefaultRunLoopMode, /* NSConnectionReplyRunLoopMode,*/ NSModalPanelRunLoopMode, /**/NSEventTrackingRunLoopMode,/**/ nil] ]; + /* Notes: + In the Mac OS X implementation of Cocoa, the above method schedules + doIdle: to be called from *within* [NSApplication + -nextEventMatchingMask:untilDate:inMode:dequeue:]. That is, no + NSEvent object is generated and control does not return from that + method. In fact, control will only return from that method for the + usual reasons (e.g. a real event is received or the untilDate is reached). + This has implications when trying to stop the event loop and return to + its caller. See wxEventLoop::Exit + */ +} + +void wxApp::CocoaDelegate_applicationWillBecomeActive() +{ +} + +void wxApp::CocoaDelegate_applicationDidBecomeActive() +{ +} + +void wxApp::CocoaDelegate_applicationWillResignActive() +{ +} + +void wxApp::CocoaDelegate_applicationDidResignActive() +{ } bool wxApp::OnInitGui() @@ -224,6 +275,8 @@ bool wxApp::OnInitGui() // Create the app using the sharedApplication method m_cocoaApp = [NSApplication sharedApplication]; + m_cocoaAppDelegate = [[wxNSApplicationDelegate alloc] init]; + [m_cocoaApp setDelegate:m_cocoaAppDelegate]; wxMenuBarManager::CreateInstance(); @@ -231,7 +284,7 @@ bool wxApp::OnInitGui() // [ m_cocoaApp setDelegate:m_cocoaApp ]; #if 0 wxLogDebug("Just for kicks"); - [ m_cocoaApp performSelector:@selector(doIdle:) withObject:NULL ]; + [ m_cocoaAppDelegate performSelector:@selector(doIdle:) withObject:NULL ]; wxLogDebug("okay.. done now"); #endif return TRUE; @@ -251,48 +304,14 @@ bool wxApp::OnInit() return TRUE; } -bool wxApp::Initialized() -{ - if (GetTopWindow()) - return TRUE; - else - return FALSE; -} - -int wxApp::MainLoop() -{ - [m_cocoaApp run]; - return 0; -} - -void wxApp::ExitMainLoop() -{ - wxLogDebug("wxApp::ExitMailLoop m_isIdle=%d, isRunning=%d",(int)m_isIdle,(int)[m_cocoaApp isRunning]); -// CocoaInstallRequestedIdleHandler(); -// if(m_isIdle) -// [[ NSRunLoop currentRunLoop ] performSelector:@selector(doIdle:) target:m_cocoaApp argument:NULL order:0 modes:[NSArray arrayWithObjects:NSDefaultRunLoopMode, /* NSConnectionReplyRunLoopMode, NSModalPanelRunLoopMode, NSEventTrackingRunLoopMode,*/ nil] ]; -// actually.. we WANT the idle event -// or not -#if 0 - if(!m_isIdle) - [[ NSRunLoop currentRunLoop ] cancelPerformSelector:@selector(doIdle:) target:m_cocoaApp argument:NULL]; -#endif - [m_cocoaApp stop: m_cocoaApp]; -} - -// Is a message/event pending? -bool wxApp::Pending() +void wxApp::Exit() { - return 0; -} + wxApp::CleanUp(); -// Dispatch a message. -void wxApp::Dispatch() -{ + wxAppConsole::Exit(); } // Yield to other processes - bool wxApp::Yield(bool onlyIfNeeded) { // MT-FIXME @@ -316,8 +335,15 @@ bool wxApp::Yield(bool onlyIfNeeded) s_inYield = true; - wxLogDebug("WARNING: SUPPOSED to have yielded!"); - // FIXME: Do something! + // Run the event loop until it is out of events + while(NSEvent *event = [GetNSApplication() + nextEventMatchingMask:NSAnyEventMask + untilDate:[NSDate distantPast] + inMode:NSDefaultRunLoopMode + dequeue: YES]) + { + [GetNSApplication() sendEvent: event]; + } #if wxUSE_LOG // let the logs be flashed again