summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorAlexander Kurtakov2012-03-16 05:13:52 (EDT)
committer Silenio Quarti2012-03-19 11:23:17 (EDT)
commit053b81f18025ae09c1c43eee59b532cffb7238db (patch)
treec5f8b6121837daec46bd29d9942e45134c3f2511
parentfc9e034ed5a5c77bd326ef742e91fb08e09d9c32 (diff)
downloadeclipse.platform.swt-053b81f18025ae09c1c43eee59b532cffb7238db.zip
eclipse.platform.swt-053b81f18025ae09c1c43eee59b532cffb7238db.tar.gz
eclipse.platform.swt-053b81f18025ae09c1c43eee59b532cffb7238db.tar.bz2
Make gdk_gc_set_line_attributes dynamic.
Usages of the function already have alternative cairo implementation.
-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.java6
3 files changed, 11 insertions, 6 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 ce2e0e0..35fe8b8 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
@@ -5862,7 +5862,15 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1line_1attributes)
(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
{
OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1line_1attributes_FUNC);
- gdk_gc_set_line_attributes((GdkGC *)arg0, (gint)arg1, (GdkLineStyle)arg2, (GdkCapStyle)arg3, (GdkJoinStyle)arg4);
+/*
+ gdk_gc_set_line_attributes(arg0, arg1, arg2, arg3, arg4);
+*/
+ {
+ OS_LOAD_FUNCTION(fp, gdk_gc_set_line_attributes)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jint, jint, jint, jint))fp)(arg0, arg1, arg2, arg3, arg4);
+ }
+ }
OS_NATIVE_EXIT(env, that, _1gdk_1gc_1set_1line_1attributes_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 45f6c4c..30fd7d1 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
@@ -157,6 +157,7 @@
#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_gc_set_line_attributes_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 84393bd..ff9807e 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
@@ -4398,11 +4398,7 @@ public static final void gdk_gc_set_function(int /*long*/ gc, int /*long*/ funct
}
}
/**
- * @param gc cast=(GdkGC *)
- * @param line_width cast=(gint)
- * @param line_style cast=(GdkLineStyle)
- * @param cap_style cast=(GdkCapStyle)
- * @param join_style cast=(GdkJoinStyle)
+ * @method flags=dynamic
*/
public static final native void _gdk_gc_set_line_attributes(int /*long*/ gc, int line_width, int line_style, int cap_style, int join_style);
public static final void gdk_gc_set_line_attributes(int /*long*/ gc, int line_width, int line_style, int cap_style, int join_style) {