diff options
author | Alexander Kurtakov | 2016-07-26 21:41:10 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2016-07-26 21:41:10 +0000 |
commit | 6a5d3e119bdc4f831b7e68a8bfc59a68ab85ce25 (patch) | |
tree | c9e14492a968c38b99af1d0fececcf6e84be7c14 /bundles/org.eclipse.swt | |
parent | 299c156a55cd010e18dca59e8357cc6e97f0f3d5 (diff) | |
download | eclipse.platform.swt-6a5d3e119bdc4f831b7e68a8bfc59a68ab85ce25.tar.gz eclipse.platform.swt-6a5d3e119bdc4f831b7e68a8bfc59a68ab85ce25.tar.xz eclipse.platform.swt-6a5d3e119bdc4f831b7e68a8bfc59a68ab85ce25.zip |
Bug 498533 - Binding for gtk_adjustment_* shouldn't be dynamic
Have been added since Gtk 3.14. For dynamic functions compiler warnings
about deprecation are missing.
Change-Id: I66a4cc6080c69a15df3775fd0a2bc906f533d93c
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'bundles/org.eclipse.swt')
5 files changed, 0 insertions, 105 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 612fe0da79..423c0e5c55 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 @@ -567,18 +567,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(GdkWindowAttr_1sizeof) } #endif -#ifndef NO_GtkAdjustment_1sizeof -JNIEXPORT jint JNICALL OS_NATIVE(GtkAdjustment_1sizeof) - (JNIEnv *env, jclass that) -{ - jint rc = 0; - OS_NATIVE_ENTER(env, that, GtkAdjustment_1sizeof_FUNC); - rc = (jint)GtkAdjustment_sizeof(); - OS_NATIVE_EXIT(env, that, GtkAdjustment_1sizeof_FUNC); - return rc; -} -#endif - #ifndef NO_GtkAllocation_1sizeof JNIEXPORT jint JNICALL OS_NATIVE(GtkAllocation_1sizeof) (JNIEnv *env, jclass that) @@ -8845,15 +8833,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1configure) (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5, jdouble arg6) { OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1configure_FUNC); -/* gtk_adjustment_configure((GtkAdjustment *)arg0, arg1, arg2, arg3, arg4, arg5, arg6); -*/ - { - OS_LOAD_FUNCTION(fp, gtk_adjustment_configure) - if (fp) { - ((void (CALLING_CONVENTION*)(GtkAdjustment *, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble))fp)((GtkAdjustment *)arg0, arg1, arg2, arg3, arg4, arg5, arg6); - } - } OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1configure_FUNC); } #endif @@ -8864,15 +8844,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1adjustment_1get_1lower) { jdouble rc = 0; OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1lower_FUNC); -/* rc = (jdouble)gtk_adjustment_get_lower((GtkAdjustment *)arg0); -*/ - { - OS_LOAD_FUNCTION(fp, gtk_adjustment_get_lower) - if (fp) { - rc = (jdouble)((jdouble (CALLING_CONVENTION*)(GtkAdjustment *))fp)((GtkAdjustment *)arg0); - } - } OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1get_1lower_FUNC); return rc; } @@ -8884,15 +8856,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1adjustment_1get_1page_1increment) { jdouble rc = 0; OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1page_1increment_FUNC); -/* rc = (jdouble)gtk_adjustment_get_page_increment((GtkAdjustment *)arg0); -*/ - { - OS_LOAD_FUNCTION(fp, gtk_adjustment_get_page_increment) - if (fp) { - rc = (jdouble)((jdouble (CALLING_CONVENTION*)(GtkAdjustment *))fp)((GtkAdjustment *)arg0); - } - } OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1get_1page_1increment_FUNC); return rc; } @@ -8904,15 +8868,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1adjustment_1get_1page_1size) { jdouble rc = 0; OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1page_1size_FUNC); -/* rc = (jdouble)gtk_adjustment_get_page_size((GtkAdjustment *)arg0); -*/ - { - OS_LOAD_FUNCTION(fp, gtk_adjustment_get_page_size) - if (fp) { - rc = (jdouble)((jdouble (CALLING_CONVENTION*)(GtkAdjustment *))fp)((GtkAdjustment *)arg0); - } - } OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1get_1page_1size_FUNC); return rc; } @@ -8924,15 +8880,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1adjustment_1get_1step_1increment) { jdouble rc = 0; OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1step_1increment_FUNC); -/* rc = (jdouble)gtk_adjustment_get_step_increment((GtkAdjustment *)arg0); -*/ - { - OS_LOAD_FUNCTION(fp, gtk_adjustment_get_step_increment) - if (fp) { - rc = (jdouble)((jdouble (CALLING_CONVENTION*)(GtkAdjustment *))fp)((GtkAdjustment *)arg0); - } - } OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1get_1step_1increment_FUNC); return rc; } @@ -8944,15 +8892,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1adjustment_1get_1upper) { jdouble rc = 0; OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1upper_FUNC); -/* rc = (jdouble)gtk_adjustment_get_upper((GtkAdjustment *)arg0); -*/ - { - OS_LOAD_FUNCTION(fp, gtk_adjustment_get_upper) - if (fp) { - rc = (jdouble)((jdouble (CALLING_CONVENTION*)(GtkAdjustment *))fp)((GtkAdjustment *)arg0); - } - } OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1get_1upper_FUNC); return rc; } @@ -8964,15 +8904,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1adjustment_1get_1value) { jdouble rc = 0; OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1value_FUNC); -/* rc = (jdouble)gtk_adjustment_get_value((GtkAdjustment *)arg0); -*/ - { - OS_LOAD_FUNCTION(fp, gtk_adjustment_get_value) - if (fp) { - rc = (jdouble)((jdouble (CALLING_CONVENTION*)(GtkAdjustment *))fp)((GtkAdjustment *)arg0); - } - } OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1get_1value_FUNC); return rc; } @@ -8995,15 +8927,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1set_1page_1increment) (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1) { OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1set_1page_1increment_FUNC); -/* gtk_adjustment_set_page_increment((GtkAdjustment *)arg0, (gdouble)arg1); -*/ - { - OS_LOAD_FUNCTION(fp, gtk_adjustment_set_page_increment) - if (fp) { - ((void (CALLING_CONVENTION*)(GtkAdjustment *, gdouble))fp)((GtkAdjustment *)arg0, (gdouble)arg1); - } - } OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1set_1page_1increment_FUNC); } #endif @@ -9013,15 +8937,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1set_1step_1increment) (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1) { OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1set_1step_1increment_FUNC); -/* gtk_adjustment_set_step_increment((GtkAdjustment *)arg0, (gdouble)arg1); -*/ - { - OS_LOAD_FUNCTION(fp, gtk_adjustment_set_step_increment) - if (fp) { - ((void (CALLING_CONVENTION*)(GtkAdjustment *, gdouble))fp)((GtkAdjustment *)arg0, (gdouble)arg1); - } - } OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1set_1step_1increment_FUNC); } #endif 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 edb9149932..834ca3177b 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 @@ -119,15 +119,6 @@ #define gtk_widget_set_allocation_LIB LIB_GTK #define gtk_widget_set_opacity_LIB LIB_GTK #define gtk_widget_get_opacity_LIB LIB_GTK -#define gtk_adjustment_configure_LIB LIB_GTK -#define gtk_adjustment_get_lower_LIB LIB_GTK -#define gtk_adjustment_get_page_increment_LIB LIB_GTK -#define gtk_adjustment_get_page_size_LIB LIB_GTK -#define gtk_adjustment_get_step_increment_LIB LIB_GTK -#define gtk_adjustment_get_upper_LIB LIB_GTK -#define gtk_adjustment_get_value_LIB LIB_GTK -#define gtk_adjustment_set_page_increment_LIB LIB_GTK -#define gtk_adjustment_set_step_increment_LIB LIB_GTK #define gtk_scrollable_get_vadjustment_LIB LIB_GTK #define gtk_adjustment_value_changed_LIB LIB_GTK #define gtk_arrow_new_LIB LIB_GTK 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 01462da089..05085377e3 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 @@ -73,7 +73,6 @@ char * OS_nativeFunctionNames[] = { "GdkRGBA_1sizeof", "GdkRectangle_1sizeof", "GdkWindowAttr_1sizeof", - "GtkAdjustment_1sizeof", "GtkAllocation_1sizeof", "GtkBorder_1sizeof", "GtkCellRendererPixbufClass_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 f90efc9746..5f54bcc09b 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 @@ -83,7 +83,6 @@ typedef enum { GdkRGBA_1sizeof_FUNC, GdkRectangle_1sizeof_FUNC, GdkWindowAttr_1sizeof_FUNC, - GtkAdjustment_1sizeof_FUNC, GtkAllocation_1sizeof_FUNC, GtkBorder_1sizeof_FUNC, GtkCellRendererPixbufClass_1sizeof_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 99d9f31e69..0b25b03c49 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 @@ -791,7 +791,6 @@ public static final native int GdkEventWindowState_sizeof(); public static final native int GdkGeometry_sizeof(); public static final native int GdkRectangle_sizeof(); public static final native int GdkWindowAttr_sizeof(); -public static final native int GtkAdjustment_sizeof(); public static final native int GtkAllocation_sizeof(); public static final native int GtkBorder_sizeof(); public static final native int GtkRequisition_sizeof(); @@ -6348,7 +6347,6 @@ public static final long /*int*/ gtk_accessible_get_widget(long /*int*/ accessib } } /** - * @method flags=dynamic * @param adjustment cast=(GtkAdjustment *) */ public static final native void _gtk_adjustment_configure(long /*int*/ adjustment, double value, double lower, double upper, double step_increment, double page_increment, double page_size); @@ -6377,7 +6375,6 @@ public static final long /*int*/ gtk_adjustment_new(double value, double lower, } } /** - * @method flags=dynamic * @param adjustment cast=(GtkAdjustment *) */ public static final native double _gtk_adjustment_get_lower(long /*int*/ adjustment); @@ -6390,7 +6387,6 @@ public static final double gtk_adjustment_get_lower(long /*int*/ adjustment) { } } /** - * @method flags=dynamic * @param adjustment cast=(GtkAdjustment *) */ public static final native double _gtk_adjustment_get_page_increment(long /*int*/ adjustment); @@ -6403,7 +6399,6 @@ public static final double gtk_adjustment_get_page_increment(long /*int*/ adjust } } /** - * @method flags=dynamic * @param adjustment cast=(GtkAdjustment *) */ public static final native double _gtk_adjustment_get_page_size(long /*int*/ adjustment); @@ -6416,7 +6411,6 @@ public static final double gtk_adjustment_get_page_size(long /*int*/ adjustment) } } /** - * @method flags=dynamic * @param adjustment cast=(GtkAdjustment *) */ public static final native double _gtk_adjustment_get_step_increment(long /*int*/ adjustment); @@ -6429,7 +6423,6 @@ public static final double gtk_adjustment_get_step_increment(long /*int*/ adjust } } /** - * @method flags=dynamic * @param adjustment cast=(GtkAdjustment *) */ public static final native double _gtk_adjustment_get_upper(long /*int*/ adjustment); @@ -6442,7 +6435,6 @@ public static final double gtk_adjustment_get_upper(long /*int*/ adjustment) { } } /** - * @method flags=dynamic * @param adjustment cast=(GtkAdjustment *) */ public static final native double _gtk_adjustment_get_value(long /*int*/ adjustment); @@ -6468,7 +6460,6 @@ public static final void gtk_adjustment_set_value(long /*int*/ adjustment, doubl } } /** - * @method flags=dynamic * @param adjustment cast=(GtkAdjustment *) * @param value cast=(gdouble) */ @@ -6482,7 +6473,6 @@ public static final void gtk_adjustment_set_step_increment(long /*int*/ adjustme } } /** - * @method flags=dynamic * @param adjustment cast=(GtkAdjustment *) * @param value cast=(gdouble) */ |