From 1b29b62773b879ebe6e2bfebcaf549fca1fa38b9 Mon Sep 17 00:00:00 2001 From: Anatoly Spektor Date: Tue, 7 Aug 2012 15:37:17 -0400 Subject: Remove unused GTK_WIDGET_SET_HEIGHT and GTK_WIDGET_SET_WIDTH --- .../org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c | 20 -------------------- .../Eclipse SWT PI/gtk/library/os_custom.h | 2 -- .../Eclipse SWT PI/gtk/library/os_stats.c | 6 ++---- .../Eclipse SWT PI/gtk/library/os_stats.h | 2 -- .../gtk/org/eclipse/swt/internal/gtk/OS.java | 4 ---- 5 files changed, 2 insertions(+), 32 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 6536e523dd..c8897bb7e8 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 @@ -339,26 +339,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1REQUISITION_1WIDTH) } #endif -#ifndef NO_GTK_1WIDGET_1SET_1HEIGHT -JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1HEIGHT) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) -{ - OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1SET_1HEIGHT_FUNC); - GTK_WIDGET_SET_HEIGHT((GtkWidget *)arg0, arg1); - OS_NATIVE_EXIT(env, that, GTK_1WIDGET_1SET_1HEIGHT_FUNC); -} -#endif - -#ifndef NO_GTK_1WIDGET_1SET_1WIDTH -JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1WIDTH) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) -{ - OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1SET_1WIDTH_FUNC); - GTK_WIDGET_SET_WIDTH((GtkWidget *)arg0, arg1); - OS_NATIVE_EXIT(env, that, GTK_1WIDGET_1SET_1WIDTH_FUNC); -} -#endif - #ifndef NO_GTK_1WIDGET_1SET_1X JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1X) (JNIEnv *env, jclass that, jintLong arg0, jint arg1) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h index 2b5ccc4bc4..42ff173ec1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h @@ -404,7 +404,6 @@ #else #define GTK_WIDGET_HEIGHT(arg0) (arg0)->allocation.height #endif -#define GTK_WIDGET_SET_HEIGHT(arg0, arg1) (arg0)->allocation.height = arg1 #ifndef GTK_WIDGET_MAPPED #define GTK_WIDGET_MAPPED(arg0) 0 #endif @@ -413,7 +412,6 @@ #else #define GTK_WIDGET_WIDTH(arg0) (arg0)->allocation.width #endif -#define GTK_WIDGET_SET_WIDTH(arg0, arg1) (arg0)->allocation.width = arg1 #if GTK_CHECK_VERSION(2,14,0) #define GTK_WIDGET_WINDOW(arg0) 0 #else 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 4e33f737a5..3f141d272a 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 @@ -18,8 +18,8 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 1332; -int OS_nativeFunctionCallCount[1332]; +int OS_nativeFunctionCount = 1330; +int OS_nativeFunctionCallCount[1330]; char * OS_nativeFunctionNames[] = { #ifndef JNI64 "Call__IIII", @@ -55,8 +55,6 @@ char * OS_nativeFunctionNames[] = { "GTK_1WIDGET_1HEIGHT", "GTK_1WIDGET_1REQUISITION_1HEIGHT", "GTK_1WIDGET_1REQUISITION_1WIDTH", - "GTK_1WIDGET_1SET_1HEIGHT", - "GTK_1WIDGET_1SET_1WIDTH", "GTK_1WIDGET_1SET_1X", "GTK_1WIDGET_1SET_1Y", "GTK_1WIDGET_1WIDTH", 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 d3c68639e1..ff90161771 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 @@ -63,8 +63,6 @@ typedef enum { GTK_1WIDGET_1HEIGHT_FUNC, GTK_1WIDGET_1REQUISITION_1HEIGHT_FUNC, GTK_1WIDGET_1REQUISITION_1WIDTH_FUNC, - GTK_1WIDGET_1SET_1HEIGHT_FUNC, - GTK_1WIDGET_1SET_1WIDTH_FUNC, GTK_1WIDGET_1SET_1X_FUNC, GTK_1WIDGET_1SET_1Y_FUNC, GTK_1WIDGET_1WIDTH_FUNC, 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 0b86c3d3d5..a1c1097216 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 @@ -740,10 +740,6 @@ public static final native void GTK_TOOLTIPS_SET_ACTIVE(int /*long*/ widget, int */ public static final native int /*long*/ GTK_TOOLTIPS_GET_TIP_TEXT(int /*long*/ data); /** @param widget cast=(GtkWidget *) */ -public static final native void GTK_WIDGET_SET_HEIGHT(int /*long*/ widget, int height); -/** @param widget cast=(GtkWidget *) */ -public static final native void GTK_WIDGET_SET_WIDTH(int /*long*/ widget, int width); -/** @param widget cast=(GtkWidget *) */ public static final native void GTK_WIDGET_SET_X(int /*long*/ widget, int x); /** @param widget cast=(GtkWidget *) */ public static final native void GTK_WIDGET_SET_Y(int /*long*/ widget, int y); -- cgit v1.2.3