stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7132692: [macosx] Class com.apple.eawt not functioning

Browse Source 
Postpone setting the application delegate until the app is fully initialized

Reviewed-by: art
This commit is contained in:
Anthony Petrov 2012-03-27 15:53:29 +04:00
parent b6cab6070f
commit 5c6579f46b
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jdk/src/macosx/native/sun/awt/awt.m
View File

@ -306,6 +306,18 @@ AWT_ASSERT_APPKIT_THREAD;
// AWT gets here AFTER +[AWTStarter appKitIsRunning:] is called.
if (verbose) AWT_DEBUG_LOG(@"got out of the AppKit startup mutex");
}
// Don't set the delegate until the NSApplication has been created and
// its finishLaunching has initialized it.
// ApplicationDelegate is the support code for com.apple.eawt.
void (^setDelegateBlock)() = ^(){
OSXAPP_SetApplicationDelegate([ApplicationDelegate sharedDelegate]);
};
if (onMainThread) {
setDelegateBlock();
} else {
[JNFRunLoop performOnMainThreadWaiting:YES withBlock:setDelegateBlock];
}
}
- (void)starter:(NSArray*)args {
@ -340,10 +352,6 @@ AWT_ASSERT_APPKIT_THREAD;
// AppKit Application.
NSApplication *app = [NSApplicationAWT sharedApplication];
// Don't set the delegate until the NSApplication has been created.
// ApplicationDelegate is the support code for com.apple.eawt.
OSXAPP_SetApplicationDelegate([ApplicationDelegate sharedDelegate]);
// AWT gets to this point BEFORE NSApplicationDidFinishLaunchingNotification is sent.
if (![app isRunning]) {
if (verbose) AWT_DEBUG_LOG(@"+[AWTStarter startAWT]: ![app isRunning]");