diff options
| author | Silenio Quarti | 2012-10-24 19:18:25 +0000 |
|---|---|---|
| committer | Silenio Quarti | 2012-10-24 19:18:25 +0000 |
| commit | 74f31e3b8b1161eeb163092b2eda8be8a469aa58 (patch) | |
| tree | 0f1220c99dc29cde3c3fabefd8fb4b21857e9901 | |
| parent | 7f2f6830ba682932973a4d5a172c8f7f49c2f7e4 (diff) | |
| download | eclipse.platform.swt-74f31e3b8b1161eeb163092b2eda8be8a469aa58.tar.gz eclipse.platform.swt-74f31e3b8b1161eeb163092b2eda8be8a469aa58.tar.xz eclipse.platform.swt-74f31e3b8b1161eeb163092b2eda8be8a469aa58.zip | |
remove gdk_gc_set_function from GTK3
4 files changed, 12 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 240b0eb02f..d4a8c05186 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 @@ -5799,7 +5799,15 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1function) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) { OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1function_FUNC); - gdk_gc_set_function((GdkGC *)arg0, (GdkFunction)arg1); +/* + gdk_gc_set_function(arg0, arg1); +*/ + { + OS_LOAD_FUNCTION(fp, gdk_gc_set_function) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + } + } OS_NATIVE_EXIT(env, that, _1gdk_1gc_1set_1function_FUNC); } #endif diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h index 8634978b8b..ee72b83f38 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h @@ -116,6 +116,7 @@ #define NO__1gdk_1draw_1rectangle #define NO__1gdk_1gc_1set_1clip_1region #define NO__1gdk_1gc_1set_1foreground +#define NO__1gdk_1gc_1set_1function #define NO_GdkVisual #define NO_GtkColorSelectionDialog #define NO_GdkGCValues 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 a03ebf9c97..3eb974926b 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 @@ -205,6 +205,7 @@ #define gdk_draw_rectangle_LIB LIB_GDK #define gdk_gc_set_clip_region_LIB LIB_GDK #define gdk_gc_set_foreground_LIB LIB_GDK +#define gdk_gc_set_function_LIB LIB_GDK #define gdk_gc_set_background_LIB LIB_GDK #define gdk_gc_set_stipple_LIB LIB_GDK #define gdk_gc_set_clip_mask_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 b296eb009a..d89079f243 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 @@ -4321,8 +4321,7 @@ public static final void gdk_gc_set_foreground(long /*int*/ gc, GdkColor color) } } /** - * @param gc cast=(GdkGC *) - * @param function cast=(GdkFunction) + * @method flags=dynamic */ public static final native void _gdk_gc_set_function(long /*int*/ gc, long /*int*/ function); public static final void gdk_gc_set_function(long /*int*/ gc, long /*int*/ function) { |