Compare commits

...

3 Commits

3 changed files with 8 additions and 4 deletions

View File

@@ -749,7 +749,7 @@ extern bool isSystemShortcut_NextWindowInApplication(NSUInteger modifiersMask, N
NSLog(@"Apple AWT : Error AWTView:awtComponent given bad parameters.");
if (env != NULL)
{
JNFDumpJavaStack(env);
JNF_EXECUTE_AND_HANDLE(JNFDumpJavaStack(env));
}
return NULL;
}
@@ -764,7 +764,7 @@ extern bool isSystemShortcut_NextWindowInApplication(NSUInteger modifiersMask, N
static JNF_MEMBER_CACHE(jf_Target, jc_LWWindowPeer, "target", "Ljava/awt/Component;");
if (peer == NULL) {
NSLog(@"Apple AWT : Error AWTView:awtComponent got null peer from CPlatformView");
JNFDumpJavaStack(env);
JNF_EXECUTE_AND_HANDLE(JNFDumpJavaStack(env));
return NULL;
}
jobject comp = JNFGetObjectField(env, peer, jf_Target);

View File

@@ -846,10 +846,9 @@ AWT_ASSERT_APPKIT_THREAD;
jobject platformWindow = [self.javaPlatformWindow jObjectWithEnv:env];
if (platformWindow != NULL) {
static JNF_MEMBER_CACHE(jm_windowDidBecomeMain, jc_CPlatformWindow, "windowDidBecomeMain", "()V");
JNFCallVoidMethod(env, platformWindow, jm_windowDidBecomeMain);
JNF_EXECUTE_AND_HANDLE(JNFCallVoidMethod(env, platformWindow, jm_windowDidBecomeMain));
(*env)->DeleteLocalRef(env, platformWindow);
}
[self orderChildWindows:YES];
}

View File

@@ -53,6 +53,11 @@ extern int useFontSmoothing;
+ (void) setLatestPerformKeyEquivalentEvent:(NSEvent *)val;
@end
#define JNF_EXECUTE_AND_HANDLE(jnf_method_call) \
JNF_COCOA_DURING(env) \
jnf_method_call; \
JNF_COCOA_HANDLE(env)
/*
* Utility Macros
*/