removed assert which became incorrect after last change

[wxWidgets.git] / src / cocoa / app.mm

diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm
index c4fe8f3181f6feb97d94dcca160b520d03421842..d1676de387cba9a4505013c577f50bf06c30cfcb 100644 (file)
--- a/src/cocoa/app.mm
+++ b/src/cocoa/app.mm
@@ -49,20 +49,44 @@ wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL;
 {
 }
 
-- (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);
     wxASSERT(wxMenuBarManager::GetInstance());
-    wxMenuBarManager::GetInstance()->CocoaInternalIdle();
     wxLogDebug("doIdle called");
 #ifdef __WXDEBUG__
     if(wxTheApp->IsInAssert())
@@ -91,21 +115,35 @@ WX_IMPLEMENT_POSER(wxPoserNSApplication);
     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
+- (void)applicationDidBecomeActive:(NSNotification *)notification
+{
+    wxTheApp->CocoaDelegate_applicationDidBecomeActive();
+}
+
+- (void)applicationWillResignActive:(NSNotification *)notification
+{
+    wxTheApp->CocoaDelegate_applicationWillResignActive();
+}
+
+- (void)applicationDidResignActive:(NSNotification *)notification
+{
+    wxTheApp->CocoaDelegate_applicationDidResignActive();
+}
+
+@end // implementation wxNSApplicationDelegate : NSObject
 
 // ========================================================================
 // wxApp
@@ -135,10 +173,11 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     if ( argc > 1 )
     {
         static const wxChar *ARG_PSN = _T("-psn_");
-        if ( wxStrncmp(argv[1], ARG_PSN, sizeof(ARG_PSN) - 1) == 0 )
+        if ( wxStrncmp(argv[1], ARG_PSN, strlen(ARG_PSN)) == 0 )
         {
             // remove this argument
-            memmove(argv, argv + 1, argc--);
+            --argc;
+            memmove(argv + 1, argv + 2, argc * sizeof(char *));
         }
     }
 
@@ -151,9 +190,15 @@ 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();
 }
 
@@ -175,6 +220,7 @@ wxApp::wxApp()
     argc = 0;
     argv = NULL;
     m_cocoaApp = NULL;
+    m_cocoaAppDelegate = NULL;
 }
 
 void wxApp::CocoaInstallIdleHandler()
@@ -192,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()
@@ -203,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();
 
@@ -210,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;
@@ -237,39 +311,6 @@ void wxApp::Exit()
     wxAppConsole::Exit();
 }
 
-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()
-{
-    return 0;
-}
-
-// Dispatch a message.
-bool wxApp::Dispatch()
-{
-    return true;
-}
-
 // Yield to other processes
 bool wxApp::Yield(bool onlyIfNeeded)
 {