From 9ef4324d53b9a731c1016f0319ea780ff7e16145 Mon Sep 17 00:00:00 2001 From: Arun Thondapu Date: Fri, 3 Aug 2012 23:36:35 +0530 Subject: Fix gtk_widget_get_allocation naming in OS.java --- bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c | 2 +- bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h | 2 +- .../Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c index ee9407c878..a407f9d857 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c @@ -1227,6 +1227,7 @@ char * OS_nativeFunctionNames[] = { "_1gtk_1widget_1destroy", "_1gtk_1widget_1event", "_1gtk_1widget_1get_1accessible", + "_1gtk_1widget_1get_1allocation", "_1gtk_1widget_1get_1can_1default", "_1gtk_1widget_1get_1child_1visible", "_1gtk_1widget_1get_1default_1style", @@ -1446,7 +1447,6 @@ char * OS_nativeFunctionNames[] = { "gdk_1threads_1init", "gdk_1threads_1leave", "gdk_1threads_1set_1lock_1functions", - "gtk_1widget_1get_1allocation", "localeconv_1decimal_1point", #ifndef JNI64 "memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I", diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h index 942c86578a..9e6b873f8e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h @@ -1235,6 +1235,7 @@ typedef enum { _1gtk_1widget_1destroy_FUNC, _1gtk_1widget_1event_FUNC, _1gtk_1widget_1get_1accessible_FUNC, + _1gtk_1widget_1get_1allocation_FUNC, _1gtk_1widget_1get_1can_1default_FUNC, _1gtk_1widget_1get_1child_1visible_FUNC, _1gtk_1widget_1get_1default_1style_FUNC, @@ -1454,7 +1455,6 @@ typedef enum { gdk_1threads_1init_FUNC, gdk_1threads_1leave_FUNC, gdk_1threads_1set_1lock_1functions_FUNC, - gtk_1widget_1get_1allocation_FUNC, localeconv_1decimal_1point_FUNC, #ifndef JNI64 memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC, 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 4e9374deaf..d3061785fe 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 @@ -12271,13 +12271,14 @@ public static final int /*long*/ gtk_widget_get_parent_window(int /*long*/ widge } /** * @method flags=dynamic + * @param widget cast=(GtkWidget *) * @param allocation cast=(GtkAllocation *),flags=no_in * */ -public static final native void gtk_widget_get_allocation (int /*long*/ widget, GtkAllocation allocation); -public static final void _gtk_widget_get_allocation (int /*long*/ widget, int /*long*/ allocation) { +public static final native void _gtk_widget_get_allocation (int /*long*/ widget, GtkAllocation allocation); +public static final void gtk_widget_get_allocation (int /*long*/ widget, GtkAllocation allocation) { lock.lock(); try { - _gtk_widget_get_allocation (widget, allocation); + _gtk_widget_get_allocation(widget, allocation); } finally { lock.unlock(); } -- cgit