37775 - 64 bit /*long*/ markup

14 files changed, 62 insertions, 62 deletions

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 ceb5cd22dd..6e3c5c68d7 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
@@ -369,8 +369,8 @@ public static final synchronized native int GTK_WIDGET_WIDTH(int /*long*/ widget
 public static final synchronized native int /*long*/ GTK_WIDGET_WINDOW(int /*long*/ widget);
 public static final synchronized native int GTK_WIDGET_X(int /*long*/ widget);
 public static final synchronized native int GTK_WIDGET_Y(int /*long*/ widget);
-public static final synchronized native int GTK_SCROLLED_WINDOW_HSCROLLBAR(int /*long*/ widget);
-public static final synchronized native int GTK_SCROLLED_WINDOW_VSCROLLBAR(int /*long*/ widget);
+public static final synchronized native int /*long*/ GTK_SCROLLED_WINDOW_HSCROLLBAR(int /*long*/ widget);
+public static final synchronized native int /*long*/ GTK_SCROLLED_WINDOW_VSCROLLBAR(int /*long*/ widget);
 public static final synchronized native int GTK_SCROLLED_WINDOW_SCROLLBAR_SPACING(int /*long*/ widget);
 public static final synchronized native void GTK_ACCEL_LABEL_SET_ACCEL_STRING(int /*long*/ acce_label, int /*long*/ string);
 public static final synchronized native int /*long*/ GTK_ACCEL_LABEL_GET_ACCEL_STRING(int /*long*/ acce_label);
@@ -387,7 +387,7 @@ public static final native boolean GDK_WINDOWING_X11();
 public static final synchronized native int XDefaultScreen(int /*long*/ display);
 public static final synchronized native int XReconfigureWMWindow(int /*long*/ display, int window, int screen, int valueMask, XWindowChanges values);
 public static final synchronized native int XSetInputFocus(int /*long*/ display, int window, int revert, int time);
-public static final synchronized native int gdk_x11_drawable_get_xdisplay(int /*long*/ drawable);
+public static final synchronized native int /*long*/ gdk_x11_drawable_get_xdisplay(int /*long*/ drawable);
 public static final synchronized native int gdk_x11_drawable_get_xid(int /*long*/ drawable);
 
 /** Native methods */
@@ -609,9 +609,9 @@ public static final synchronized native int /*long*/ gtk_cell_renderer_text_new(
 public static final synchronized native int /*long*/ gtk_cell_renderer_toggle_new();
 public static final synchronized native int /*long*/ gtk_check_button_new();
 public static final synchronized native boolean gtk_check_menu_item_get_active(int /*long*/ wid);
-public static final synchronized native int gtk_check_menu_item_new_with_label(byte[] label);
+public static final synchronized native int /*long*/ gtk_check_menu_item_new_with_label(byte[] label);
 public static final synchronized native void gtk_check_menu_item_set_active(int /*long*/ wid, boolean active);
-public static final synchronized native int gtk_check_version(int required_major, int required_minor, int required_micro);
+public static final synchronized native int /*long*/ gtk_check_version(int required_major, int required_minor, int required_micro);
 public static final synchronized native void gtk_clipboard_clear(int /*long*/ clipboard);
 public static final synchronized native int /*long*/ gtk_clipboard_get(int /*long*/ selection);
 public static final synchronized native boolean gtk_clipboard_set_with_data(int /*long*/ clipboard, int /*long*/ target, int n_targets, int /*long*/ get_func, int /*long*/ clear_func, int /*long*/ user_data);
@@ -625,7 +625,7 @@ public static final synchronized native void gtk_combo_set_case_sensitive(int /*
 public static final synchronized native void gtk_combo_set_popdown_strings(int /*long*/ combo, int /*long*/ strings);
 public static final synchronized native void gtk_container_add(int /*long*/ container, int /*long*/ widget);
 public static final synchronized native int gtk_container_get_border_width(int /*long*/ container);
-public static final synchronized native int gtk_container_get_children(int /*long*/ container);
+public static final synchronized native int /*long*/ gtk_container_get_children(int /*long*/ container);
 public static final synchronized native void gtk_container_remove(int /*long*/ container, int /*long*/ widget);
 public static final synchronized native void gtk_container_resize_children(int /*long*/ container);
 public static final synchronized native void gtk_container_set_border_width(int /*long*/ container, int border_width);
@@ -742,7 +742,7 @@ public static final synchronized native void gtk_menu_popup(int /*long*/ menu, i
 public static final synchronized native void gtk_menu_shell_deactivate(int /*long*/ menu_shell);
 public static final synchronized native void gtk_menu_shell_insert(int /*long*/ menu_shell, int /*long*/ child, int position);
 public static final synchronized native void gtk_menu_shell_select_item(int /*long*/ menu_shell, int /*long*/ menu_item);
-public static final synchronized native int gtk_message_dialog_new(int /*long*/ parent, int flags, int type, int buttons, String message_format);
+public static final synchronized native int /*long*/ gtk_message_dialog_new(int /*long*/ parent, int flags, int type, int buttons, String message_format);
 public static final synchronized native void gtk_misc_set_alignment(int /*long*/ misc, float xalign, float yalign);
 public static final synchronized native int gtk_notebook_get_current_page(int /*long*/ notebook);
 public static final synchronized native boolean gtk_notebook_get_scrollable(int /*long*/ notebook);
@@ -917,7 +917,7 @@ public static final synchronized native void gtk_tree_view_get_cursor(int /*long
 public static final synchronized native boolean gtk_tree_view_get_headers_visible(int /*long*/ tree_view);
 public static final synchronized native boolean gtk_tree_view_get_path_at_pos(int /*long*/ tree_view, int x, int y, int /*long*/[] path, int /*long*/[] column, int[] cell_x, int[] cell_y);
 public static final synchronized native boolean gtk_tree_view_get_rules_hint(int /*long*/ tree_view);
-public static final synchronized native int gtk_tree_view_get_selection(int /*long*/ tree_view);
+public static final synchronized native int /*long*/ gtk_tree_view_get_selection(int /*long*/ tree_view);
 public static final synchronized native void gtk_tree_view_get_visible_rect(int /*long*/ tree_view, GdkRectangle visible_rect);
 public static final synchronized native int gtk_tree_view_insert_column(int /*long*/ tree_view, int /*long*/ column, int position);
 public static final synchronized native int /*long*/ gtk_tree_view_new_with_model(int /*long*/ model);
@@ -1057,7 +1057,7 @@ public static final synchronized native void pango_font_description_set_size(int
 public static final synchronized native void pango_font_description_set_stretch(int /*long*/ desc, int stretch);
 public static final synchronized native void pango_font_description_set_style(int /*long*/ desc, int weight);
 public static final synchronized native void pango_font_description_set_weight(int /*long*/ desc, int weight);
-public static final synchronized native int pango_font_description_to_string(int /*long*/ desc);
+public static final synchronized native int /*long*/ pango_font_description_to_string(int /*long*/ desc);
 public static final synchronized native int /*long*/ pango_font_face_describe(int /*long*/ face);
 public static final synchronized native void pango_font_family_list_faces(int /*long*/ family, int /*long*/[] faces, int[] n_faces);
 public static final synchronized native int pango_font_metrics_get_approximate_char_width(int /*long*/ metrics);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java
index 84eeaea3cd..42c9e24aee 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java
@@ -189,7 +189,7 @@ public FontData[] getFontData() {
 	if (pangoStyle == OS.PANGO_STYLE_ITALIC) style |= SWT.ITALIC;
 	if (pangoStyle == OS.PANGO_STYLE_OBLIQUE) style |= SWT.ROMAN;
 	if (pangoWeight >= OS.PANGO_WEIGHT_BOLD) style |= SWT.BOLD;
-	int fontString = OS.pango_font_description_to_string (handle);
+	int /*long*/ fontString = OS.pango_font_description_to_string (handle);
 	length = OS.strlen (fontString);
 	buffer = new byte [length + 1];
 	OS.memmove (buffer, fontString, length);	
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
index 1958e4672c..b3129237c4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
@@ -360,7 +360,7 @@ void createHandle (int index) {
 	* to hook events.  The fix is to find the first child that is
 	* not the entry or list and assume this is the arrow handle.
 	*/
-	int list = OS.gtk_container_get_children (handle);
+	int /*long*/ list = OS.gtk_container_get_children (handle);
 	if (list != 0) {
 		int i = 0, count = OS.g_list_length (list);
 		while (i<count) {
@@ -1079,7 +1079,7 @@ void setFontDescription (int font) {
 	if (entryHandle != 0) OS.gtk_widget_modify_font (entryHandle, font);
 	if (listHandle != 0) {
 		OS.gtk_widget_modify_font (listHandle, font);
-		int itemsList = OS.gtk_container_get_children (listHandle);
+		int /*long*/ itemsList = OS.gtk_container_get_children (listHandle);
 		if (itemsList != 0) {
 			int count = OS.g_list_length (itemsList);
 			for (int i=count - 1; i>=0; i--) {
@@ -1096,7 +1096,7 @@ void setForegroundColor (GdkColor color) {
 	if (entryHandle != 0) OS.gtk_widget_modify_text (entryHandle, 0, color);
 	if (listHandle != 0) {
 		OS.gtk_widget_modify_text (listHandle, 0, color);
-		int itemsList = OS.gtk_container_get_children (listHandle);
+		int /*long*/ itemsList = OS.gtk_container_get_children (listHandle);
 		if (itemsList != 0) {
 			int count = OS.g_list_length (itemsList);
 			for (int i=count - 1; i>=0; i--) {
@@ -1164,7 +1164,7 @@ void setItems (String [] items, boolean keepText, boolean keepSelection) {
 	int selectedIndex = keepSelection ? getSelectionIndex() : -1;
 	ignoreSelect = true;
 	if (items.length == 0) {
-		int itemsList = OS.gtk_container_get_children (listHandle);
+		int /*long*/ itemsList = OS.gtk_container_get_children (listHandle);
 		if (itemsList != 0) {
 			int count = OS.g_list_length (itemsList);
 			for (int i=count - 1; i>=0; i--) {
@@ -1192,7 +1192,7 @@ void setItems (String [] items, boolean keepText, boolean keepSelection) {
 			}
 			OS.g_list_free (glist);
 		}
-		int itemsList = OS.gtk_container_get_children (listHandle);
+		int /*long*/ itemsList = OS.gtk_container_get_children (listHandle);
 		if (itemsList != 0) {
 			int /*long*/ font = getFontDescription ();
 			GdkColor color = getForegroundColor ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
index 98f6e6a65d..dbef85702d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
@@ -251,11 +251,11 @@ void enableWidget (boolean enabled) {
 	//NOT DONE - take into account current enabled scroll bar state
 	if (scrolledHandle != 0) {
 		if (horizontalBar != null) {
-			int barHandle = OS.GTK_SCROLLED_WINDOW_HSCROLLBAR (scrolledHandle);
+			int /*long*/ barHandle = OS.GTK_SCROLLED_WINDOW_HSCROLLBAR (scrolledHandle);
 			OS.gtk_widget_set_sensitive (barHandle, enabled);
 		}
 		if (verticalBar != null) {
-			int barHandle = OS.GTK_SCROLLED_WINDOW_VSCROLLBAR (scrolledHandle);
+			int /*long*/ barHandle = OS.GTK_SCROLLED_WINDOW_VSCROLLBAR (scrolledHandle);
 			OS.gtk_widget_set_sensitive (barHandle, enabled);
 		}
 	}
@@ -337,7 +337,7 @@ int getChildrenCount () {
 	* NOTE: The current implementation will count
 	* non-registered children.
 	*/
-	int list = OS.gtk_container_get_children (handle);
+	int /*long*/ list = OS.gtk_container_get_children (handle);
 	if (list == 0) return 0;
 	int count = OS.g_list_length (list);
 	OS.g_list_free (list);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
index 75de2d589e..ee9a9a5329 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
@@ -2690,7 +2690,7 @@ void setZOrder (Control sibling, boolean above, boolean fixChildren) {
 			XWindowChanges changes = new XWindowChanges ();
 			changes.sibling = OS.gdk_x11_drawable_get_xid (siblingWindow);
 			changes.stack_mode = above ? OS.Above : OS.Below;
-			int xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
+			int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
 			int xWindow = OS.gdk_x11_drawable_get_xid (window);
 			int xScreen = OS.XDefaultScreen (xDisplay);
 			int flags = OS.CWStackMode | OS.CWSibling;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
index 663d1337d1..0d18501780 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
@@ -578,7 +578,7 @@ synchronized void createDisplay (DeviceData data) {
 	}
 	OS.gtk_widget_set_default_direction (OS.GTK_TEXT_DIR_LTR);
 	OS.gdk_rgb_init ();
-	int ptr = OS.gtk_check_version (MAJOR, MINOR, MICRO);
+	int /*long*/ ptr = OS.gtk_check_version (MAJOR, MINOR, MICRO);
 	if (ptr != 0) {
 		int length = OS.strlen (ptr);
 		byte [] buffer = new byte [length];
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java
index 724d2091f2..d8bc13ce1d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java
@@ -148,7 +148,7 @@ public FontData open () {
 	if (fontData != null) {
 		Display display = parent != null ? parent.display : Display.getCurrent ();
 		Font font = new Font (display, fontData);
-		int fontName = OS.pango_font_description_to_string (font.handle);
+		int /*long*/ fontName = OS.pango_font_description_to_string (font.handle);
 		int length = OS.strlen (fontName);
 		byte [] buffer = new byte [length + 1];
 		OS.memmove (buffer, fontName, length);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java
index 0b1af78319..8374707cc6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java
@@ -214,7 +214,7 @@ void createHandle (int index) {
 	OS.gtk_widget_show (handle);
 	
 	int mode = (style & SWT.MULTI) != 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE;
-	int selectionHandle = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selectionHandle = OS.gtk_tree_view_get_selection (handle);
 	OS.gtk_tree_selection_set_mode (selectionHandle, mode);
 	OS.gtk_tree_view_set_headers_visible (handle, false);	
 	int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
@@ -255,7 +255,7 @@ public void deselect (int index) {
 	checkWidget();
 	if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0)))  return;
 	int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	int selection = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index); 
 	OS.gtk_tree_selection_unselect_iter (selection, iter);
@@ -286,7 +286,7 @@ public void deselect (int start, int end) {
 	start = Math.min (count - 1, Math.max (0, start));
 	end = Math.min (count - 1, Math.max (0, end));
 	int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	int selection = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	for (int index=start; index<=end; index++) {
 		OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index); 
@@ -318,7 +318,7 @@ public void deselect (int [] indices) {
 	if (indices == null) error (SWT.ERROR_NULL_ARGUMENT);
 	int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
 	int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
-	int selection = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	for (int i=0; i<indices.length; i++) {
 		int index = indices [i];
@@ -340,7 +340,7 @@ public void deselect (int [] indices) {
  */
 public void deselectAll () {
 	checkWidget();
-	int selection = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.gtk_tree_selection_unselect_all (selection);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
@@ -546,7 +546,7 @@ public int getSelectionCount () {
 	checkWidget();
 	display.treeSelectionLength = 0;
 	display.treeSelection = null;
-	int selection = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 	OS.gtk_tree_selection_selected_foreach (selection, display.treeSelectionProc, handle);
 	return display.treeSelectionLength;
 }
@@ -570,7 +570,7 @@ public int getSelectionIndex () {
 	int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
 	display.treeSelectionLength  = 0;
 	display.treeSelection = new int [itemCount];
-	int selection = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 	OS.gtk_tree_selection_selected_foreach (selection, display.treeSelectionProc, handle);
 	if (display.treeSelectionLength == 0) return -1;
 	return display.treeSelection [0];
@@ -599,7 +599,7 @@ public int [] getSelectionIndices () {
 	int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
 	display.treeSelectionLength  = 0;
 	display.treeSelection = new int [itemCount];
-	int selection = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 	OS.gtk_tree_selection_selected_foreach (selection, display.treeSelectionProc, handle);
 	if (display.treeSelectionLength == display.treeSelection.length) return display.treeSelection;
 	int [] result = new int [display.treeSelectionLength];
@@ -655,7 +655,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
 		int /*long*/ [] path = new int /*long*/ [1];
 		if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {
 			if (path [0] != 0) {
-				int selection = OS.gtk_tree_view_get_selection (handle);
+				int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 				if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;
 				OS.gtk_tree_path_free (path [0]);
 			}
@@ -673,7 +673,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
 		int /*long*/ [] path = new int /*long*/ [1];
 		if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {
 			if (path [0] != 0) {
-				int selection = OS.gtk_tree_view_get_selection (handle);
+				int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 				OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 				OS.gtk_tree_view_set_cursor (handle, path [0], 0, false);
 				OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
@@ -714,7 +714,7 @@ int /*long*/ gtk_row_activated (int /*long*/ tree, int /*long*/ path, int /*long
 
 void hookEvents () {
 	super.hookEvents();
-	int selection = OS.gtk_tree_view_get_selection(handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection(handle);
 	OS.g_signal_connect (selection, OS.changed, display.windowProc2, CHANGED);
 	OS.g_signal_connect (handle, OS.row_activated, display.windowProc4, ROW_ACTIVATED);
 }
@@ -790,7 +790,7 @@ public int indexOf (String string, int start) {
  */
 public boolean isSelected (int index) {
 	checkWidget();
-	int selection = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 	byte [] buffer = Converter.wcsToMbcs (null, Integer.toString (index), true);
 	int /*long*/ path = OS.gtk_tree_path_new_from_string (buffer);
 	boolean answer = OS.gtk_tree_selection_path_is_selected (selection, path);
@@ -838,7 +838,7 @@ public void remove (int index) {
 	}
 	int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
 	OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
-	int selection = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.gtk_list_store_remove (modelHandle, iter);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
@@ -872,7 +872,7 @@ public void remove (int start, int end) {
 		error (SWT.ERROR_INVALID_RANGE);
 	}
 	int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	int selection = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	for (int index=end; index>=start; index--) {
 		OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
@@ -939,7 +939,7 @@ public void remove (int [] indices) {
 		error (SWT.ERROR_INVALID_RANGE);
 	}
 	int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	int selection = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	int last = -1;
 	for (int i=0; i<newIndices.length; i++) {
@@ -964,7 +964,7 @@ public void remove (int [] indices) {
  */
 public void removeAll () {
 	checkWidget();
-	int selection = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.gtk_list_store_clear (modelHandle);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
@@ -1011,7 +1011,7 @@ public void select (int index) {
 	checkWidget();
 	if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0)))  return;
 	int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	int selection = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
 	OS.gtk_tree_selection_select_iter (selection, iter); 
@@ -1047,7 +1047,7 @@ public void select (int start, int end) {
 	start = Math.min (count - 1, Math.max (0, start));
 	end = Math.min (count - 1, Math.max (0, end));
 	int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	int selection = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	for (int index=start; index<=end; index++) {
 		OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
@@ -1084,7 +1084,7 @@ public void select (int [] indices) {
 	if (indices == null) error (SWT.ERROR_NULL_ARGUMENT);
 	int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
 	int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
-	int selection = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	for (int i=0; i<indices.length; i++) {
 		int index = indices [i];
@@ -1113,7 +1113,7 @@ public void select (int [] indices) {
 public void selectAll () {
 	checkWidget();
 	if ((style & SWT.SINGLE) != 0) return;
-	int selection = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.gtk_tree_selection_select_all (selection);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
@@ -1213,7 +1213,7 @@ public void setItem (int index, String string) {
 public void setItems (String [] items) {
 	checkWidget();
 	if (items == null) error (SWT.ERROR_NULL_ARGUMENT);
-	int selection = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.gtk_list_store_clear (modelHandle);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java
index 6789ac8726..b1de5d63b1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java
@@ -358,7 +358,7 @@ public boolean getEnabled () {
  */
 public MenuItem getItem (int index) {
 	checkWidget();
-	int list = OS.gtk_container_get_children (handle);
+	int /*long*/ list = OS.gtk_container_get_children (handle);
 	if (list == 0) error (SWT.ERROR_CANNOT_GET_ITEM);
 	int count = OS.g_list_length (list);
 	if (imSeparator != 0) count--;
@@ -382,7 +382,7 @@ public MenuItem getItem (int index) {
  */
 public int getItemCount () {
 	checkWidget();
-	int list = OS.gtk_container_get_children (handle);
+	int /*long*/ list = OS.gtk_container_get_children (handle);
 	if (list == 0) return 0;
 	int count = OS.g_list_length (list);
 	OS.g_list_free (list);
@@ -409,7 +409,7 @@ public int getItemCount () {
  */
 public MenuItem [] getItems () {
 	checkWidget();
-	int list = OS.gtk_container_get_children (handle);
+	int /*long*/ list = OS.gtk_container_get_children (handle);
 	if (list == 0) return new MenuItem [0];
 	int count = OS.g_list_length (list);
 	if (imSeparator != 0) count--;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MessageBox.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MessageBox.java
index 773d53edc4..b9da6ecd73 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MessageBox.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MessageBox.java
@@ -37,7 +37,7 @@ import org.eclipse.swt.internal.gtk.*;
 public class MessageBox extends Dialog {
 
 	String message = "";
-	int handle;
+	int /*long*/ handle;
 /**
  * Constructs a new instance of this class given only its
  * parent.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java
index f473b013cc..965aa1943c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java
@@ -155,7 +155,7 @@ static int checkStyle (int style) {
  */
 public boolean getEnabled () {
 	checkWidget ();
-	int barHandle;
+	int /*long*/ barHandle;
 	if ((style & SWT.HORIZONTAL) != 0) {
 		barHandle = OS.GTK_SCROLLED_WINDOW_HSCROLLBAR (parent.scrolledHandle);
 	} else {
@@ -284,7 +284,7 @@ public int getSelection () {
  */
 public Point getSize () {
 	checkWidget ();
-	int barHandle = 0;
+	int /*long*/ barHandle = 0;
 	int /*long*/ scrolledHandle = parent.scrolledHandle;
 	if ((style & SWT.HORIZONTAL) != 0) {
 		barHandle = OS.GTK_SCROLLED_WINDOW_HSCROLLBAR (scrolledHandle);
@@ -446,7 +446,7 @@ public void removeSelectionListener (SelectionListener listener) {
  */
 public void setEnabled (boolean enabled) {
 	checkWidget ();
-	int barHandle;
+	int /*long*/ barHandle;
 	if ((style & SWT.HORIZONTAL) != 0) {
 		barHandle = OS.GTK_SCROLLED_WINDOW_HSCROLLBAR (parent.scrolledHandle);
 	} else {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java
index 16acc7813f..d16db65cba 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java
@@ -222,7 +222,7 @@ public ScrollBar getVerticalBar () {
 
 int hScrollBarWidth() {
 	if (horizontalBar==null) return 0;
-	int hBarHandle = OS.GTK_SCROLLED_WINDOW_HSCROLLBAR(scrolledHandle);
+	int /*long*/ hBarHandle = OS.GTK_SCROLLED_WINDOW_HSCROLLBAR(scrolledHandle);
 	if (hBarHandle==0) return 0;
 	GtkRequisition requisition = new GtkRequisition();
 	OS.gtk_widget_size_request(hBarHandle, requisition);
@@ -291,7 +291,7 @@ int /*long*/ topHandle () {
 
 int vScrollBarWidth() {
 	if (verticalBar == null) return 0;
-	int vBarHandle = OS.GTK_SCROLLED_WINDOW_VSCROLLBAR(scrolledHandle);
+	int /*long*/ vBarHandle = OS.GTK_SCROLLED_WINDOW_VSCROLLBAR(scrolledHandle);
 	if (vBarHandle == 0) return 0;
 	GtkRequisition requisition = new GtkRequisition();
 	OS.gtk_widget_size_request (vBarHandle, requisition);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
index e804ea054d..fbf60cb0d0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
@@ -416,7 +416,7 @@ void bringToTop (boolean force) {
 	*/
 	int /*long*/ window = OS.GTK_WIDGET_WINDOW (shellHandle);
 	if ((style & SWT.ON_TOP) != 0 && OS.GDK_WINDOWING_X11 ()) {
-		int xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
+		int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
 		int xid = OS.gdk_x11_drawable_get_xid (window);
 		OS.gdk_error_trap_push ();
 		OS.XSetInputFocus (xDisplay, xid, OS.RevertToParent, OS.gtk_get_current_event_time ());
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
index 3dd342a776..154a4cbda8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
@@ -244,7 +244,7 @@ void createHandle (int index) {
 	OS.gtk_widget_show (handle);
 
 	int mode = (style & SWT.MULTI) != 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE;
-	int selectionHandle = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selectionHandle = OS.gtk_tree_view_get_selection (handle);
 	OS.gtk_tree_selection_set_mode (selectionHandle, mode);
 	OS.gtk_tree_view_set_headers_visible (handle, false);	
 	int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
@@ -306,7 +306,7 @@ void deregister () {
  */
 public void deselectAll() {
 	checkWidget();
-	int selection = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.gtk_tree_selection_unselect_all (selection);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
@@ -531,14 +531,14 @@ public TreeItem[] getSelection () {
 	if ((style & SWT.MULTI) != 0) {
 		display.treeSelectionLength  = 0;
 		display.treeSelection = new int [items.length];
-		int selection = OS.gtk_tree_view_get_selection (handle);
+		int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 		OS.gtk_tree_selection_selected_foreach (selection, display.treeSelectionProc, handle);
 		TreeItem [] result = new TreeItem [display.treeSelectionLength];
 		for (int i=0; i<result.length; i++) result [i] = items [display.treeSelection [i]];
 		return result;
 	} else {
 		int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-		int selection = OS.gtk_tree_view_get_selection (handle);
+		int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 		boolean hasSelection = OS.gtk_tree_selection_get_selected (selection, null, iter);
 		TreeItem [] result;
 		if (hasSelection) {
@@ -567,7 +567,7 @@ public int getSelectionCount () {
 	checkWidget();
 	display.treeSelectionLength = 0;
 	display.treeSelection = null;
-	int selection = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 	OS.gtk_tree_selection_selected_foreach (selection, display.treeSelectionProc, handle);
 	return display.treeSelectionLength;
 }
@@ -716,7 +716,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
 		int /*long*/ [] path = new int /*long*/ [1];
 		if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {
 			if (path [0] != 0) {
-				int selection = OS.gtk_tree_view_get_selection (handle);
+				int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 				if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;
 				OS.gtk_tree_path_free (path [0]);
 			}
@@ -734,7 +734,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
 		int /*long*/ [] path = new int /*long*/ [1];
 		if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {
 			if (path [0] != 0) {
-				int selection = OS.gtk_tree_view_get_selection (handle);
+				int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 				OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 				OS.gtk_tree_view_set_cursor (handle, path [0], 0, false);
 				OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
@@ -748,7 +748,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
 	
 void hookEvents () {
 	super.hookEvents ();
-	int selection = OS.gtk_tree_view_get_selection(handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection(handle);
 	OS.g_signal_connect_after (selection, OS.changed, display.windowProc2, CHANGED);
 	OS.g_signal_connect (handle, OS.row_activated, display.windowProc4, ROW_ACTIVATED);
 	OS.g_signal_connect (handle, OS.test_expand_row, display.windowProc4, TEST_EXPAND_ROW);
@@ -926,7 +926,7 @@ public void setInsertMark (TreeItem item, boolean before) {
 public void selectAll () {
 	checkWidget();
 	if ((style & SWT.SINGLE) != 0) return;
-	int selection = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.gtk_tree_selection_select_all (OS.gtk_tree_view_get_selection (handle));
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
@@ -977,7 +977,7 @@ void setForegroundColor (GdkColor color) {
 public void setSelection (TreeItem [] items) {
 	checkWidget();
 	if (items == null) error (SWT.ERROR_NULL_ARGUMENT);
-	int selection = OS.gtk_tree_view_get_selection (handle);
+	int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.gtk_tree_selection_unselect_all (selection);
 	boolean first = true;