diff options
| author | Anatoly Spektor | 2012-06-12 16:09:29 +0000 |
|---|---|---|
| committer | Silenio Quarti | 2012-06-18 20:07:11 +0000 |
| commit | 4df24be727bf7df22d7972cb27d4cc6882d010fa (patch) | |
| tree | 3b85cd0ea25790d794a739f05bfd3cecebc90c3c | |
| parent | b5361ce6534deeabbd37381e365154168c5e54f4 (diff) | |
| download | eclipse.platform.swt-4df24be727bf7df22d7972cb27d4cc6882d010fa.tar.gz eclipse.platform.swt-4df24be727bf7df22d7972cb27d4cc6882d010fa.tar.xz eclipse.platform.swt-4df24be727bf7df22d7972cb27d4cc6882d010fa.zip | |
Make gdk_draw_image dynamic
3 files changed, 11 insertions, 4 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 31fbf4bae1..3bf70f695e 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 @@ -5300,7 +5300,15 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1image) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8) { OS_NATIVE_ENTER(env, that, _1gdk_1draw_1image_FUNC); - gdk_draw_image((GdkDrawable *)arg0, (GdkGC *)arg1, (GdkImage *)arg2, arg3, arg4, arg5, arg6, arg7, arg8); +/* + gdk_draw_image(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); +*/ + { + OS_LOAD_FUNCTION(fp, gdk_draw_image) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jint, jint, jint, jint, jint, jint))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); + } + } OS_NATIVE_EXIT(env, that, _1gdk_1draw_1image_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 ef280d588e..5cad1917d7 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 @@ -160,6 +160,7 @@ #define gdk_draw_pixbuf_LIB LIB_GDK #define gdk_draw_point_LIB LIB_GDK #define gdk_draw_polygon_LIB LIB_GDK +#define gdk_draw_image_LIB LIB_GDK #define gdk_gc_set_background_LIB LIB_GDK #define gdk_gc_set_clip_mask_LIB LIB_GDK #define gdk_gc_set_clip_origin_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 3127cd21d0..6d058a72cc 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 @@ -3930,9 +3930,7 @@ public static final void gdk_draw_drawable(int /*long*/ drawable, int /*long*/ g } } /** - * @param drawable cast=(GdkDrawable *) - * @param gc cast=(GdkGC *) - * @param image cast=(GdkImage *) + * @method flags=dynamic */ public static final native void _gdk_draw_image(int /*long*/ drawable, int /*long*/ gc, int /*long*/ image, int xsrc, int ysrc, int xdest, int ydest, int width, int height); public static final void gdk_draw_image(int /*long*/ drawable, int /*long*/ gc, int /*long*/ image, int xsrc, int ysrc, int xdest, int ydest, int width, int height) { |