64 bit

12 files changed, 55 insertions, 54 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java b/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java
index c4430e9713..252cc9290e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java
@@ -34,7 +34,7 @@ public class SWT_AWT {
 
 static boolean loaded;
 
-static native final int getAWTHandle (Canvas canvas);
+static native final int /*long*/ getAWTHandle (Canvas canvas);
 
 static synchronized void loadLibrary () {
 	if (loaded) return;
@@ -101,7 +101,7 @@ public static Frame new_Frame (final Composite parent) {
 public static Shell new_Shell (final Display display, final Canvas parent) {
 	if (display == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
 	if (parent == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
-	int handle = 0;
+	int /*long*/ handle = 0;
 	try {
 		loadLibrary ();
 		handle = getAWTHandle (parent);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleFactory.java
index 33fd9806f0..5e98e4f02e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleFactory.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleFactory.java
@@ -18,14 +18,14 @@ import org.eclipse.swt.internal.gtk.*;
 
 class AccessibleFactory {
 	int /*long*/ handle;
-	int objectType, objectParentType;
+	int /*long*/ objectType, objectParentType;
 	Callback atkObjectFactoryCB_create_accessible;
 	Callback gTypeInfo_base_init_factory;
 	Hashtable accessibles = new Hashtable (9);
 
 	static final Hashtable Factories = new Hashtable (9);	
-	static int DefaultChildType;
-	static final int DefaultParentType = ATK.g_type_from_name (Converter.wcsToMbcs (null, "GtkAccessible", true));
+	static int /*long*/ DefaultChildType;
+	static final int /*long*/ DefaultParentType = ATK.g_type_from_name (Converter.wcsToMbcs (null, "GtkAccessible", true));
 	static final byte[] DEFAULT_CHILDTYPENAME = Converter.wcsToMbcs (null, "SWTChild", true);
 	static final byte[] FACTORY_PARENTTYPENAME = Converter.wcsToMbcs (null, "AtkObjectFactory", true);
 	static final byte[] SWT_TYPE_PREFIX = Converter.wcsToMbcs (null, "SWT", true);
@@ -123,7 +123,7 @@ class AccessibleFactory {
 		ATK.memmove (TextIfaceDefinition, interfaceInfo, GInterfaceInfo.sizeof);
 	}
 
-	private AccessibleFactory (int widgetType) {
+	private AccessibleFactory (int /*long*/ widgetType) {
 		super ();
 		/* If DefaultParentType is 0 then OS accessibility is not active */
 		if (DefaultParentType == 0) return;
@@ -140,7 +140,7 @@ class AccessibleFactory {
 			int /*long*/ previousFactory = ATK.atk_registry_get_factory (registry, widgetType);
 			objectParentType = ATK.atk_object_factory_get_accessible_type (previousFactory);
 			if (objectParentType == 0) objectParentType = DefaultParentType;
-			int factoryParentType = ATK.g_type_from_name (FACTORY_PARENTTYPENAME);
+			int /*long*/ factoryParentType = ATK.g_type_from_name (FACTORY_PARENTTYPENAME);
 			gTypeInfo_base_init_factory  = new Callback (this, "gTypeInfo_base_init_factory", 1);
 			GTypeInfo typeInfo = new GTypeInfo ();
 			typeInfo.base_init = gTypeInfo_base_init_factory.getAddress ();
@@ -148,7 +148,7 @@ class AccessibleFactory {
 			typeInfo.instance_size = (short)ATK.AtkObjectFactory_sizeof ();
 			handle = OS.g_malloc (GTypeInfo.sizeof); 
 			ATK.memmove (handle, typeInfo, GTypeInfo.sizeof); 
-			int swtFactory = ATK.g_type_register_static (factoryParentType, factoryName, handle, 0);
+			int /*long*/ swtFactory = ATK.g_type_register_static (factoryParentType, factoryName, handle, 0);
 			ATK.atk_registry_set_factory_type (registry, widgetType, swtFactory);
 			byte[] newTypeName = new byte [SWT_TYPE_PREFIX.length + widgetTypeNameLength];
 			System.arraycopy (SWT_TYPE_PREFIX, 0, newTypeName, 0, SWT_TYPE_PREFIX.length);
@@ -162,7 +162,7 @@ class AccessibleFactory {
 		accessibles.put (new LONG (controlHandle), accessible);
 	}
 
-	int /*long*/ atkObjectFactory_create_accessible (int widget) {
+	int /*long*/ atkObjectFactory_create_accessible (int /*long*/ widget) {
 		Accessible accessible = (Accessible) accessibles.get (new LONG (widget));
 		
 		if (accessible == null) {
@@ -177,7 +177,7 @@ class AccessibleFactory {
 		return object.handle;
 	}
 	
-	static int defineType (byte[] typeName, int parentType) {
+	static int /*long*/ defineType (byte[] typeName, int /*long*/ parentType) {
 		int /*long*/ queryPtr = OS.g_malloc (GTypeQuery.sizeof);
 		ATK.g_type_query (parentType, queryPtr);
 		GTypeQuery query = new GTypeQuery ();
@@ -189,7 +189,7 @@ class AccessibleFactory {
 		typeInfo.instance_size = (short) query.instance_size;
 		ObjectIfaceDefinition = OS.g_malloc (GTypeInfo.sizeof); 
 		ATK.memmove (ObjectIfaceDefinition, typeInfo, GTypeInfo.sizeof); 
-		int result = ATK.g_type_register_static (parentType, typeName, ObjectIfaceDefinition, 0);
+		int /*long*/ result = ATK.g_type_register_static (parentType, typeName, ObjectIfaceDefinition, 0);
 		ATK.g_type_add_interface_static (result, AccessibleObject.ATK_COMPONENT_TYPE, ComponentIfaceDefinition);
 		ATK.g_type_add_interface_static (result, AccessibleObject.ATK_ACTION_TYPE, ActionIfaceDefinition);
 		ATK.g_type_add_interface_static (result, AccessibleObject.ATK_SELECTION_TYPE, SelectionIfaceDefinition);
@@ -197,14 +197,14 @@ class AccessibleFactory {
 		return result;
 	}
 	
-	static int getDefaultChildType () {
+	static int /*long*/ getDefaultChildType () {
 		if (DefaultChildType == 0) {
 			DefaultChildType = defineType (DEFAULT_CHILDTYPENAME, DefaultParentType);
 		}
 		return DefaultChildType;
 	}
 
-	static int getDefaultParentType () {
+	static int /*long*/ getDefaultParentType () {
 		return DefaultParentType;
 	}
 
@@ -285,11 +285,11 @@ class AccessibleFactory {
 
 	static void registerAccessible (Accessible accessible) {
 		int /*long*/ controlHandle = accessible.getControlHandle ();
-		int widgetType = ATK.G_TYPE_FROM_INSTANCE (controlHandle);
-		AccessibleFactory factory = (AccessibleFactory) Factories.get (new Integer (widgetType));
+		int /*long*/ widgetType = ATK.G_TYPE_FROM_INSTANCE (controlHandle);
+		AccessibleFactory factory = (AccessibleFactory) Factories.get (new LONG (widgetType));
 		if (factory == null) {
 			factory = new AccessibleFactory (widgetType);
-			Factories.put (new Integer (widgetType), factory);
+			Factories.put (new LONG (widgetType), factory);
 		}
 		factory.addAccessible (accessible);
 	}
@@ -300,8 +300,8 @@ class AccessibleFactory {
 	
 	static void unregisterAccessible (Accessible accessible) {
 		int /*long*/ controlHandle = accessible.getControlHandle ();
-		int widgetType = ATK.G_TYPE_FROM_INSTANCE (controlHandle);
-		AccessibleFactory factory = (AccessibleFactory) Factories.get (new Integer (widgetType));
+		int /*long*/ widgetType = ATK.G_TYPE_FROM_INSTANCE (controlHandle);
+		AccessibleFactory factory = (AccessibleFactory) Factories.get (new LONG (widgetType));
 		if (factory != null) {
 			factory.removeAccessible (accessible);
 		}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
index 6132220b97..9f4d119ebf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
@@ -19,7 +19,8 @@ import org.eclipse.swt.widgets.*;
 
 class AccessibleObject {
 	int /*long*/ handle;
-	int parentType, index = -1, id = ACC.CHILDID_SELF;
+	int /*long*/ parentType;
+	int index = -1, id = ACC.CHILDID_SELF;
 	Accessible accessible;
 	AccessibleObject parent;
 	Hashtable children = new Hashtable (9);
@@ -32,13 +33,13 @@ class AccessibleObject {
 	static int /*long*/ keybindingPtr = -1;
 	static int /*long*/ namePtr = -1;
 	static final Hashtable AccessibleObjects = new Hashtable (9);
-	static final int ATK_ACTION_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkAction", true));
-	static final int ATK_COMPONENT_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkComponent", true));
-	static final int ATK_SELECTION_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkSelection", true));		
-	static final int ATK_TEXT_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkText", true));
+	static final int /*long*/ ATK_ACTION_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkAction", true));
+	static final int /*long*/ ATK_COMPONENT_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkComponent", true));
+	static final int /*long*/ ATK_SELECTION_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkSelection", true));		
+	static final int /*long*/ ATK_TEXT_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkText", true));
 	static final boolean DEBUG = Display.DEBUG;
 
-	AccessibleObject (int type, int widget, Accessible accessible, int parentType, boolean isLightweight) {
+	AccessibleObject (int /*long*/ type, int /*long*/ widget, Accessible accessible, int /*long*/ parentType, boolean isLightweight) {
 		super ();
 		handle = ATK.g_object_new (type, 0);
 		this.parentType = parentType;
@@ -1373,8 +1374,8 @@ class AccessibleObject {
 			Vector idsToKeep = new Vector (children.size ());
 			if (event.children [0] instanceof Integer) {
 				//	an array of child id's (Integers) was answered
-				int childType = AccessibleFactory.getDefaultChildType ();
-				int parentType = AccessibleFactory.getDefaultParentType ();
+				int /*long*/ childType = AccessibleFactory.getDefaultChildType ();
+				int /*long*/ parentType = AccessibleFactory.getDefaultParentType ();
 				for (int i = 0; i < event.children.length; i++) {
 					AccessibleObject object = getChildByIndex (i);
 					if (object == null) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/ATK.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/ATK.java
index 04077fc035..663d15c6a4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/ATK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/ATK.java
@@ -96,14 +96,14 @@ public class ATK extends OS {
 	public static final synchronized native int /*long*/ ATK_TEXT_GET_IFACE (int /*long*/ handle);
 	public static final synchronized native int /*long*/ G_OBJECT_CLASS (int /*long*/ klass);
 	public static final synchronized native int /*long*/ G_OBJECT_GET_CLASS (int /*long*/ object);
-	public static final synchronized native int G_TYPE_FROM_INSTANCE (int /*long*/ instance);
+	public static final synchronized native int /*long*/ G_TYPE_FROM_INSTANCE (int /*long*/ instance);
 	public static final synchronized native int /*long*/ GTK_ACCESSIBLE (int /*long*/ handle);
 	public static final synchronized native void atk_focus_tracker_notify (int /*long*/ object);
 	public static final synchronized native int /*long*/ atk_get_default_registry ();
-	public static final synchronized native int atk_object_factory_get_accessible_type (int /*long*/ factory);
+	public static final synchronized native int /*long*/ atk_object_factory_get_accessible_type (int /*long*/ factory);
 	public static final synchronized native void atk_object_initialize (int /*long*/ accessible, int /*long*/ data);
 	public static final synchronized native int /*long*/ atk_registry_get_factory (int /*long*/ registry, int /*long*/ type);
-	public static final synchronized native void atk_registry_set_factory_type (int /*long*/ registry, int type, int factory_type);
+	public static final synchronized native void atk_registry_set_factory_type (int /*long*/ registry, int /*long*/ type, int /*long*/ factory_type);
 	public static final synchronized native boolean atk_state_set_add_state (int /*long*/ set, int type);
 	public static final synchronized native int /*long*/ atk_state_set_new ();
 	public static final synchronized native int /*long*/ call (int /*long*/ function, int /*long*/ arg0);
@@ -113,16 +113,16 @@ public class ATK extends OS {
 	public static final synchronized native int /*long*/ call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4);
 	public static final synchronized native int /*long*/ call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, int /*long*/ arg5);
 	public static final synchronized native int /*long*/ g_object_new (int /*long*/ type, int /*long*/ first_property_name);
-	public static final synchronized native void g_type_add_interface_static (int instance_type, int interface_type, int /*long*/ info);
+	public static final synchronized native void g_type_add_interface_static (int /*long*/ instance_type, int /*long*/ interface_type, int /*long*/ info);
 	public static final synchronized native int /*long*/ g_type_class_peek (int /*long*/ g_class);
 	public static final synchronized native int /*long*/ g_type_class_peek_parent (int /*long*/ g_class);
-	public static final synchronized native int g_type_from_name (byte[] name);
+	public static final synchronized native int /*long*/ g_type_from_name (byte[] name);
 	public static final synchronized native int /*long*/ g_type_interface_peek_parent (int /*long*/ iface);
-	public static final synchronized native boolean g_type_is_a (int type, int is_a_type);
+	public static final synchronized native boolean g_type_is_a (int /*long*/ type, int /*long*/ is_a_type);
 	public static final synchronized native int /*long*/ g_type_name (int /*long*/ handle);
-	public static final synchronized native int g_type_parent (int type);
-	public static final synchronized native void g_type_query (int type, int /*long*/ query);
-	public static final synchronized native int g_type_register_static (int parent_type, byte[] type_name, int /*long*/ info, int flags);
+	public static final synchronized native int /*long*/ g_type_parent (int /*long*/ type);
+	public static final synchronized native void g_type_query (int /*long*/ type, int /*long*/ query);
+	public static final synchronized native int /*long*/ g_type_register_static (int /*long*/ parent_type, byte[] type_name, int /*long*/ info, int flags);
 	public static final synchronized native int /*long*/ gtk_widget_get_toplevel (int /*long*/ widget);
 	public static final synchronized native void memmove (AtkActionIface dest, int /*long*/ src);
 	public static final synchronized native void memmove (AtkComponentIface dest, int /*long*/ src);
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 9ec2a3dee0..cd68ddccc9 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
@@ -394,13 +394,13 @@ public static final int /*long*/ NoEventMask = 0;
 public static final int RevertToParent = 2;
 public static final int SYSTEM_TRAY_REQUEST_DOCK = 0;
 public static final synchronized native int XDefaultScreen(int /*long*/ display);
-public static final synchronized native int XGetSelectionOwner(int /*long*/ display, int /*long*/ selection);
-public static final synchronized native int XReconfigureWMWindow(int /*long*/ display, int window, int screen, int valueMask, XWindowChanges values);
+public static final synchronized native int /*long*/ XGetSelectionOwner(int /*long*/ display, int /*long*/ selection);
+public static final synchronized native int XReconfigureWMWindow(int /*long*/ display, int /*long*/ window, int screen, int valueMask, XWindowChanges values);
 public static final synchronized native int XSendEvent(int /*long*/ display, int /*long*/ w, boolean propogate, int /*long*/ event_mask, int /*long*/ event_send);
-public static final synchronized native int XSetInputFocus(int /*long*/ display, int window, int revert, int time);
+public static final synchronized native int XSetInputFocus(int /*long*/ display, int /*long*/ window, int revert, int time);
 public static final synchronized native int /*long*/gdk_x11_atom_to_xatom(int /*long*/ atom);
 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);
+public static final synchronized native int /*long*/ gdk_x11_drawable_get_xid(int /*long*/ drawable);
 public static final native void memmove(int /*long*/ dest, XClientMessageEvent src, int /*long*/ size);
 
 /** Native methods */
@@ -424,7 +424,7 @@ public static final synchronized native int /*long*/ G_TYPE_BOOLEAN();
 public static final synchronized native int /*long*/ G_TYPE_INT();
 public static final synchronized native int /*long*/ G_TYPE_STRING();
 public static final synchronized native int PANGO_PIXELS(int dimension);
-public static final synchronized native int PANGO_TYPE_FONT_DESCRIPTION();
+public static final synchronized native int /*long*/ PANGO_TYPE_FONT_DESCRIPTION();
 public static final synchronized native int /*long*/ g_filename_to_utf8(int /*long*/ opsysstring, int len, int[] bytes_read, int[] bytes_written, int /*long*/[] error);
 public static final synchronized native int /*long*/ g_filename_to_uri(int /*long*/ filename, int /*long*/ hostname, int /*long*/[] error);
 public static final synchronized native int /*long*/ g_filename_from_utf8(int /*long*/ opsysstring, int len,  int[] bytes_read, int[] bytes_written, int /*long*/[] error);
@@ -548,7 +548,7 @@ public static final synchronized native int gdk_pixbuf_get_rowstride(int /*long*
 public static final synchronized native int /*long*/ gdk_pixbuf_new(int colorspace, boolean has_alpha, int bits_per_sample, int width, int height);
 public static final synchronized native void gdk_pixbuf_render_to_drawable(int /*long*/ pixbuf, int /*long*/ drawable, int /*long*/ gc, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int dither, int x_dither, int y_dither);
 public static final synchronized native void gdk_pixbuf_render_to_drawable_alpha(int /*long*/ pixbuf, int /*long*/ drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_mode, int alpha_threshold, int dither, int x_dither, int y_dither);
-public static final synchronized native void gdk_pixbuf_render_pixmap_and_mask(int /*long*/ pixbuf, int /*long*/[] pixmap_return, int[] mask_return, int alpha_threshold);
+public static final synchronized native void gdk_pixbuf_render_pixmap_and_mask(int /*long*/ pixbuf, int /*long*/[] pixmap_return, int /*long*/[] mask_return, int alpha_threshold);
 public static final synchronized native void gdk_pixbuf_scale(int /*long*/ src, int /*long*/ dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, int interp_type);
 public static final synchronized native int /*long*/ gdk_pixbuf_scale_simple(int /*long*/ src, int dest_width, int dest_height, int interp_type);
 public static final synchronized native int /*long*/ gdk_pixmap_new(int /*long*/ window, int width, int height, int depth);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XWindowChanges.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XWindowChanges.java
index 08529f73b4..d94046dcd0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XWindowChanges.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XWindowChanges.java
@@ -17,7 +17,7 @@ public class XWindowChanges {
 	public int width;
 	public int height;
 	public int border_width;
-	public int sibling;
+	public int /*long*/ sibling;
 	public int stack_mode;
 	public static final int sizeof = OS.XWindowChanges_sizeof();
 }
\ No newline at end of file
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 dc818925ab..afc2999edb 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
@@ -226,7 +226,7 @@ public Shell (Display display, int style) {
 	this (display, null, style, 0);
 }
 
-Shell (Display display, Shell parent, int style, int handle) {
+Shell (Display display, Shell parent, int style, int /*long*/ handle) {
 	super ();
 	checkSubclass ();
 	if (display == null) display = Display.getCurrent ();
@@ -313,7 +313,7 @@ public Shell (Shell parent, int style) {
 	this (parent != null ? parent.display : null, parent, style, 0);
 }
 
-public static Shell gtk_new (Display display, int handle) {
+public static Shell gtk_new (Display display, int /*long*/ handle) {
 	return new Shell (display, null, SWT.NO_TRIM, handle);
 }
 
@@ -417,7 +417,7 @@ void bringToTop (boolean force) {
 	int /*long*/ window = OS.GTK_WIDGET_WINDOW (shellHandle);
 	if ((style & SWT.ON_TOP) != 0 && OS.GDK_WINDOWING_X11 ()) {
 		int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
-		int xid = OS.gdk_x11_drawable_get_xid (window);
+		int /*long*/ 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 ());
 		OS.gdk_error_trap_pop ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java
index f142da88f5..538b69b447 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java
@@ -585,7 +585,7 @@ boolean setBounds (int x, int y, int width, int height, boolean move, boolean re
 	return changed;
 }
 
-void setFontDescription (int font) {
+void setFontDescription (int /*long*/ font) {
 	super.setFontDescription (font);
 	TabItem [] items = getItems ();
 	for (int i = 0; i < items.length; i++) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
index 521176412a..9a887b1bbe 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
@@ -1799,12 +1799,12 @@ boolean setCellData(int /*long*/ tree_model, int /*long*/ iter) {
 	return false;
 }
 
-void setFontDescription (int font) {
+void setFontDescription (int /*long*/ font) {
 	super.setFontDescription (font);
-	TableColumn[] cloumns = getColumns ();
-	for (int i = 0; i < cloumns.length; i++) {
-		if (cloumns[i] != null) {
-			cloumns[i].setFontDescription (font);
+	TableColumn[] columns = getColumns ();
+	for (int i = 0; i < columns.length; i++) {
+		if (columns[i] != null) {
+			columns[i].setFontDescription (font);
 		}
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
index 37f8dd0dd2..ef8dff9110 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
@@ -1279,7 +1279,7 @@ public void setEditable (boolean editable) {
 	}
 }
 
-void setFontDescription (int font) {
+void setFontDescription (int /*long*/ font) {
 	super.setFontDescription (font);
 	setTabStops (tabs);
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java
index c8243d89d1..dfd13051d0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java
@@ -342,7 +342,7 @@ void removeControl (Control control) {
 	}
 }
 
-void setFontDescription (int font) {
+void setFontDescription (int /*long*/ font) {
 	super.setFontDescription (font);
 	ToolItem [] items = getItems ();
 	for (int i = 0; i < items.length; i++) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TrayIcon.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TrayIcon.java
index 7e06a77016..d8031a44b5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TrayIcon.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TrayIcon.java
@@ -32,7 +32,7 @@ public TrayIcon (Display display) {
 	int /*long*/ trayAtom = OS.gdk_atom_intern (trayBuffer, true);
 	int /*long*/ xTrayAtom = OS.gdk_x11_atom_to_xatom (trayAtom);
 	int /*long*/ xDisplay = OS.GDK_DISPLAY ();
-	int trayWindow = OS.XGetSelectionOwner (xDisplay, xTrayAtom);
+	int /*long*/ trayWindow = OS.XGetSelectionOwner (xDisplay, xTrayAtom);
 	byte [] messageBuffer = Converter.wcsToMbcs (null, "_NET_SYSTEM_TRAY_OPCODE", true);
 	int /*long*/ messageAtom = OS.gdk_atom_intern (messageBuffer, true);
 	int /*long*/ xMessageAtom = OS.gdk_x11_atom_to_xatom (messageAtom);