summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorAlexander Kurtakov2012-03-15 17:45:38 (EDT)
committer Silenio Quarti2012-03-19 11:11:21 (EDT)
commitd8c49d477cf9fc567bbfb4474cead56e9b9cfb0a (patch)
treefda2472a3eedf08e843ee100f0b946dadb068eb3
parent5463a09fc7ab4757e5eccc292bd859a628b9e962 (diff)
downloadeclipse.platform.swt-d8c49d477cf9fc567bbfb4474cead56e9b9cfb0a.zip
eclipse.platform.swt-d8c49d477cf9fc567bbfb4474cead56e9b9cfb0a.tar.gz
eclipse.platform.swt-d8c49d477cf9fc567bbfb4474cead56e9b9cfb0a.tar.bz2
Make gdk_gc_set_dashes dynamic.
Two usages, both covered by alternative Cairo codepath.
-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.java2
3 files changed, 11 insertions, 2 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 09a4f6c..8482339 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
@@ -5797,7 +5797,15 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1dashes)
{
if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
}
- gdk_gc_set_dashes((GdkGC *)arg0, (gint)arg1, (gint8 *)lparg2, (gint)arg3);
+/*
+ gdk_gc_set_dashes(arg0, (gint)arg1, (gint8 *)lparg2, (gint)arg3);
+*/
+ {
+ OS_LOAD_FUNCTION(fp, gdk_gc_set_dashes)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, gint, gint8 *, gint))fp)(arg0, (gint)arg1, (gint8 *)lparg2, (gint)arg3);
+ }
+ }
fail:
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
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 4dfd9a1..2622392 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
@@ -155,6 +155,7 @@
#define gdk_draw_point_LIB LIB_GDK
#define gdk_gc_set_clip_mask_LIB LIB_GDK
#define gdk_gc_set_clip_origin_LIB LIB_GDK
+#define gdk_gc_set_dashes_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 f8c7df7..e22eda6 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
@@ -4344,7 +4344,7 @@ public static final void gdk_gc_set_clip_region(int /*long*/ gc, int /*long*/ re
}
}
/**
- * @param gc cast=(GdkGC *)
+ * @method flags=dynamic
* @param dash_offset cast=(gint)
* @param dash_list cast=(gint8 *),flags=no_out critical
* @param n cast=(gint)