Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2018-01-12 09:23:30 -0500
committerAlexander Kurtakov2018-01-12 10:25:20 -0500
commit8588a05fd9bd3c24685e16fac3de3046f3816a47 (patch)
tree411042284fc1b9af3523a717e4aad4dda568cf66
parentbcbd76cfedf5ed62e228a8a0eddac18e01027d22 (diff)
downloadeclipse.platform.swt-8588a05fd9bd3c24685e16fac3de3046f3816a47.tar.gz
eclipse.platform.swt-8588a05fd9bd3c24685e16fac3de3046f3816a47.tar.xz
eclipse.platform.swt-8588a05fd9bd3c24685e16fac3de3046f3816a47.zip
Bug 529737 - Make gtk_im_multicontext_append_menuitems dynamic
Deprecated in GTK 3.10 and not used on newer versions so make it dynamic to reduce deprecation warnings at compile time. Change-Id: I26c60b4a3301aa7849b17be05d2d2b1d67bebd06 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c8
-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.java1
3 files changed, 10 insertions, 0 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 183605d6c3..42571c6fa2 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
@@ -10649,7 +10649,15 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1multicontext_1append_1menuitems)
(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1im_1multicontext_1append_1menuitems_FUNC);
+/*
gtk_im_multicontext_append_menuitems((GtkIMMulticontext *)arg0, (GtkMenuShell *)arg1);
+*/
+ {
+ OS_LOAD_FUNCTION(fp, gtk_im_multicontext_append_menuitems)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(GtkIMMulticontext *, GtkMenuShell *))fp)((GtkIMMulticontext *)arg0, (GtkMenuShell *)arg1);
+ }
+ }
OS_NATIVE_EXIT(env, that, _1gtk_1im_1multicontext_1append_1menuitems_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 1c0cd351e6..f0808c739c 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
@@ -102,6 +102,7 @@
#define gtk_image_menu_item_set_image_LIB LIB_GTK
#define gdk_keyboard_ungrab_LIB LIB_GDK
#define gtk_image_menu_item_new_with_label_LIB LIB_GTK
+#define gtk_im_multicontext_append_menuitems_LIB LIB_GTK
#define gtk_scrollbar_new_LIB LIB_GTK
#define gtk_hscrollbar_new_LIB LIB_GTK
#define gtk_vscrollbar_new_LIB LIB_GTK
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 3ee5f4dc0b..50215b73c2 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
@@ -8802,6 +8802,7 @@ public static final void gtk_im_context_set_cursor_location(long /*int*/ context
}
}
/**
+ * @method flags=dynamic
* @param context cast=(GtkIMMulticontext *)
* @param menushell cast=(GtkMenuShell *)
*/

Back to the top