summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnatoly Spektor <aspektor@redhat.com>2012-09-28 15:30:05 -0400
committerAnatoly Spektor <aspektor@redhat.com>2012-09-28 15:30:05 -0400
commit27120e24484875ab58d066e0b73aec2c15d88c8e (patch)
treebc922a19458a16e189053293ac432708351b4971
parent5506cab4b428c80e29a6e4456dfb962867ed7143 (diff)
downloadeclipse.platform.swt-gdk_gc_set_fill.tar.gz
eclipse.platform.swt-gdk_gc_set_fill.tar.xz
eclipse.platform.swt-gdk_gc_set_fill.zip
Make gdk_gc_set_fill () dynamicgdk_gc_set_fill
This patch makes GTK+ 2 function gdk_gc_set_fill () dynamic
-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.java5
3 files changed, 11 insertions, 5 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 4e3b0f2d57..71d2f974ad 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
@@ -5603,7 +5603,15 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1fill)
(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1fill_FUNC);
- gdk_gc_set_fill((GdkGC *)arg0, (GdkFill)arg1);
+/*
+ gdk_gc_set_fill(arg0, arg1);
+*/
+ {
+ OS_LOAD_FUNCTION(fp, gdk_gc_set_fill)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
+ }
+ }
OS_NATIVE_EXIT(env, that, _1gdk_1gc_1set_1fill_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 c1d1a65035..0379b239db 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
@@ -182,6 +182,7 @@
#define gdk_drawable_get_size_LIB LIB_GDK
#define gdk_gc_set_background_LIB LIB_GDK
#define gdk_gc_set_clip_mask_LIB LIB_GDK
+#define gdk_gc_set_fill_LIB LIB_GDK
#define gdk_gc_set_clip_origin_LIB LIB_GDK
#define gdk_gc_set_dashes_LIB LIB_GDK
#define gdk_gc_set_exposures_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 1baf52b0ca..366b8120ca 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
@@ -4208,10 +4208,7 @@ public static final void gdk_gc_set_exposures(long /*int*/ gc, boolean exposures
lock.unlock();
}
}
-/**
- * @param gc cast=(GdkGC *)
- * @param fill cast=(GdkFill)
- */
+/** @method flags=dynamic */
public static final native void _gdk_gc_set_fill(long /*int*/ gc, int fill);
public static final void gdk_gc_set_fill(long /*int*/ gc, int fill) {
lock.lock();