diff options
| author | Alexander Kurtakov | 2011-12-13 21:37:26 +0000 |
|---|---|---|
| committer | Silenio Quarti | 2012-01-20 17:09:24 +0000 |
| commit | 9d8bc4eaeeb5f3a034598df91710e598770f6a2b (patch) | |
| tree | 6d65b765a529d5c35f091229983693eca4145e0e | |
| parent | 78500020090976af077471b3e341f6d07a0b37f2 (diff) | |
| download | eclipse.platform.ui-9d8bc4eaeeb5f3a034598df91710e598770f6a2b.tar.gz eclipse.platform.ui-9d8bc4eaeeb5f3a034598df91710e598770f6a2b.tar.xz eclipse.platform.ui-9d8bc4eaeeb5f3a034598df91710e598770f6a2b.zip | |
Bug 369151 - Make gtk_tooltips_data_get dynamic.
3 files changed, 11 insertions, 2 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 67e408f3a60..378b22b858a 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 @@ -14307,7 +14307,15 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tooltips_1data_1get) { jintLong rc = 0; OS_NATIVE_ENTER(env, that, _1gtk_1tooltips_1data_1get_FUNC); - rc = (jintLong)gtk_tooltips_data_get((GtkWidget *)arg0); +/* + rc = (jintLong)gtk_tooltips_data_get(arg0); +*/ + { + OS_LOAD_FUNCTION(fp, gtk_tooltips_data_get) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } OS_NATIVE_EXIT(env, that, _1gtk_1tooltips_1data_1get_FUNC); return rc; } 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 14598ac4598..9020f7f850e 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 @@ -131,6 +131,7 @@ #define gtk_tooltips_set_tip_LIB LIB_GTK #define gtk_tooltips_enable_LIB LIB_GTK #define gtk_tooltips_disable_LIB LIB_GTK +#define gtk_tooltips_data_get_LIB LIB_GTK #define gtk_tooltips_force_window_LIB LIB_GTK #define gtk_tree_selection_count_selected_rows_LIB LIB_GTK #define gtk_tree_selection_get_selected_rows_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 5c80dce6090..1c402afc4b6 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 @@ -11170,7 +11170,7 @@ public static final void gtk_toolbar_set_orientation(int /*long*/ toolbar, int o lock.unlock(); } } -/** @param widget cast=(GtkWidget *) */ +/** @method flags=dynamic */ public static final native int /*long*/ _gtk_tooltips_data_get(int /*long*/ widget); public static final int /*long*/ gtk_tooltips_data_get(int /*long*/ widget) { lock.lock(); |