Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Williams2019-01-21 17:15:34 +0000
committerEric Williams2019-01-22 16:33:28 +0000
commit18ad75e8f857ef2292b160e31e6c3dd01124ce88 (patch)
tree7edacca8a7c0108416841c8656e67900f5ef3ae4 /bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library
parentf4f69c8eff4871bd108196372a87db536d60f874 (diff)
downloadeclipse.platform.swt-18ad75e8f857ef2292b160e31e6c3dd01124ce88.tar.gz
eclipse.platform.swt-18ad75e8f857ef2292b160e31e6c3dd01124ce88.tar.xz
eclipse.platform.swt-18ad75e8f857ef2292b160e31e6c3dd01124ce88.zip
Bug 541650: [GTK4] GdkEvents are private and can no longer be created
Handle GdkEventCrossing cases. Change-Id: I4ec60d2dcc7e84575b09b65e010d660b6dcd795e Signed-off-by: Eric Williams <ericwill@redhat.com>
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c16
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h1
4 files changed, 19 insertions, 0 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
index cbaa2a9053..3a9e943c6d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
@@ -997,6 +997,22 @@ fail:
}
#endif
+#ifndef NO__1gdk_1event_1get_1crossing_1mode
+JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1event_1get_1crossing_1mode)
+ (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1)
+{
+ jint *lparg1=NULL;
+ jboolean rc = 0;
+ GDK_NATIVE_ENTER(env, that, _1gdk_1event_1get_1crossing_1mode_FUNC);
+ if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ rc = (jboolean)gdk_event_get_crossing_mode((GdkEvent *)arg0, (GdkCrossingMode *)lparg1);
+fail:
+ if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ GDK_NATIVE_EXIT(env, that, _1gdk_1event_1get_1crossing_1mode_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO__1gdk_1event_1get_1event_1type
JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1event_1get_1event_1type)
(JNIEnv *env, jclass that, jintLong arg0)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
index d1f09f7100..542b9a00f3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
@@ -446,6 +446,7 @@
#define NO__1gdk_1event_1get_1focus_1in
#define NO__1gdk_1event_1get_1string
#define NO__1gdk_1event_1get_1key_1group
+#define NO__1gdk_1event_1get_1crossing_1mode
#endif
#include "os_custom.h"
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
index 4b5964e794..9bcbfa3c73 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
@@ -104,6 +104,7 @@ char * GDK_nativeFunctionNames[] = {
"_1gdk_1event_1get",
"_1gdk_1event_1get_1button",
"_1gdk_1event_1get_1coords",
+ "_1gdk_1event_1get_1crossing_1mode",
"_1gdk_1event_1get_1event_1type",
"_1gdk_1event_1get_1focus_1in",
"_1gdk_1event_1get_1key_1group",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
index 7ad9719ce8..dba5be2a6d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
@@ -114,6 +114,7 @@ typedef enum {
_1gdk_1event_1get_FUNC,
_1gdk_1event_1get_1button_FUNC,
_1gdk_1event_1get_1coords_FUNC,
+ _1gdk_1event_1get_1crossing_1mode_FUNC,
_1gdk_1event_1get_1event_1type_FUNC,
_1gdk_1event_1get_1focus_1in_FUNC,
_1gdk_1event_1get_1key_1group_FUNC,

Back to the top