diff options
author | Anatoly Spektor | 2013-07-22 14:35:21 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2013-07-22 18:11:43 +0000 |
commit | 736f3504b73ddd8798275afb314097948fa34604 (patch) | |
tree | 6316f5a20961a1251adf43ec8cc53bbf23e41882 | |
parent | cf7344c917d28549fa1275a28c1472116f28f35a (diff) | |
download | eclipse.platform.swt-736f3504b73ddd8798275afb314097948fa34604.tar.gz eclipse.platform.swt-736f3504b73ddd8798275afb314097948fa34604.tar.xz eclipse.platform.swt-736f3504b73ddd8798275afb314097948fa34604.zip |
Bug #413455 - Remove unused GTK_SCROLLED_WINDOW_[V,H]SCROLLBAR
Signed-off-by: Anatoly Spektor <aspektor@redhat.com>
5 files changed, 1 insertions, 43 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 6c4ecc273b..d96f38876a 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 @@ -173,18 +173,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1RANGE_1SLIDER_1START) } #endif -#ifndef NO_GTK_1SCROLLED_1WINDOW_1HSCROLLBAR -JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1HSCROLLBAR) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, GTK_1SCROLLED_1WINDOW_1HSCROLLBAR_FUNC); - rc = (jintLong)GTK_SCROLLED_WINDOW_HSCROLLBAR((GtkScrolledWindow *)arg0); - OS_NATIVE_EXIT(env, that, GTK_1SCROLLED_1WINDOW_1HSCROLLBAR_FUNC); - return rc; -} -#endif - #ifndef NO_GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING JNIEXPORT jint JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING) (JNIEnv *env, jclass that, jintLong arg0) @@ -197,18 +185,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING) } #endif -#ifndef NO_GTK_1SCROLLED_1WINDOW_1VSCROLLBAR -JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1VSCROLLBAR) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, GTK_1SCROLLED_1WINDOW_1VSCROLLBAR_FUNC); - rc = (jintLong)GTK_SCROLLED_WINDOW_VSCROLLBAR((GtkScrolledWindow *)arg0); - OS_NATIVE_EXIT(env, that, GTK_1SCROLLED_1WINDOW_1VSCROLLBAR_FUNC); - return rc; -} -#endif - #ifndef NO_GTK_1TEXTVIEW_1IM_1CONTEXT JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1TEXTVIEW_1IM_1CONTEXT) (JNIEnv *env, jclass that, jintLong arg0) 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 d20fb59a8f..1e26b3fd9b 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 @@ -578,17 +578,7 @@ #else #define GTK_RANGE_SLIDER_END(arg0) (arg0)->slider_end #endif -#if GTK_CHECK_VERSION(2,8,0) -#define GTK_SCROLLED_WINDOW_HSCROLLBAR(arg0) 0 -#else -#define GTK_SCROLLED_WINDOW_HSCROLLBAR(arg0) (arg0)->hscrollbar -#endif -#define GTK_SCROLLED_WINDOW_SCROLLBAR_SPACING(arg0) (GTK_SCROLLED_WINDOW_GET_CLASS (arg0)->scrollbar_spacing >= 0 ? GTK_SCROLLED_WINDOW_GET_CLASS (arg0)->scrollbar_spacing : 3) -#if GTK_CHECK_VERSION(2,8,0) -#define GTK_SCROLLED_WINDOW_VSCROLLBAR(arg0) 0 -#else -#define GTK_SCROLLED_WINDOW_VSCROLLBAR(arg0) (arg0)->vscrollbar -#endif +#define GTK_SCROLLED_WINDOW_SCROLLBAR_SPACING(arg0) (GTK_SCROLLED_WINDOW_GET_CLASS (arg0)->scrollbar_spacing >= 0 ? GTK_SCROLLED_WINDOW_GET_CLASS (arg0)->scrollbar_spacing : 3) #ifndef GTK_WIDGET_HAS_DEFAULT #define GTK_WIDGET_HAS_DEFAULT(arg0) 0 #endif 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 449e060be1..d43a284070 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 @@ -39,9 +39,7 @@ char * OS_nativeFunctionNames[] = { "GTK_1ENTRY_1IM_1CONTEXT", "GTK_1RANGE_1SLIDER_1END", "GTK_1RANGE_1SLIDER_1START", - "GTK_1SCROLLED_1WINDOW_1HSCROLLBAR", "GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING", - "GTK_1SCROLLED_1WINDOW_1VSCROLLBAR", "GTK_1TEXTVIEW_1IM_1CONTEXT", "GTK_1TOOLTIPS_1GET_1TIP_1TEXT", "GTK_1TOOLTIPS_1SET_1ACTIVE", 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 08f8b60564..c05f6e62da 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 @@ -49,9 +49,7 @@ typedef enum { GTK_1ENTRY_1IM_1CONTEXT_FUNC, GTK_1RANGE_1SLIDER_1END_FUNC, GTK_1RANGE_1SLIDER_1START_FUNC, - GTK_1SCROLLED_1WINDOW_1HSCROLLBAR_FUNC, GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING_FUNC, - GTK_1SCROLLED_1WINDOW_1VSCROLLBAR_FUNC, GTK_1TEXTVIEW_1IM_1CONTEXT_FUNC, GTK_1TOOLTIPS_1GET_1TIP_1TEXT_FUNC, GTK_1TOOLTIPS_1SET_1ACTIVE_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 a731264a7f..a03ed06b48 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 @@ -734,10 +734,6 @@ public static final native int GTK_RANGE_SLIDER_START(long /*int*/ widget); /** @param widget cast=(GtkRange *) */ public static final native int GTK_RANGE_SLIDER_END(long /*int*/ widget); /** @param widget cast=(GtkScrolledWindow *) */ -public static final native long /*int*/ GTK_SCROLLED_WINDOW_HSCROLLBAR(long /*int*/ widget); -/** @param widget cast=(GtkScrolledWindow *) */ -public static final native long /*int*/ GTK_SCROLLED_WINDOW_VSCROLLBAR(long /*int*/ widget); -/** @param widget cast=(GtkScrolledWindow *) */ public static final native int GTK_SCROLLED_WINDOW_SCROLLBAR_SPACING(long /*int*/ widget); /** * @param acce_label cast=(GtkAccelLabel *) |