diff options
author | Anatoly Spektor <aspektor@redhat.com> | 2012-08-16 10:43:52 -0400 |
---|---|---|
committer | Anatoly Spektor <aspektor@redhat.com> | 2012-08-16 10:43:52 -0400 |
commit | 021a1ebd5617f2a2522946c426e71c924350a2da (patch) | |
tree | 3de99fa1ad8404c147682418773d31c5cb9b4711 | |
parent | a8df1e15257a1f009104e7db01a711e35c6ae971 (diff) | |
download | eclipse.platform.swt-gtk_has_stepper.tar.gz eclipse.platform.swt-gtk_has_stepper.tar.xz eclipse.platform.swt-gtk_has_stepper.zip |
Omit use of GTK_RANGE_HAS_STEPPER_A,B,C,D constants for newer GTK+gtk_has_stepper
6 files changed, 15 insertions, 74 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 92f1670fae..da0dcac946 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 @@ -149,54 +149,6 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1ENTRY_1IM_1CONTEXT) } #endif -#ifndef NO_GTK_1RANGE_1HAS_1STEPPER_1A -JNIEXPORT jboolean JNICALL OS_NATIVE(GTK_1RANGE_1HAS_1STEPPER_1A) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jboolean rc = 0; - OS_NATIVE_ENTER(env, that, GTK_1RANGE_1HAS_1STEPPER_1A_FUNC); - rc = (jboolean)GTK_RANGE_HAS_STEPPER_A((GtkRange *)arg0); - OS_NATIVE_EXIT(env, that, GTK_1RANGE_1HAS_1STEPPER_1A_FUNC); - return rc; -} -#endif - -#ifndef NO_GTK_1RANGE_1HAS_1STEPPER_1B -JNIEXPORT jboolean JNICALL OS_NATIVE(GTK_1RANGE_1HAS_1STEPPER_1B) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jboolean rc = 0; - OS_NATIVE_ENTER(env, that, GTK_1RANGE_1HAS_1STEPPER_1B_FUNC); - rc = (jboolean)GTK_RANGE_HAS_STEPPER_B((GtkRange *)arg0); - OS_NATIVE_EXIT(env, that, GTK_1RANGE_1HAS_1STEPPER_1B_FUNC); - return rc; -} -#endif - -#ifndef NO_GTK_1RANGE_1HAS_1STEPPER_1C -JNIEXPORT jboolean JNICALL OS_NATIVE(GTK_1RANGE_1HAS_1STEPPER_1C) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jboolean rc = 0; - OS_NATIVE_ENTER(env, that, GTK_1RANGE_1HAS_1STEPPER_1C_FUNC); - rc = (jboolean)GTK_RANGE_HAS_STEPPER_C((GtkRange *)arg0); - OS_NATIVE_EXIT(env, that, GTK_1RANGE_1HAS_1STEPPER_1C_FUNC); - return rc; -} -#endif - -#ifndef NO_GTK_1RANGE_1HAS_1STEPPER_1D -JNIEXPORT jboolean JNICALL OS_NATIVE(GTK_1RANGE_1HAS_1STEPPER_1D) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jboolean rc = 0; - OS_NATIVE_ENTER(env, that, GTK_1RANGE_1HAS_1STEPPER_1D_FUNC); - rc = (jboolean)GTK_RANGE_HAS_STEPPER_D((GtkRange *)arg0); - OS_NATIVE_EXIT(env, that, GTK_1RANGE_1HAS_1STEPPER_1D_FUNC); - return rc; -} -#endif - #ifndef NO_GTK_1RANGE_1SLIDER_1END JNIEXPORT jint JNICALL OS_NATIVE(GTK_1RANGE_1SLIDER_1END) (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 3b2b5ba659..a94b0dc59f 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 @@ -369,10 +369,6 @@ #define GTK_ACCEL_LABEL_GET_ACCEL_STRING(arg0) (arg0)->accel_string #define GTK_RANGE_SLIDER_START(arg0) (arg0)->slider_start #define GTK_RANGE_SLIDER_END(arg0) (arg0)->slider_end -#define GTK_RANGE_HAS_STEPPER_A(arg0) (arg0)->has_stepper_a -#define GTK_RANGE_HAS_STEPPER_B(arg0) (arg0)->has_stepper_b -#define GTK_RANGE_HAS_STEPPER_C(arg0) (arg0)->has_stepper_c -#define GTK_RANGE_HAS_STEPPER_D(arg0) (arg0)->has_stepper_d #if GTK_CHECK_VERSION(2,8,0) #define GTK_SCROLLED_WINDOW_HSCROLLBAR(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 b1b6aaeda9..e24e401d7a 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 = 1335; -int OS_nativeFunctionCallCount[1335]; +int OS_nativeFunctionCount = 1331; +int OS_nativeFunctionCallCount[1331]; char * OS_nativeFunctionNames[] = { #ifndef JNI64 "Call__IIII", @@ -39,10 +39,6 @@ char * OS_nativeFunctionNames[] = { "GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING", "GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING", "GTK_1ENTRY_1IM_1CONTEXT", - "GTK_1RANGE_1HAS_1STEPPER_1A", - "GTK_1RANGE_1HAS_1STEPPER_1B", - "GTK_1RANGE_1HAS_1STEPPER_1C", - "GTK_1RANGE_1HAS_1STEPPER_1D", "GTK_1RANGE_1SLIDER_1END", "GTK_1RANGE_1SLIDER_1START", "GTK_1SCROLLED_1WINDOW_1HSCROLLBAR", 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 81bd7056a9..a917b5b44a 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 @@ -47,10 +47,6 @@ typedef enum { GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING_FUNC, GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING_FUNC, GTK_1ENTRY_1IM_1CONTEXT_FUNC, - GTK_1RANGE_1HAS_1STEPPER_1A_FUNC, - GTK_1RANGE_1HAS_1STEPPER_1B_FUNC, - GTK_1RANGE_1HAS_1STEPPER_1C_FUNC, - GTK_1RANGE_1HAS_1STEPPER_1D_FUNC, GTK_1RANGE_1SLIDER_1END_FUNC, GTK_1RANGE_1SLIDER_1START_FUNC, GTK_1SCROLLED_1WINDOW_1HSCROLLBAR_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 1b27f48bda..18bc4621d6 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 @@ -563,6 +563,10 @@ public class OS extends C { public static final byte[] gtk_menu_bar_accel = ascii("gtk-menu-bar-accel"); public static final byte[] gtk_menu_images = ascii("gtk-menu-images"); public static final byte[] inner_border = ascii("inner-border"); + public static final byte[] has_backward_stepper = ascii("has-backward-stepper"); + public static final byte[] has_secondary_backward_stepper = ascii("has-secondary-backward-stepper"); + public static final byte[] has_forward_stepper = ascii("has-forward-stepper"); + public static final byte[] has_secondary_forward_stepper = ascii("has-secondary-forward-stepper"); public static final byte[] horizontal_separator = ascii("horizontal-separator"); public static final byte[] inconsistent = ascii("inconsistent"); public static final byte[] indicator_size = ascii("indicator-size"); @@ -703,14 +707,6 @@ public static final native int GTK_WIDGET_Y(int /*long*/ widget); public static final native int GTK_RANGE_SLIDER_START(int /*long*/ widget); /** @param widget cast=(GtkRange *) */ public static final native int GTK_RANGE_SLIDER_END(int /*long*/ widget); -/** @param widget cast=(GtkRange *) */ -public static final native boolean GTK_RANGE_HAS_STEPPER_A(int /*long*/ widget); -/** @param widget cast=(GtkRange *) */ -public static final native boolean GTK_RANGE_HAS_STEPPER_B(int /*long*/ widget); -/** @param widget cast=(GtkRange *) */ -public static final native boolean GTK_RANGE_HAS_STEPPER_C(int /*long*/ widget); -/** @param widget cast=(GtkRange *) */ -public static final native boolean GTK_RANGE_HAS_STEPPER_D(int /*long*/ widget); /** @param widget cast=(GtkScrolledWindow *) */ public static final native int /*long*/ GTK_SCROLLED_WINDOW_HSCROLLBAR(int /*long*/ widget); /** @param widget cast=(GtkScrolledWindow *) */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java index 2cf5fbeaea..92298312f8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java @@ -396,10 +396,15 @@ public Rectangle getThumbBounds () { public Rectangle getThumbTrackBounds () { checkWidget(); int x = 0, y = 0, width, height; - boolean hasA = OS.GTK_RANGE_HAS_STEPPER_A (handle); - boolean hasB = OS.GTK_RANGE_HAS_STEPPER_B (handle); - boolean hasC = OS.GTK_RANGE_HAS_STEPPER_C (handle); - boolean hasD = OS.GTK_RANGE_HAS_STEPPER_D (handle); + int[] has_stepper = new int[1]; + OS.gtk_widget_style_get (handle, OS.has_backward_stepper, has_stepper, 0); + boolean hasA = has_stepper[0] != 0; + OS.gtk_widget_style_get (handle, OS.has_secondary_backward_stepper, has_stepper, 0); + boolean hasB = has_stepper[0] != 0; + OS.gtk_widget_style_get (handle, OS.has_forward_stepper, has_stepper, 0); + boolean hasC = has_stepper[0] != 0; + OS.gtk_widget_style_get (handle, OS.has_secondary_forward_stepper, has_stepper, 0); + boolean hasD = has_stepper[0] != 0; GtkAllocation allocation = new GtkAllocation (); int stepperSize = 0; if ((style & SWT.VERTICAL) != 0) { |