From 8b0ac23e9099524e171eafdfec5e80d18a930f8e Mon Sep 17 00:00:00 2001 From: Anatoly Spektor Date: Tue, 14 Aug 2012 09:11:01 -0400 Subject: Make gdk_gc_set_values() dynamic --- bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c | 10 +++++++++- bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h | 1 + .../Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java | 3 +-- 3 files changed, 11 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 b71852b2c0..a86aa020a5 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 @@ -5692,7 +5692,15 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1values) GdkGCValues _arg1, *lparg1=NULL; OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1values_FUNC); if (arg1) if ((lparg1 = getGdkGCValuesFields(env, arg1, &_arg1)) == NULL) goto fail; - gdk_gc_set_values((GdkGC *)arg0, (GdkGCValues *)lparg1, (GdkGCValuesMask)arg2); +/* + gdk_gc_set_values(arg0, (GdkGCValues *)lparg1, arg2); +*/ + { + OS_LOAD_FUNCTION(fp, gdk_gc_set_values) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong, GdkGCValues *, jint))fp)(arg0, (GdkGCValues *)lparg1, arg2); + } + } fail: OS_NATIVE_EXIT(env, that, _1gdk_1gc_1set_1values_FUNC); } 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 2671afd6da..0809a4394e 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 @@ -174,6 +174,7 @@ #define gdk_gc_set_line_attributes_LIB LIB_GDK #define gdk_gc_set_tile_LIB LIB_GDK #define gdk_gc_set_ts_origin_LIB LIB_GDK +#define gdk_gc_set_values_LIB LIB_GDK #define gdk_gc_get_values_LIB LIB_GDK #define gdk_pixbuf_save_to_bufferv_LIB LIB_GDK #define gdk_screen_get_default_LIB LIB_GDK 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 d221129a8e..9e04abac05 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 @@ -4267,9 +4267,8 @@ public static final void gdk_gc_set_ts_origin(int /*long*/ gc, int x, int y) { } } /** - * @param gc cast=(GdkGC *) + * @method flags=dynamic * @param values cast=(GdkGCValues *),flags=no_out - * @param values_mask cast=(GdkGCValuesMask) */ public static final native void _gdk_gc_set_values(int /*long*/ gc, GdkGCValues values, int values_mask); public static final void gdk_gc_set_values(int /*long*/ gc, GdkGCValues values, int values_mask) { -- cgit