diff options
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library')
4 files changed, 77 insertions, 3 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 7f2beecf4c..8185f816e0 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 @@ -3580,6 +3580,26 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1ref) } #endif +#ifndef NO__1g_1object_1ref_1sink +JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1ref_1sink) + (JNIEnv *env, jclass that, jintLong arg0) +{ + 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); + } + } + OS_NATIVE_EXIT(env, that, _1g_1object_1ref_1sink_FUNC); + return rc; +} +#endif + #if (!defined(NO__1g_1object_1set__I_3BFI) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BFJ) && defined(JNI64)) #ifndef JNI64 JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BFI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jfloat arg2, jintLong arg3) @@ -7278,6 +7298,42 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1window_1lookup_1for_1display) } #endif +#ifndef NO__1glib_1major_1version +JNIEXPORT jint JNICALL OS_NATIVE(_1glib_1major_1version) + (JNIEnv *env, jclass that) +{ + jint rc = 0; + OS_NATIVE_ENTER(env, that, _1glib_1major_1version_FUNC); + rc = (jint)glib_major_version; + OS_NATIVE_EXIT(env, that, _1glib_1major_1version_FUNC); + return rc; +} +#endif + +#ifndef NO__1glib_1micro_1version +JNIEXPORT jint JNICALL OS_NATIVE(_1glib_1micro_1version) + (JNIEnv *env, jclass that) +{ + jint rc = 0; + OS_NATIVE_ENTER(env, that, _1glib_1micro_1version_FUNC); + rc = (jint)glib_micro_version; + OS_NATIVE_EXIT(env, that, _1glib_1micro_1version_FUNC); + return rc; +} +#endif + +#ifndef NO__1glib_1minor_1version +JNIEXPORT jint JNICALL OS_NATIVE(_1glib_1minor_1version) + (JNIEnv *env, jclass that) +{ + jint rc = 0; + OS_NATIVE_ENTER(env, that, _1glib_1minor_1version_FUNC); + rc = (jint)glib_minor_version; + OS_NATIVE_EXIT(env, that, _1glib_1minor_1version_FUNC); + return rc; +} +#endif + #ifndef NO__1gtk_1accel_1group_1new JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1accel_1group_1new) (JNIEnv *env, jclass that) @@ -10464,7 +10520,15 @@ 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((GtkObject *)arg0); +/* + 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 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 7aa2584af6..0a5fd5fe20 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 @@ -237,6 +237,7 @@ #define gdk_cairo_region_LIB LIB_GDK #define gdk_cairo_create_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_page_setup_get_bottom_margin_LIB LIB_GTK #define gtk_page_setup_get_left_margin_LIB LIB_GTK @@ -341,6 +342,7 @@ #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_GIO /* Field accessors */ #define G_OBJECT_CLASS_CONSTRUCTOR(arg0) (arg0)->constructor 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 010c8664f5..746a2767fc 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 = 1321; -int OS_nativeFunctionCallCount[1321]; +int OS_nativeFunctionCount = 1325; +int OS_nativeFunctionCallCount[1325]; char * OS_nativeFunctionNames[] = { #ifndef JNI64 "Call__IIII", @@ -293,6 +293,7 @@ char * OS_nativeFunctionNames[] = { "_1g_1object_1new", "_1g_1object_1notify", "_1g_1object_1ref", + "_1g_1object_1ref_1sink", #ifndef JNI64 "_1g_1object_1set__I_3BFI", #else @@ -584,6 +585,9 @@ char * OS_nativeFunctionNames[] = { "_1gdk_1x11_1screen_1lookup_1visual", "_1gdk_1x11_1visual_1get_1xvisual", "_1gdk_1x11_1window_1lookup_1for_1display", + "_1glib_1major_1version", + "_1glib_1micro_1version", + "_1glib_1minor_1version", "_1gtk_1accel_1group_1new", "_1gtk_1accel_1label_1set_1accel_1widget", "_1gtk_1accelerator_1get_1default_1mod_1mask", 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 0f49d17c1b..036e9d8d3a 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 @@ -301,6 +301,7 @@ typedef enum { _1g_1object_1new_FUNC, _1g_1object_1notify_FUNC, _1g_1object_1ref_FUNC, + _1g_1object_1ref_1sink_FUNC, #ifndef JNI64 _1g_1object_1set__I_3BFI_FUNC, #else @@ -592,6 +593,9 @@ typedef enum { _1gdk_1x11_1screen_1lookup_1visual_FUNC, _1gdk_1x11_1visual_1get_1xvisual_FUNC, _1gdk_1x11_1window_1lookup_1for_1display_FUNC, + _1glib_1major_1version_FUNC, + _1glib_1micro_1version_FUNC, + _1glib_1minor_1version_FUNC, _1gtk_1accel_1group_1new_FUNC, _1gtk_1accel_1label_1set_1accel_1widget_FUNC, _1gtk_1accelerator_1get_1default_1mod_1mask_FUNC, |