diff options
| author | Anatoly Spektor <aspektor@redhat.com> | 2012-10-18 13:57:51 -0400 |
|---|---|---|
| committer | Anatoly Spektor <aspektor@redhat.com> | 2012-10-18 13:57:51 -0400 |
| commit | 3286fc2b8f2fe3dd6090f3191592a319d7aaa7d8 (patch) | |
| tree | 138e58fa56b29382e340c50c10e03f92369e6e44 | |
| parent | 356366c757fd1bf4314a6b8a0628110e3b25e6d3 (diff) | |
| download | eclipse.platform.swt-gtk3_drawable_get_image.tar.gz eclipse.platform.swt-gtk3_drawable_get_image.tar.xz eclipse.platform.swt-gtk3_drawable_get_image.zip | |
make gdk_drawable_get_image dynamicgtk3_drawable_get_image
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 c101c0249b..3111631b8c 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 @@ -5352,7 +5352,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 9f72de0771..9e569863c5 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 @@ -197,6 +197,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 f63333b050..9e8ccafca0 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 @@ -4020,7 +4020,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) |