Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h3
-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
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c67
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.h12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XCrossingEvent.java34
8 files changed, 0 insertions, 131 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 ff815205cc..b90a6f81ff 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
@@ -1005,18 +1005,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(XAnyEvent_1sizeof)
}
#endif
-#ifndef NO_XCrossingEvent_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(XCrossingEvent_1sizeof)
- (JNIEnv *env, jclass that)
-{
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, XCrossingEvent_1sizeof_FUNC);
- rc = (jint)XCrossingEvent_sizeof();
- OS_NATIVE_EXIT(env, that, XCrossingEvent_1sizeof_FUNC);
- return rc;
-}
-#endif
-
#ifndef NO_XEvent_1sizeof
JNIEXPORT jint JNICALL OS_NATIVE(XEvent_1sizeof)
(JNIEnv *env, jclass that)
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 0b592de445..3529430f35 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
@@ -46,7 +46,6 @@
/* X Structures */
#define NO_XClientMessageEvent
-#define NO_XCrossingEvent
#define NO_XExposeEvent
#define NO_XFocusChangeEvent
#define NO_XVisibilityEvent
@@ -80,10 +79,8 @@
#define NO__1gdk_window_lookup
#define NO__1gdk_window_add_filter
#define NO_memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I
-#define NO_memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I
#define NO_memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I
#define NO_memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I
-#define NO_memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II
#define NO_memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II
#define NO_memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II
#define NO_memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II
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 a56ac479f8..6bb6a23423 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
@@ -109,7 +109,6 @@ char * OS_nativeFunctionNames[] = {
"RTLD_1LAZY",
"RTLD_1NOW",
"XAnyEvent_1sizeof",
- "XCrossingEvent_1sizeof",
"XEvent_1sizeof",
"XExposeEvent_1sizeof",
"XFocusChangeEvent_1sizeof",
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 b3e972075f..ef84a68ddc 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
@@ -119,7 +119,6 @@ typedef enum {
RTLD_1LAZY_FUNC,
RTLD_1NOW_FUNC,
XAnyEvent_1sizeof_FUNC,
- XCrossingEvent_1sizeof_FUNC,
XEvent_1sizeof_FUNC,
XExposeEvent_1sizeof_FUNC,
XFocusChangeEvent_1sizeof_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c
index 75b244abb0..3dfe690c58 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c
@@ -2127,73 +2127,6 @@ void setXAnyEventFields(JNIEnv *env, jobject lpObject, XAnyEvent *lpStruct)
}
#endif
-#ifndef NO_XCrossingEvent
-typedef struct XCrossingEvent_FID_CACHE {
- int cached;
- jclass clazz;
- jfieldID root, subwindow, time, x, y, x_root, y_root, mode, detail, same_screen, focus, state;
-} XCrossingEvent_FID_CACHE;
-
-XCrossingEvent_FID_CACHE XCrossingEventFc;
-
-void cacheXCrossingEventFields(JNIEnv *env, jobject lpObject)
-{
- if (XCrossingEventFc.cached) return;
- cacheXAnyEventFields(env, lpObject);
- XCrossingEventFc.clazz = (*env)->GetObjectClass(env, lpObject);
- XCrossingEventFc.root = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "root", I_J);
- XCrossingEventFc.subwindow = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "subwindow", I_J);
- XCrossingEventFc.time = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "time", "I");
- XCrossingEventFc.x = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "x", "I");
- XCrossingEventFc.y = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "y", "I");
- XCrossingEventFc.x_root = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "x_root", "I");
- XCrossingEventFc.y_root = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "y_root", "I");
- XCrossingEventFc.mode = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "mode", "I");
- XCrossingEventFc.detail = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "detail", "I");
- XCrossingEventFc.same_screen = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "same_screen", "Z");
- XCrossingEventFc.focus = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "focus", "Z");
- XCrossingEventFc.state = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "state", "I");
- XCrossingEventFc.cached = 1;
-}
-
-XCrossingEvent *getXCrossingEventFields(JNIEnv *env, jobject lpObject, XCrossingEvent *lpStruct)
-{
- if (!XCrossingEventFc.cached) cacheXCrossingEventFields(env, lpObject);
- getXAnyEventFields(env, lpObject, (XAnyEvent *)lpStruct);
- lpStruct->root = (Window)(*env)->GetIntLongField(env, lpObject, XCrossingEventFc.root);
- lpStruct->subwindow = (Window)(*env)->GetIntLongField(env, lpObject, XCrossingEventFc.subwindow);
- lpStruct->time = (Time)(*env)->GetIntField(env, lpObject, XCrossingEventFc.time);
- lpStruct->x = (*env)->GetIntField(env, lpObject, XCrossingEventFc.x);
- lpStruct->y = (*env)->GetIntField(env, lpObject, XCrossingEventFc.y);
- lpStruct->x_root = (*env)->GetIntField(env, lpObject, XCrossingEventFc.x_root);
- lpStruct->y_root = (*env)->GetIntField(env, lpObject, XCrossingEventFc.y_root);
- lpStruct->mode = (*env)->GetIntField(env, lpObject, XCrossingEventFc.mode);
- lpStruct->detail = (*env)->GetIntField(env, lpObject, XCrossingEventFc.detail);
- lpStruct->same_screen = (Bool)(*env)->GetBooleanField(env, lpObject, XCrossingEventFc.same_screen);
- lpStruct->focus = (Bool)(*env)->GetBooleanField(env, lpObject, XCrossingEventFc.focus);
- lpStruct->state = (unsigned int)(*env)->GetIntField(env, lpObject, XCrossingEventFc.state);
- return lpStruct;
-}
-
-void setXCrossingEventFields(JNIEnv *env, jobject lpObject, XCrossingEvent *lpStruct)
-{
- if (!XCrossingEventFc.cached) cacheXCrossingEventFields(env, lpObject);
- setXAnyEventFields(env, lpObject, (XAnyEvent *)lpStruct);
- (*env)->SetIntLongField(env, lpObject, XCrossingEventFc.root, (jintLong)lpStruct->root);
- (*env)->SetIntLongField(env, lpObject, XCrossingEventFc.subwindow, (jintLong)lpStruct->subwindow);
- (*env)->SetIntField(env, lpObject, XCrossingEventFc.time, (jint)lpStruct->time);
- (*env)->SetIntField(env, lpObject, XCrossingEventFc.x, (jint)lpStruct->x);
- (*env)->SetIntField(env, lpObject, XCrossingEventFc.y, (jint)lpStruct->y);
- (*env)->SetIntField(env, lpObject, XCrossingEventFc.x_root, (jint)lpStruct->x_root);
- (*env)->SetIntField(env, lpObject, XCrossingEventFc.y_root, (jint)lpStruct->y_root);
- (*env)->SetIntField(env, lpObject, XCrossingEventFc.mode, (jint)lpStruct->mode);
- (*env)->SetIntField(env, lpObject, XCrossingEventFc.detail, (jint)lpStruct->detail);
- (*env)->SetBooleanField(env, lpObject, XCrossingEventFc.same_screen, (jboolean)lpStruct->same_screen);
- (*env)->SetBooleanField(env, lpObject, XCrossingEventFc.focus, (jboolean)lpStruct->focus);
- (*env)->SetIntField(env, lpObject, XCrossingEventFc.state, (jint)lpStruct->state);
-}
-#endif
-
#ifndef NO_XEvent
typedef struct XEvent_FID_CACHE {
int cached;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.h
index 66d638e0c9..7dd89d3df4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.h
@@ -543,18 +543,6 @@ void setXAnyEventFields(JNIEnv *env, jobject lpObject, XAnyEvent *lpStruct);
#define XAnyEvent_sizeof() 0
#endif
-#ifndef NO_XCrossingEvent
-void cacheXCrossingEventFields(JNIEnv *env, jobject lpObject);
-XCrossingEvent *getXCrossingEventFields(JNIEnv *env, jobject lpObject, XCrossingEvent *lpStruct);
-void setXCrossingEventFields(JNIEnv *env, jobject lpObject, XCrossingEvent *lpStruct);
-#define XCrossingEvent_sizeof() sizeof(XCrossingEvent)
-#else
-#define cacheXCrossingEventFields(a,b)
-#define getXCrossingEventFields(a,b,c) NULL
-#define setXCrossingEventFields(a,b,c)
-#define XCrossingEvent_sizeof() 0
-#endif
-
#ifndef NO_XEvent
void cacheXEventFields(JNIEnv *env, jobject lpObject);
XEvent *getXEventFields(JNIEnv *env, jobject lpObject, XEvent *lpStruct);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
index e5dcf1bdef..c685a447d4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
@@ -696,7 +696,6 @@ public static final native int PangoLogAttr_sizeof();
public static final native int PangoRectangle_sizeof();
public static final native int XAnyEvent_sizeof();
public static final native int XEvent_sizeof();
-public static final native int XCrossingEvent_sizeof();
public static final native int XExposeEvent_sizeof();
public static final native int XFocusChangeEvent_sizeof();
public static final native int XVisibilityEvent_sizeof();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XCrossingEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XCrossingEvent.java
deleted file mode 100644
index 77e44c4909..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XCrossingEvent.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.gtk;
-
-
-public class XCrossingEvent extends XAnyEvent {
- /** @field cast=(Window) */
- public long /*int*/ root;
- /** @field cast=(Window) */
- public long /*int*/ subwindow;
- /** @field cast=(Time) */
- public int time;
- public int x;
- public int y;
- public int x_root;
- public int y_root;
- public int mode;
- public int detail;
- /** @field cast=(Bool) */
- public boolean same_screen;
- /** @field cast=(Bool) */
- public boolean focus;
- /** @field cast=(unsigned int) */
- public int state;
- public static final int sizeof = OS.XCrossingEvent_sizeof();
-}

Back to the top