diff options
| author | Silenio Quarti | 2012-10-24 19:22:23 +0000 |
|---|---|---|
| committer | Silenio Quarti | 2012-10-24 19:22:23 +0000 |
| commit | 3f20eb141985695c94bfef8a385bd084ad49d97d (patch) | |
| tree | c54b151c9b86e7402ccc116555c81e4545cba730 | |
| parent | 74f31e3b8b1161eeb163092b2eda8be8a469aa58 (diff) | |
| download | eclipse.platform.swt-3f20eb141985695c94bfef8a385bd084ad49d97d.tar.gz eclipse.platform.swt-3f20eb141985695c94bfef8a385bd084ad49d97d.tar.xz eclipse.platform.swt-3f20eb141985695c94bfef8a385bd084ad49d97d.zip | |
remove gdk_gc_set_subwindow 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 d4a8c05186..f585d0e827 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 @@ -5853,7 +5853,15 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1subwindow) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) { OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1subwindow_FUNC); - gdk_gc_set_subwindow((GdkGC *)arg0, (GdkSubwindowMode)arg1); +/* + gdk_gc_set_subwindow(arg0, arg1); +*/ + { + OS_LOAD_FUNCTION(fp, gdk_gc_set_subwindow) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + } + } OS_NATIVE_EXIT(env, that, _1gdk_1gc_1set_1subwindow_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 ee72b83f38..b24ac3f8fd 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 @@ -117,6 +117,7 @@ #define NO__1gdk_1gc_1set_1clip_1region #define NO__1gdk_1gc_1set_1foreground #define NO__1gdk_1gc_1set_1function +#define NO__1gdk_1gc_1set_1subwindow #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 3eb974926b..2433f511be 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 @@ -206,6 +206,7 @@ #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_subwindow_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 d89079f243..6816fac22f 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 @@ -4355,8 +4355,7 @@ public static final void gdk_gc_set_stipple(long /*int*/ gc, long /*int*/ stippl } } /** - * @param gc cast=(GdkGC *) - * @param mode cast=(GdkSubwindowMode) + * @method flags=dynamic */ public static final native void _gdk_gc_set_subwindow(long /*int*/ gc, long /*int*/ mode); public static final void gdk_gc_set_subwindow(long /*int*/ gc, long /*int*/ mode) { |