| author | Anatoly Spektor | 2012-10-18 13:57:51 (EDT) |
|---|---|---|
| committer | Silenio Quarti | 2012-10-24 12:45:11 (EDT) |
| commit | 349459091b102fd601c4529f951a9f14324c71bd (patch) (side-by-side diff) | |
| tree | 70f9596ffd961dc4f938ffe74af8dbdc96170848 | |
| parent | c9eeb929e996f0e46059cdc6d7ccee91fb0c125d (diff) | |
| download | eclipse.platform.swt-349459091b102fd601c4529f951a9f14324c71bd.zip eclipse.platform.swt-349459091b102fd601c4529f951a9f14324c71bd.tar.gz eclipse.platform.swt-349459091b102fd601c4529f951a9f14324c71bd.tar.bz2 | |
make gdk_drawable_get_image dynamic
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 814c221..bda9113 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 @@ -5344,7 +5344,15 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1drawable_1get_1image) { jintLong rc = 0; OS_NATIVE_ENTER(env, that, _1gdk_1drawable_1get_1image_FUNC); - rc = (jintLong)gdk_drawable_get_image((GdkDrawable *)arg0, (gint)arg1, (gint)arg2, (gint)arg3, (gint)arg4); +/* + rc = (jintLong)gdk_drawable_get_image(arg0, (gint)arg1, (gint)arg2, (gint)arg3, (gint)arg4); +*/ + { + OS_LOAD_FUNCTION(fp, gdk_drawable_get_image) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, gint, gint, gint, gint))fp)(arg0, (gint)arg1, (gint)arg2, (gint)arg3, (gint)arg4); + } + } OS_NATIVE_EXIT(env, that, _1gdk_1drawable_1get_1image_FUNC); return rc; } 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 7199b57..c9da50e 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 @@ -199,6 +199,7 @@ #define gdk_draw_polygon_LIB LIB_GDK #define gdk_draw_image_LIB LIB_GDK #define gdk_drawable_get_size_LIB LIB_GDK +#define gdk_drawable_get_image_LIB LIB_GDK #define gdk_drawable_get_visible_region_LIB LIB_GDK #define gdk_gc_set_background_LIB LIB_GDK #define gdk_gc_set_stipple_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 cf45f1c..b88c555 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 @@ -4023,7 +4023,7 @@ public static final void gdk_pixmap_get_size(long /*int*/ pixmap, int[] width, i } } /** - * @param drawable cast=(GdkDrawable *) + * @method flags=dynamic * @param x cast=(gint) * @param y cast=(gint) * @param width cast=(gint) |