aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnatoly Spektor2012-08-14 09:11:01 (EDT)
committerSilenio Quarti2012-08-14 10:38:51 (EDT)
commit5213f26974b8ca431962cd7253d22584483728fc (patch)
tree726e306c9410f0b128f8657155f83fcf0dd87fcf
parent603ae928bf13d2666ccd758f83d4469abb1a310a (diff)
downloadeclipse.platform.swt-5213f26974b8ca431962cd7253d22584483728fc.zip
eclipse.platform.swt-5213f26974b8ca431962cd7253d22584483728fc.tar.gz
eclipse.platform.swt-5213f26974b8ca431962cd7253d22584483728fc.tar.bz2
Make gdk_gc_set_values() dynamic
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java3
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 8c476b1..37e7de3 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
@@ -5700,7 +5700,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 4eb4279..d66a7c7 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
@@ -175,6 +175,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 c2bd4ac..597a56c 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) {