From 6ac63603920d3df0b4f4be8ddd3df920bd8537e0 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Tue, 9 Oct 2012 12:58:44 +0300 Subject: Bug#391413 - Remove GdkGCValues_sizeof. Native was called to init the GdkGCValues class sizeof member which itself was not read anywhere. --- bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c | 12 ------------ .../org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c | 1 - .../org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h | 1 - .../gtk/org/eclipse/swt/internal/gtk/GdkGCValues.java | 1 - .../Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java | 1 - 5 files changed, 16 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 b4a5049595..275a4cf24b 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 @@ -645,18 +645,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(GdkEvent_1sizeof) } #endif -#ifndef NO_GdkGCValues_1sizeof -JNIEXPORT jint JNICALL OS_NATIVE(GdkGCValues_1sizeof) - (JNIEnv *env, jclass that) -{ - jint rc = 0; - OS_NATIVE_ENTER(env, that, GdkGCValues_1sizeof_FUNC); - rc = (jint)GdkGCValues_sizeof(); - OS_NATIVE_EXIT(env, that, GdkGCValues_1sizeof_FUNC); - return rc; -} -#endif - #ifndef NO_GdkGeometry_1sizeof JNIEXPORT jint JNICALL OS_NATIVE(GdkGeometry_1sizeof) (JNIEnv *env, jclass that) 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 77ca17ab03..c1d3dd5e29 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 @@ -79,7 +79,6 @@ char * OS_nativeFunctionNames[] = { "GdkEventVisibility_1sizeof", "GdkEventWindowState_1sizeof", "GdkEvent_1sizeof", - "GdkGCValues_1sizeof", "GdkGeometry_1sizeof", "GdkRectangle_1sizeof", "GdkWindowAttr_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 ad70de1ac7..64fcadf690 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 @@ -89,7 +89,6 @@ typedef enum { GdkEventVisibility_1sizeof_FUNC, GdkEventWindowState_1sizeof_FUNC, GdkEvent_1sizeof_FUNC, - GdkGCValues_1sizeof_FUNC, GdkGeometry_1sizeof_FUNC, GdkRectangle_1sizeof_FUNC, GdkWindowAttr_1sizeof_FUNC, diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkGCValues.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkGCValues.java index 0bde74d929..cfcc414f70 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkGCValues.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkGCValues.java @@ -64,5 +64,4 @@ public class GdkGCValues { public int cap_style; /** @field cast=(GdkJoinStyle) */ public int join_style; - public static final int sizeof = OS.GdkGCValues_sizeof(); } 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 af6fe48629..6c1525fe64 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 @@ -635,7 +635,6 @@ public static final native int GdkEventProperty_sizeof(); public static final native int GdkEventScroll_sizeof(); public static final native int GdkEventVisibility_sizeof(); public static final native int GdkEventWindowState_sizeof(); -public static final native int GdkGCValues_sizeof(); public static final native int GdkGeometry_sizeof(); public static final native int GdkRectangle_sizeof(); public static final native int GdkWindowAttr_sizeof(); -- cgit