diff options
| author | Alexander Kurtakov <akurtako@redhat.com> | 2012-03-14 18:21:15 +0200 |
|---|---|---|
| committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-03-19 10:51:41 -0400 |
| commit | a63e7844f1d8f849fe877d2101e33aaad4c582e8 (patch) | |
| tree | c8b592c519623366897e565cbb6bfca237dafaf5 /bundles | |
| parent | 48c7c4392f1d1c2e9577034b5dec5fa811028571 (diff) | |
| download | eclipse.platform.swt-a63e7844f1d8f849fe877d2101e33aaad4c582e8.tar.gz eclipse.platform.swt-a63e7844f1d8f849fe877d2101e33aaad4c582e8.tar.xz eclipse.platform.swt-a63e7844f1d8f849fe877d2101e33aaad4c582e8.zip | |
Make gdk_draw_layout_with_colors dynamic.
There are 5 usages in total each of them covered by cairo alternative
path. The function is removed from GTK 3.
Diffstat (limited to 'bundles')
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 5eea83acc0..71a6505b0f 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 @@ -5286,7 +5286,15 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1layout_1with_1colors) OS_NATIVE_ENTER(env, that, _1gdk_1draw_1layout_1with_1colors_FUNC); if (arg5) if ((lparg5 = getGdkColorFields(env, arg5, &_arg5)) == NULL) goto fail; if (arg6) if ((lparg6 = getGdkColorFields(env, arg6, &_arg6)) == NULL) goto fail; - gdk_draw_layout_with_colors((GdkDrawable *)arg0, (GdkGC *)arg1, (gint)arg2, (gint)arg3, (PangoLayout *)arg4, lparg5, lparg6); +/* + gdk_draw_layout_with_colors(arg0, arg1, (gint)arg2, (gint)arg3, (PangoLayout *)arg4, lparg5, lparg6); +*/ + { + OS_LOAD_FUNCTION(fp, gdk_draw_layout_with_colors) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong, jintLong, gint, gint, PangoLayout *, GdkColor *, GdkColor *))fp)(arg0, arg1, (gint)arg2, (gint)arg3, (PangoLayout *)arg4, lparg5, lparg6); + } + } fail: OS_NATIVE_EXIT(env, that, _1gdk_1draw_1layout_1with_1colors_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 c3869048c4..b5ffd5ea12 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 @@ -148,6 +148,7 @@ #define gdk_display_get_default_LIB LIB_GDK #define gdk_display_supports_cursor_color_LIB LIB_GDK #define gdk_draw_arc_LIB LIB_GDK +#define gdk_draw_layout_with_colors_LIB LIB_GDK #define gdk_draw_line_LIB LIB_GDK #define gdk_draw_lines_LIB LIB_GDK #define gdk_draw_pixbuf_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 907478b52a..cfc1faf0e6 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 @@ -3929,8 +3929,7 @@ public static final void gdk_draw_layout(int /*long*/ drawable, int /*long*/ gc, } } /** - * @param drawable cast=(GdkDrawable *) - * @param gc cast=(GdkGC *) + * @method flags=dynamic * @param x cast=(gint) * @param y cast=(gint) * @param layout cast=(PangoLayout *) |