aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2012-03-14 12:16:16 (EDT)
committerSilenio Quarti2012-03-19 10:43:21 (EDT)
commita7ac410c9ca698732ac05897befec1115af3cd76 (patch)
tree698ff60c2ef3039fb99fa7b4adc8d3d73f8060cb
parent76ea0a71909995e0099e839e67ffcafe22680240 (diff)
downloadeclipse.platform.swt-a7ac410c9ca698732ac05897befec1115af3cd76.zip
eclipse.platform.swt-a7ac410c9ca698732ac05897befec1115af3cd76.tar.gz
eclipse.platform.swt-a7ac410c9ca698732ac05897befec1115af3cd76.tar.bz2
Make gdk_draw_point dynamic.
There is only single usage and it's usage is already covered by cairo path. The gdk_draw_point function is removed in GTK 3.
-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 812f921..e154c4d 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
@@ -5353,7 +5353,15 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1point)
(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
{
OS_NATIVE_ENTER(env, that, _1gdk_1draw_1point_FUNC);
- gdk_draw_point((GdkDrawable *)arg0, (GdkGC *)arg1, arg2, arg3);
+/*
+ gdk_draw_point(arg0, arg1, arg2, arg3);
+*/
+ {
+ OS_LOAD_FUNCTION(fp, gdk_draw_point)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint))fp)(arg0, arg1, arg2, arg3);
+ }
+ }
OS_NATIVE_EXIT(env, that, _1gdk_1draw_1point_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 079b754..b6e5182 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
@@ -149,6 +149,7 @@
#define gdk_display_supports_cursor_color_LIB LIB_GDK
#define gdk_draw_arc_LIB LIB_GDK
#define gdk_draw_pixbuf_LIB LIB_GDK
+#define gdk_draw_point_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 0e68a83..d38b74a 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
@@ -4003,8 +4003,7 @@ public static final void gdk_draw_pixbuf(int /*long*/ drawable, int /*long*/ gc,
}
}
/**
- * @param drawable cast=(GdkDrawable *)
- * @param gc cast=(GdkGC *)
+ * @method flags=dynamic
*/
public static final native void _gdk_draw_point(int /*long*/ drawable, int /*long*/ gc, int x, int y);
public static final void gdk_draw_point(int /*long*/ drawable, int /*long*/ gc, int x, int y) {