diff options
| author | Alexander Kurtakov <akurtako@redhat.com> | 2013-07-12 18:54:29 +0300 |
|---|---|---|
| committer | Alexander Kurtakov <akurtako@redhat.com> | 2013-07-12 18:54:29 +0300 |
| commit | b23ea2e24f758a54ab6758b6481dfb86a9443288 (patch) | |
| tree | 8e7f5e690b78aa0ee9f4fb94f7764dfecfa38636 /bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library | |
| parent | 7d865938b30c1ae03ba599023ba96f0087c84faf (diff) | |
| download | eclipse.platform.swt-b23ea2e24f758a54ab6758b6481dfb86a9443288.tar.gz eclipse.platform.swt-b23ea2e24f758a54ab6758b6481dfb86a9443288.tar.xz eclipse.platform.swt-b23ea2e24f758a54ab6758b6481dfb86a9443288.zip | |
Get rid of gtk_object_sink.
It's obsoleted since Gtk 2.10 and g_object_ref_sink can be safely used
instead.
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library')
4 files changed, 1 insertions, 31 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 fd2ace6a78..909b4c4b78 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 @@ -3551,15 +3551,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1ref_1sink) { jintLong rc = 0; OS_NATIVE_ENTER(env, that, _1g_1object_1ref_1sink_FUNC); -/* - rc = (jintLong)g_object_ref_sink(arg0); -*/ - { - OS_LOAD_FUNCTION(fp, g_object_ref_sink) - if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); - } - } + rc = (jintLong)g_object_ref_sink((GObject *)arg0); OS_NATIVE_EXIT(env, that, _1g_1object_1ref_1sink_FUNC); return rc; } @@ -12102,24 +12094,6 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1tab_1pos) } #endif -#ifndef NO__1gtk_1object_1sink -JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1object_1sink) - (JNIEnv *env, jclass that, jintLong arg0) -{ - OS_NATIVE_ENTER(env, that, _1gtk_1object_1sink_FUNC); -/* - gtk_object_sink(arg0); -*/ - { - OS_LOAD_FUNCTION(fp, gtk_object_sink) - if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); - } - } - OS_NATIVE_EXIT(env, that, _1gtk_1object_1sink_FUNC); -} -#endif - #ifndef NO__1gtk_1orientable_1set_1orientation JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1orientable_1set_1orientation) (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 2c429ffe93..369d98af87 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 @@ -389,7 +389,6 @@ #define gdk_colormap_alloc_color_LIB LIB_GDK #define gdk_colormap_free_colors_LIB LIB_GDK #define gtk_enumerate_printers_LIB LIB_GTK -#define gtk_object_sink_LIB LIB_GTK #define gtk_orientable_set_orientation_LIB LIB_GTK #define gtk_paint_arrow_LIB LIB_GTK #define gtk_paint_box_LIB LIB_GTK @@ -523,7 +522,6 @@ #define g_icon_to_string_LIB LIB_GIO #define g_icon_new_for_string_LIB LIB_GIO #define g_file_query_info_LIB LIB_GIO -#define g_object_ref_sink_LIB LIB_GOBJECT // GTK3 only #define gtk_widget_draw_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 92680c1b34..fe58a914b3 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 @@ -903,7 +903,6 @@ char * OS_nativeFunctionNames[] = { "_1gtk_1notebook_1set_1scrollable", "_1gtk_1notebook_1set_1show_1tabs", "_1gtk_1notebook_1set_1tab_1pos", - "_1gtk_1object_1sink", "_1gtk_1orientable_1set_1orientation", "_1gtk_1page_1setup_1get_1bottom_1margin", "_1gtk_1page_1setup_1get_1left_1margin", 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 27152acee5..a0b7eef9ab 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 @@ -913,7 +913,6 @@ typedef enum { _1gtk_1notebook_1set_1scrollable_FUNC, _1gtk_1notebook_1set_1show_1tabs_FUNC, _1gtk_1notebook_1set_1tab_1pos_FUNC, - _1gtk_1object_1sink_FUNC, _1gtk_1orientable_1set_1orientation_FUNC, _1gtk_1page_1setup_1get_1bottom_1margin_FUNC, _1gtk_1page_1setup_1get_1left_1margin_FUNC, |