1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QCocoaApplicationDelegate: Play nice with the user's application delegate

Browse Source 
We tended to ignore the original application delegate a bit too often.

Change-Id: I0844c8658d128e4fbb9a6fc5000025f55e5293c2
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
This commit is contained in:
Gabriel de Dietrich 2013-09-24 19:37:39 +02:00 committed by The Qt Project
parent 466e0dff4b
commit 9a683bfb84
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
View File

@ -210,9 +210,10 @@ static void cleanupCocoaApplicationDelegate()
- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
{ {
// The reflection delegate gets precedence // The reflection delegate gets precedence
if (reflectionDelegate if (reflectionDelegate) {
&& [reflectionDelegate respondsToSelector:@selector(applicationShouldTerminate:)]) { if ([reflectionDelegate respondsToSelector:@selector(applicationShouldTerminate:)])
return [reflectionDelegate applicationShouldTerminate:sender]; return [reflectionDelegate applicationShouldTerminate:sender];
return NSTerminateNow;
} }
if ([self canQuit]) { if ([self canQuit]) {
@ -327,12 +328,11 @@ static void cleanupCocoaApplicationDelegate()
- (void)applicationDidBecomeActive:(NSNotification *)notification - (void)applicationDidBecomeActive:(NSNotification *)notification
{ {
Q_UNUSED(notification);
/*
if (reflectionDelegate if (reflectionDelegate
&& [reflectionDelegate respondsToSelector:@selector(applicationDidBecomeActive:)]) && [reflectionDelegate respondsToSelector:@selector(applicationDidBecomeActive:)])
[reflectionDelegate applicationDidBecomeActive:notification]; [reflectionDelegate applicationDidBecomeActive:notification];
/*
onApplicationChangedActivation(true); onApplicationChangedActivation(true);
if (!QWidget::mouseGrabber()){ if (!QWidget::mouseGrabber()){
@ -351,12 +351,11 @@ static void cleanupCocoaApplicationDelegate()
- (void)applicationDidResignActive:(NSNotification *)notification - (void)applicationDidResignActive:(NSNotification *)notification
{ {
Q_UNUSED(notification);
/*
if (reflectionDelegate if (reflectionDelegate
&& [reflectionDelegate respondsToSelector:@selector(applicationDidResignActive:)]) && [reflectionDelegate respondsToSelector:@selector(applicationDidResignActive:)])
[reflectionDelegate applicationDidResignActive:notification]; [reflectionDelegate applicationDidResignActive:notification];
/*
onApplicationChangedActivation(false); onApplicationChangedActivation(false);
if (!QWidget::mouseGrabber()) if (!QWidget::mouseGrabber())