diff options
| author | Anatoly Spektor <aspektor@redhat.com> | 2012-06-13 17:02:42 -0400 |
|---|---|---|
| committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-06-18 15:27:39 -0400 |
| commit | a73bad47b78ec0a8ddcd0d1b16c795270c58cdc4 (patch) | |
| tree | d7394118ded6a354239e7d2cc2108ac12a6912d5 | |
| parent | 6cfe3d127e0b01ad97a0805575f2dfaa61a02410 (diff) | |
| download | eclipse.platform.swt-a73bad47b78ec0a8ddcd0d1b16c795270c58cdc4.tar.gz eclipse.platform.swt-a73bad47b78ec0a8ddcd0d1b16c795270c58cdc4.tar.xz eclipse.platform.swt-a73bad47b78ec0a8ddcd0d1b16c795270c58cdc4.zip | |
Make gdk_gc_get_values dynamic
3 files changed, 12 insertions, 4 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 1de5000e6d..8551e00df7 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 @@ -5717,8 +5717,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1get_1values) { GdkGCValues _arg1, *lparg1=NULL; OS_NATIVE_ENTER(env, that, _1gdk_1gc_1get_1values_FUNC); - if (arg1) if ((lparg1 = &_arg1) == NULL) goto fail; - gdk_gc_get_values((GdkGC *)arg0, (GdkGCValues *)lparg1); + if (arg1) if ((lparg1 = getGdkGCValuesFields(env, arg1, &_arg1)) == NULL) goto fail; +/* + gdk_gc_get_values(arg0, lparg1); +*/ + { + OS_LOAD_FUNCTION(fp, gdk_gc_get_values) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong, GdkGCValues *))fp)(arg0, lparg1); + } + } fail: if (arg1 && lparg1) setGdkGCValuesFields(env, arg1, lparg1); OS_NATIVE_EXIT(env, that, _1gdk_1gc_1get_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 cebd9cb41b..83a0bb93cc 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 @@ -165,6 +165,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_get_values_LIB LIB_GDK #define gdk_pixbuf_save_to_bufferv_LIB LIB_GDK #define gdk_screen_get_default_LIB LIB_GDK #define gdk_screen_get_monitor_at_point_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 1f1ee5bdd2..51f7edd486 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 @@ -4277,8 +4277,7 @@ public static final void gdk_flush() { } } /** - * @param gc cast=(GdkGC *) - * @param values cast=(GdkGCValues *),flags=no_in + * @method flags=dynamic */ public static final native void _gdk_gc_get_values(int /*long*/ gc, GdkGCValues values); public static final void gdk_gc_get_values(int /*long*/ gc, GdkGCValues values) { |