strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vcl117: #i115469# activate application if termination was canceled

Browse source
This commit is contained in:
Philipp Lohmann [pl] 2010-11-08 12:33:56 +01:00
parent d38917161c
commit 49c2ff4974
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
vcl/aqua/source/app/vclnsapp.mm
View file

@ -360,6 +360,8 @@
{
YIELD_GUARD;
NSApplicationTerminateReply aReply = NSTerminateNow;
SalData* pSalData = GetSalData();
#if 1 // currently do some really bad hack
if( ! pSalData->maFrames.empty() )
@ -399,7 +401,7 @@
#endif
[(*it) release];
}
return NSTerminateCancel;
aReply = NSTerminateCancel;
}
#if OSL_DEBUG_LEVEL > 1
for( std::list< AquaSalFrame* >::iterator it = pSalData->maFrames.begin();
@ -416,9 +418,12 @@
#endif
}
#else // the clean version follows
return pSalData->maFrames.front()->CallCallback( SALEVENT_SHUTDOWN, NULL ) ? NSTerminateCancel : NSTerminateNow;
aReply = pSalData->maFrames.front()->CallCallback( SALEVENT_SHUTDOWN, NULL ) ? NSTerminateCancel : NSTerminateNow;
#endif
return NSTerminateNow;
if( aReply != NSTerminateNow )
[NSApp activateIgnoringOtherApps: YES];
return aReply;
}
-(void)systemColorsChanged: (NSNotification*) pNotification