aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2012-03-16 06:00:42 (EDT)
committerSilenio Quarti2012-03-19 11:28:34 (EDT)
commitc27c621aa803320b5517be4450b6e50b2e5aaf05 (patch)
tree826d7bc8ab3a28ff5ad64b889112535c00bd320b
parent6e1594dad53830d9eab9df02ca1e83163cb61f69 (diff)
downloadeclipse.platform.swt-c27c621aa803320b5517be4450b6e50b2e5aaf05.zip
eclipse.platform.swt-c27c621aa803320b5517be4450b6e50b2e5aaf05.tar.gz
eclipse.platform.swt-c27c621aa803320b5517be4450b6e50b2e5aaf05.tar.bz2
Make gdk_gc_set_ts_origin dynamic.
All usages covered by alternative paths - either cairo or alternative GTK api 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.java4
3 files changed, 13 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 3c7c5fc..ffda830 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
@@ -5918,7 +5918,15 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1ts_1origin)
(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1ts_1origin_FUNC);
- gdk_gc_set_ts_origin((GdkGC *)arg0, arg1, arg2);
+/*
+ gdk_gc_set_ts_origin(arg0, arg1, arg2);
+*/
+ {
+ OS_LOAD_FUNCTION(fp, gdk_gc_set_ts_origin)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jint, jint))fp)(arg0, arg1, arg2);
+ }
+ }
OS_NATIVE_EXIT(env, that, _1gdk_1gc_1set_1ts_1origin_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 287b0e6..a91448c 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
@@ -159,6 +159,7 @@
#define gdk_gc_set_dashes_LIB LIB_GDK
#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_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 a16ebe5..d81589d 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
@@ -4447,7 +4447,9 @@ public static final void gdk_gc_set_tile(int /*long*/ gc, int /*long*/ tile) {
lock.unlock();
}
}
-/** @param gc cast=(GdkGC *) */
+/**
+ * @method flags=dynamic
+ */
public static final native void _gdk_gc_set_ts_origin(int /*long*/ gc, int x, int y);
public static final void gdk_gc_set_ts_origin(int /*long*/ gc, int x, int y) {
lock.lock();