aboutsummaryrefslogtreecommitdiffstats
path: root/src/nativewindow
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-07-20 15:44:00 +0200
committerSven Gothel <[email protected]>2012-07-20 15:44:00 +0200
commit72785ac35aa7c95bc675f3d773c6a7764b5b0ddc (patch)
tree9b8138a7a6b1bf69002395822cdaeae3962d1bf0 /src/nativewindow
parent06b6a74f4915a539f6025112a82e517d8e8cb7af (diff)
Fix OSX regression of commit 20bf031db719f7baa4c6e74734fc999061e08fe2 - handling w/ non NSView handles (pbuffer)
Diffstat (limited to 'src/nativewindow')
-rw-r--r--src/nativewindow/classes/jogamp/nativewindow/macosx/OSXUtil.java5
-rw-r--r--src/nativewindow/native/macosx/OSXmisc.m6
2 files changed, 11 insertions, 0 deletions
diff --git a/src/nativewindow/classes/jogamp/nativewindow/macosx/OSXUtil.java b/src/nativewindow/classes/jogamp/nativewindow/macosx/OSXUtil.java
index 99fc9244e..4767dff18 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/macosx/OSXUtil.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/macosx/OSXUtil.java
@@ -59,6 +59,10 @@ public class OSXUtil {
return false;
}
+ public static boolean isNSView(long object) {
+ return isNSView0(object);
+ }
+
public static Point GetLocationOnScreen(long windowOrView, int src_x, int src_y) {
return (Point) GetLocationOnScreen0(windowOrView, src_x, src_y);
}
@@ -129,6 +133,7 @@ public class OSXUtil {
} */
private static native boolean initIDs0();
+ private static native boolean isNSView0(long object);
private static native Object GetLocationOnScreen0(long windowOrView, int src_x, int src_y);
private static native long CreateNSWindow0(int x, int y, int width, int height);
private static native void DestroyNSWindow0(long nsWindow);
diff --git a/src/nativewindow/native/macosx/OSXmisc.m b/src/nativewindow/native/macosx/OSXmisc.m
index ebfefe345..37fa4c88f 100644
--- a/src/nativewindow/native/macosx/OSXmisc.m
+++ b/src/nativewindow/native/macosx/OSXmisc.m
@@ -92,6 +92,12 @@ Java_jogamp_nativewindow_macosx_OSXUtil_initIDs0(JNIEnv *env, jclass _unused) {
return JNI_TRUE;
}
+JNIEXPORT jboolean JNICALL
+Java_jogamp_nativewindow_macosx_OSXUtil_isNSView0(JNIEnv *env, jclass _unused, jlong object) {
+ NSObject *nsObj = (NSObject*) (intptr_t) object;
+ return [nsObj isMemberOfClass:[NSView class]];
+}
+
/*
* Class: Java_jogamp_nativewindow_macosx_OSXUtil
* Method: getLocationOnScreen0