[SCM] Debian packaging for swt-gtk. branch, master, updated. debian/3.5.1-3-3-gfa178e7
Adrian Perez
blackxored at alioth.debian.org
Thu Sep 16 15:12:56 UTC 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Debian packaging for swt-gtk.".
The branch, master has been updated
via fa178e7ee4846c1aeb0b2325ee0e561108a87c23 (commit)
via 24d0a82495bdf027517a9006b6e4698e31402562 (commit)
via d0823b9e8c06d365fd4cf13fc5f2efaa3d8d0f36 (commit)
from 96dd69942109b3a340092e4e17dee5ab7b247593 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fa178e7ee4846c1aeb0b2325ee0e561108a87c23
Author: Adrian Perez <blackxored at debian.org>
Date: Wed Sep 15 15:54:35 2010 -0400
Prepare 3.5.1-4 upload to unstable
commit 24d0a82495bdf027517a9006b6e4698e31402562
Author: Adrian Perez <blackxored at debian.org>
Date: Thu Sep 16 11:10:14 2010 -0400
Support powerpcspe builds. Closes: 597056.
Thanks: Sebastian Andrzej Siewior
commit d0823b9e8c06d365fd4cf13fc5f2efaa3d8d0f36
Author: Adrian Perez <blackxored at debian.org>
Date: Wed Sep 15 15:10:08 2010 -0400
Refresh and rename patches
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 11 +
debian/patches/02-bp-accessible-object.diff | 16 +
debian/patches/64/arch64.diff |20505 ++++++++++++-----------
debian/patches/common/bp-accessible-object.diff | 16 -
debian/rules | 4 +
5 files changed, 10424 insertions(+), 10128 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1ed9ec7..d89c179 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+swt-gtk (3.5.1-4) unstable; urgency=low
+
+ * debian/patches:
+ - Refresh arch64.diff. FTBFS on x86_64 CPUs.
+ - Rename bp-accessible-object patch.
+ * debian/rules:
+ - Support powerpcspe builds. Closes: #597056.
+ Thanks: Sebastian Andrzej Siewior.
+
+ -- Adrian Perez <blackxored at debian.org> Wed, 15 Sep 2010 15:53:07 -0400
+
swt-gtk (3.5.1-3) unstable; urgency=low
* Acknowledge AWL-forced NMU. Thanks: Ahmed El-Mahmoudy.
diff --git a/debian/patches/02-bp-accessible-object.diff b/debian/patches/02-bp-accessible-object.diff
new file mode 100644
index 0000000..8dab5fe
--- /dev/null
+++ b/debian/patches/02-bp-accessible-object.diff
@@ -0,0 +1,16 @@
+diff --git a/org/eclipse/swt/accessibility/AccessibleObject.java b/org/eclipse/swt/accessibility/AccessibleObject.java
+index 00b05d5..1111cbd 100644
+--- a/org/eclipse/swt/accessibility/AccessibleObject.java
++++ b/org/eclipse/swt/accessibility/AccessibleObject.java
+@@ -1176,7 +1176,10 @@ class AccessibleObject {
+ }
+
+ static AccessibleObject getAccessibleObject (int /*long*/ atkObject) {
+- return (AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
++ AccessibleObject object = (AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
++ if (object == null) return null;
++ if (object.accessible == null) return null;
++ return object;
+ }
+
+ AccessibleObject getChildByHandle (int /*long*/ handle) {
diff --git a/debian/patches/64/arch64.diff b/debian/patches/64/arch64.diff
index 154b738..156b2f7 100644
--- a/debian/patches/64/arch64.diff
+++ b/debian/patches/64/arch64.diff
@@ -1,7 +1,21 @@
-diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/eclipse/swt/accessibility/AccessibleFactory.java
---- x86/org/eclipse/swt/accessibility/AccessibleFactory.java 2009-05-29 17:30:30.000000000 -0400
-+++ x86_64/org/eclipse/swt/accessibility/AccessibleFactory.java 2009-09-17 08:48:16.000000000 -0400
-@@ -18,16 +18,16 @@
+diff --git a/org/eclipse/swt/accessibility/Accessible.java b/org/eclipse/swt/accessibility/Accessible.java
+index 6a2a5d5..233caf7 100644
+--- a/org/eclipse/swt/accessibility/Accessible.java
++++ b/org/eclipse/swt/accessibility/Accessible.java
+@@ -169,7 +169,7 @@ public class Accessible {
+ return result;
+ }
+
+- int /*long*/ getControlHandle () {
++ long /*int*/ getControlHandle () {
+ return control.handle;
+ }
+
+diff --git a/org/eclipse/swt/accessibility/AccessibleFactory.java b/org/eclipse/swt/accessibility/AccessibleFactory.java
+index c6f6300..4b7ad05 100644
+--- a/org/eclipse/swt/accessibility/AccessibleFactory.java
++++ b/org/eclipse/swt/accessibility/AccessibleFactory.java
+@@ -18,16 +18,16 @@ import org.eclipse.swt.internal.gtk.*;
import org.eclipse.swt.*;
class AccessibleFactory {
@@ -22,7 +36,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
static final byte[] FACTORY_PARENTTYPENAME = Converter.wcsToMbcs (null, "AtkObjectFactory", true); //$NON-NLS-1$
static final byte[] SWT_TYPE_PREFIX = Converter.wcsToMbcs (null, "SWT", false); //$NON-NLS-1$
static final byte[] CHILD_TYPENAME = Converter.wcsToMbcs (null, "Child", false); //$NON-NLS-1$
-@@ -83,12 +83,12 @@
+@@ -83,12 +83,12 @@ class AccessibleFactory {
static final Callback InitSelectionIfaceCB;
static final Callback InitTextIfaceCB;
/* interface definitions */
@@ -41,7 +55,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
static {
AtkActionCB_get_keybinding = newCallback (AccessibleObject.class, "atkAction_get_keybinding", 2); //$NON-NLS-1$
AtkActionCB_get_name = newCallback (AccessibleObject.class, "atkAction_get_name", 2); //$NON-NLS-1$
-@@ -158,7 +158,7 @@
+@@ -158,7 +158,7 @@ class AccessibleFactory {
return callback;
}
@@ -50,7 +64,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
super ();
widgetTypeName = OS.g_type_name (widgetType);
int widgetTypeNameLength = OS.strlen (widgetTypeName) + 1;
-@@ -169,40 +169,40 @@
+@@ -169,40 +169,40 @@ class AccessibleFactory {
System.arraycopy (buffer, 0, factoryName, FACTORY_TYPENAME.length - 1, widgetTypeNameLength);
if (OS.g_type_from_name (factoryName) == 0) {
/* register the factory */
@@ -100,7 +114,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
ATK.atk_object_initialize (result, widget);
return result;
}
-@@ -213,21 +213,21 @@
+@@ -213,21 +213,21 @@ class AccessibleFactory {
int typeNameLength = OS.strlen (widgetTypeName);
byte[] buffer = new byte [typeNameLength];
OS.memmove (buffer, widgetTypeName, typeNameLength);
@@ -126,7 +140,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
AccessibleControlEvent event = new AccessibleControlEvent (accessible);
event.childID = childId;
AccessibleControlListener[] listeners = accessible.getControlListeners ();
-@@ -270,13 +270,13 @@
+@@ -270,13 +270,13 @@ class AccessibleFactory {
if (selection) swtTypeName += "Selection"; //$NON-NLS-1$
if (text) swtTypeName += "Text"; //$NON-NLS-1$
@@ -142,7 +156,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
OS.g_type_query (parentType, queryPtr);
GTypeQuery query = new GTypeQuery ();
OS.memmove (query, queryPtr, GTypeQuery.sizeof);
-@@ -299,19 +299,19 @@
+@@ -299,19 +299,19 @@ class AccessibleFactory {
return type;
}
@@ -166,7 +180,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
AtkObjectClass objectClass = new AtkObjectClass ();
ATK.memmove (objectClass, klass);
objectClass.get_name = AtkObjectCB_get_name.getAddress ();
-@@ -322,7 +322,7 @@
+@@ -322,7 +322,7 @@ class AccessibleFactory {
objectClass.ref_state_set = AtkObjectCB_ref_state_set.getAddress ();
objectClass.get_index_in_parent = AtkObjectCB_get_index_in_parent.getAddress ();
objectClass.ref_child = AtkObjectCB_ref_child.getAddress ();
@@ -175,7 +189,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
GObjectClass objectClassStruct = new GObjectClass ();
OS.memmove (objectClassStruct, gObjectClass);
objectClassStruct.finalize = GObjectClass_finalize.getAddress ();
-@@ -331,7 +331,7 @@
+@@ -331,7 +331,7 @@ class AccessibleFactory {
return 0;
}
@@ -184,7 +198,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
AtkActionIface actionIface = new AtkActionIface ();
ATK.memmove (actionIface, iface);
actionIface.get_keybinding = AtkActionCB_get_keybinding.getAddress ();
-@@ -340,7 +340,7 @@
+@@ -340,7 +340,7 @@ class AccessibleFactory {
return 0;
}
@@ -193,7 +207,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
AtkComponentIface componentIface = new AtkComponentIface ();
ATK.memmove (componentIface, iface);
componentIface.get_extents = AtkComponentCB_get_extents.getAddress ();
-@@ -351,7 +351,7 @@
+@@ -351,7 +351,7 @@ class AccessibleFactory {
return 0;
}
@@ -202,7 +216,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
AtkHypertextIface hypertextIface = new AtkHypertextIface ();
ATK.memmove (hypertextIface, iface);
hypertextIface.get_link = AtkHypertextCB_get_link.getAddress ();
-@@ -361,7 +361,7 @@
+@@ -361,7 +361,7 @@ class AccessibleFactory {
return 0;
}
@@ -211,7 +225,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
AtkSelectionIface selectionIface = new AtkSelectionIface ();
ATK.memmove (selectionIface, iface);
selectionIface.is_child_selected = AtkSelectionCB_is_child_selected.getAddress ();
-@@ -370,7 +370,7 @@
+@@ -370,7 +370,7 @@ class AccessibleFactory {
return 0;
}
@@ -220,7 +234,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
AtkTextIface textInterface = new AtkTextIface ();
ATK.memmove (textInterface, iface);
textInterface.get_caret_offset = AtkTextCB_get_caret_offset.getAddress ();
-@@ -389,8 +389,8 @@
+@@ -389,8 +389,8 @@ class AccessibleFactory {
static void registerAccessible (Accessible accessible) {
/* If DefaultParentType is 0 then OS accessibility is not active */
if (DefaultParentType == 0) return;
@@ -231,7 +245,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
AccessibleFactory factory = (AccessibleFactory) Factories.get (new LONG (widgetType));
if (factory == null) {
factory = new AccessibleFactory (widgetType);
-@@ -404,8 +404,8 @@
+@@ -404,8 +404,8 @@ class AccessibleFactory {
}
static void unregisterAccessible (Accessible accessible) {
@@ -242,22 +256,11 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ec
AccessibleFactory factory = (AccessibleFactory) Factories.get (new LONG (widgetType));
if (factory != null) {
factory.removeAccessible (accessible);
-diff -urN x86/org/eclipse/swt/accessibility/Accessible.java x86_64/org/eclipse/swt/accessibility/Accessible.java
---- x86/org/eclipse/swt/accessibility/Accessible.java 2009-05-29 17:30:30.000000000 -0400
-+++ x86_64/org/eclipse/swt/accessibility/Accessible.java 2009-09-17 08:48:16.000000000 -0400
-@@ -169,7 +169,7 @@
- return result;
- }
-
-- int /*long*/ getControlHandle () {
-+ long /*int*/ getControlHandle () {
- return control.handle;
- }
-
-diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/eclipse/swt/accessibility/AccessibleObject.java
---- x86/org/eclipse/swt/accessibility/AccessibleObject.java 2009-05-29 17:30:30.000000000 -0400
-+++ x86_64/org/eclipse/swt/accessibility/AccessibleObject.java 2009-09-17 08:48:16.000000000 -0400
-@@ -18,8 +18,8 @@
+diff --git a/org/eclipse/swt/accessibility/AccessibleObject.java b/org/eclipse/swt/accessibility/AccessibleObject.java
+index 1111cbd..16f0f6f 100644
+--- a/org/eclipse/swt/accessibility/AccessibleObject.java
++++ b/org/eclipse/swt/accessibility/AccessibleObject.java
+@@ -18,8 +18,8 @@ import org.eclipse.swt.internal.gtk.*;
import org.eclipse.swt.widgets.*;
class AccessibleObject {
@@ -268,7 +271,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
int index = -1, id = ACC.CHILDID_SELF;
Accessible accessible;
AccessibleObject parent;
-@@ -30,19 +30,19 @@
+@@ -30,19 +30,19 @@ class AccessibleObject {
*/
boolean isLightweight = false;
@@ -298,7 +301,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
super ();
handle = ATK.g_object_new (type, 0);
this.parentType = parentType;
-@@ -58,13 +58,13 @@
+@@ -58,13 +58,13 @@ class AccessibleObject {
child.setParent (this);
}
@@ -315,7 +318,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkActionIface actionIface = new AtkActionIface ();
ATK.memmove (actionIface, superType);
if (actionIface.get_keybinding != 0) {
-@@ -93,13 +93,13 @@
+@@ -93,13 +93,13 @@ class AccessibleObject {
return keybindingPtr;
}
@@ -332,7 +335,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkActionIface actionIface = new AtkActionIface ();
ATK.memmove (actionIface, superType);
if (actionIface.get_name != 0) {
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,7 @@ class AccessibleObject {
return actionNamePtr;
}
@@ -341,7 +344,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) System.out.println ("-->atkComponent_get_extents");
AccessibleObject object = getAccessibleObject (atkObject);
if (object == null) return 0;
-@@ -137,7 +137,7 @@
+@@ -137,7 +137,7 @@ class AccessibleObject {
OS.memmove (width, new int[] {0}, 4);
OS.memmove (height, new int[] {0}, 4);
if (ATK.g_type_is_a (object.parentType, ATK_COMPONENT_TYPE)) {
@@ -350,7 +353,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkComponentIface componentIface = new AtkComponentIface ();
ATK.memmove (componentIface, superType);
if (componentIface.get_extents != 0) {
-@@ -159,11 +159,11 @@
+@@ -159,11 +159,11 @@ class AccessibleObject {
event.width = parentWidth [0]; event.height = parentHeight [0];
if (coord_type == ATK.ATK_XY_WINDOW) {
/* translate control -> display, for filling in event to be dispatched */
@@ -365,7 +368,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
int[] topWindowX = new int [1], topWindowY = new int [1];
OS.gdk_window_get_origin (window, topWindowX, topWindowY);
event.x += topWindowX [0];
-@@ -174,11 +174,11 @@
+@@ -174,11 +174,11 @@ class AccessibleObject {
}
if (coord_type == ATK.ATK_XY_WINDOW) {
/* translate display -> control, for answering to the OS */
@@ -380,7 +383,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
int[] topWindowX = new int [1], topWindowY = new int [1];
OS.gdk_window_get_origin (window, topWindowX, topWindowY);
event.x -= topWindowX [0];
-@@ -191,14 +191,14 @@
+@@ -191,14 +191,14 @@ class AccessibleObject {
return 0;
}
@@ -397,7 +400,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkComponentIface componentIface = new AtkComponentIface ();
ATK.memmove (componentIface, superType);
if (componentIface.get_extents != 0) {
-@@ -216,11 +216,11 @@
+@@ -216,11 +216,11 @@ class AccessibleObject {
event.x = parentX [0]; event.y = parentY [0];
if (coord_type == ATK.ATK_XY_WINDOW) {
/* translate control -> display, for filling in event to be dispatched */
@@ -412,7 +415,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
int[] topWindowX = new int [1], topWindowY = new int [1];
OS.gdk_window_get_origin (window, topWindowX, topWindowY);
event.x += topWindowX [0];
-@@ -231,11 +231,11 @@
+@@ -231,11 +231,11 @@ class AccessibleObject {
}
if (coord_type == ATK.ATK_XY_WINDOW) {
/* translate display -> control, for answering to the OS */
@@ -427,7 +430,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
int[] topWindowX = new int [1], topWindowY = new int [1];
OS.gdk_window_get_origin (window, topWindowX, topWindowY);
event.x -= topWindowX [0];
-@@ -246,14 +246,14 @@
+@@ -246,14 +246,14 @@ class AccessibleObject {
return 0;
}
@@ -444,7 +447,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkComponentIface componentIface = new AtkComponentIface ();
ATK.memmove (componentIface, superType);
if (componentIface.get_extents != 0) {
-@@ -277,13 +277,13 @@
+@@ -277,13 +277,13 @@ class AccessibleObject {
return 0;
}
@@ -461,7 +464,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkComponentIface componentIface = new AtkComponentIface ();
ATK.memmove (componentIface, superType);
if (componentIface.ref_accessible_at_point != 0) {
-@@ -298,11 +298,11 @@
+@@ -298,11 +298,11 @@ class AccessibleObject {
event.x = (int)/*64*/x; event.y = (int)/*64*/y;
if (coord_type == ATK.ATK_XY_WINDOW) {
/* translate control -> display, for filling in the event to be dispatched */
@@ -476,7 +479,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
int[] topWindowX = new int [1], topWindowY = new int [1];
OS.gdk_window_get_origin (window, topWindowX, topWindowY);
event.x += topWindowX [0];
-@@ -321,27 +321,27 @@
+@@ -321,27 +321,27 @@ class AccessibleObject {
return parentResult;
}
@@ -510,7 +513,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkObjectClass objectClass = new AtkObjectClass ();
ATK.memmove (objectClass, superType);
if (objectClass.get_description != 0) {
-@@ -369,12 +369,12 @@
+@@ -369,12 +369,12 @@ class AccessibleObject {
return descriptionPtr;
}
@@ -526,7 +529,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkObjectClass objectClass = new AtkObjectClass ();
ATK.memmove (objectClass, superType);
if (objectClass.get_name != 0) {
-@@ -402,12 +402,12 @@
+@@ -402,12 +402,12 @@ class AccessibleObject {
return namePtr;
}
@@ -542,7 +545,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkObjectClass objectClass = new AtkObjectClass ();
ATK.memmove (objectClass, superType);
if (objectClass.get_n_children != 0) {
-@@ -425,31 +425,31 @@
+@@ -425,31 +425,31 @@ class AccessibleObject {
return event.detail;
}
@@ -579,7 +582,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) System.out.println ("-->atkObject_get_role: " + atkObject);
AccessibleObject object = getAccessibleObject (atkObject);
if (object == null) return 0;
-@@ -497,14 +497,14 @@
+@@ -497,14 +497,14 @@ class AccessibleObject {
}
}
}
@@ -596,7 +599,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) System.out.println ("-->atkObject_ref_child: " + index + " of: " + atkObject);
AccessibleObject object = getAccessibleObject (atkObject);
if (object == null) return 0;
-@@ -514,19 +514,19 @@
+@@ -514,19 +514,19 @@ class AccessibleObject {
OS.g_object_ref (accObject.handle);
return accObject.handle;
}
@@ -620,7 +623,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkObjectClass objectClass = new AtkObjectClass ();
ATK.memmove (objectClass, superType);
if (objectClass.ref_state_set != 0) {
-@@ -535,7 +535,7 @@
+@@ -535,7 +535,7 @@ class AccessibleObject {
AccessibleControlListener[] listeners = object.getControlListeners ();
if (listeners.length == 0) return parentResult;
@@ -629,7 +632,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AccessibleControlEvent event = new AccessibleControlEvent (object.accessible);
event.childID = object.id;
event.detail = -1;
-@@ -564,13 +564,13 @@
+@@ -564,13 +564,13 @@ class AccessibleObject {
return set;
}
@@ -646,7 +649,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkSelectionIface selectionIface = new AtkSelectionIface ();
ATK.memmove (selectionIface, superType);
if (selectionIface.is_child_selected != 0) {
-@@ -592,13 +592,13 @@
+@@ -592,13 +592,13 @@ class AccessibleObject {
return parentResult;
}
@@ -663,7 +666,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkSelectionIface selectionIface = new AtkSelectionIface ();
ATK.memmove (selectionIface, superType);
if (selectionIface.ref_selection != 0) {
-@@ -622,13 +622,13 @@
+@@ -622,13 +622,13 @@ class AccessibleObject {
return parentResult;
}
@@ -680,7 +683,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTextIface textIface = new AtkTextIface ();
ATK.memmove (textIface, superType);
if (textIface.get_caret_offset != 0) {
-@@ -647,14 +647,14 @@
+@@ -647,14 +647,14 @@ class AccessibleObject {
return event.offset;
}
@@ -697,7 +700,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTextIface textIface = new AtkTextIface ();
ATK.memmove (textIface, superType);
if (textIface.get_character_at_offset != 0) {
-@@ -664,14 +664,14 @@
+@@ -664,14 +664,14 @@ class AccessibleObject {
return 0;
}
@@ -714,7 +717,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTextIface textIface = new AtkTextIface ();
ATK.memmove (textIface, superType);
if (textIface.get_character_count != 0) {
-@@ -681,13 +681,13 @@
+@@ -681,13 +681,13 @@ class AccessibleObject {
return 0;
}
@@ -731,7 +734,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTextIface textIface = new AtkTextIface ();
ATK.memmove (textIface, superType);
if (textIface.get_n_selections != 0) {
-@@ -705,14 +705,14 @@
+@@ -705,14 +705,14 @@ class AccessibleObject {
return event.length == 0 ? parentResult : 1;
}
@@ -748,7 +751,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
AtkTextIface textIface = new AtkTextIface ();
ATK.memmove (textIface, superType);
if (textIface.get_selection != 0) {
-@@ -738,7 +738,7 @@
+@@ -738,7 +738,7 @@ class AccessibleObject {
return 0;
}
@@ -757,7 +760,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) System.out.println ("-->atkText_get_text: " + start_offset + "," + end_offset);
AccessibleObject object = getAccessibleObject (atkObject);
if (object == null) return 0;
-@@ -752,14 +752,14 @@
+@@ -752,14 +752,14 @@ class AccessibleObject {
start_offset = Math.min (start_offset, end_offset);
text = text.substring ((int)/*64*/start_offset, (int)/*64*/end_offset);
byte[] bytes = Converter.wcsToMbcs (null, text, true);
@@ -774,7 +777,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) System.out.println ("-->atkText_get_text_after_offset");
AccessibleObject object = getAccessibleObject (atkObject);
if (object == null) return 0;
-@@ -925,14 +925,14 @@
+@@ -925,14 +925,14 @@ class AccessibleObject {
OS.memmove (end_offset, new int[] {endBounds}, 4);
text = text.substring (startBounds, endBounds);
byte[] bytes = Converter.wcsToMbcs (null, text, true);
@@ -791,7 +794,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) System.out.println ("-->atkText_get_text_at_offset: " + offset_value + " start: " + start_offset + " end: " + end_offset);
AccessibleObject object = getAccessibleObject (atkObject);
if (object == null) return 0;
-@@ -1041,14 +1041,14 @@
+@@ -1041,14 +1041,14 @@ class AccessibleObject {
OS.memmove (end_offset, new int[] {endBounds}, 4);
text = text.substring (startBounds, endBounds);
byte[] bytes = Converter.wcsToMbcs (null, text, true);
@@ -808,7 +811,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (DEBUG) System.out.println ("-->atkText_get_text_before_offset");
AccessibleObject object = getAccessibleObject (atkObject);
if (object == null) return 0;
-@@ -1162,7 +1162,7 @@
+@@ -1162,7 +1162,7 @@ class AccessibleObject {
OS.memmove (end_offset, new int[] {endBounds}, 4);
text = text.substring (startBounds, endBounds);
byte[] bytes = Converter.wcsToMbcs (null, text, true);
@@ -817,13 +820,16 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
OS.memmove (result, bytes, bytes.length);
return result;
}
-@@ -1175,11 +1175,11 @@
+@@ -1175,14 +1175,14 @@ class AccessibleObject {
return result != null ? result : new AccessibleListener [0];
}
- static AccessibleObject getAccessibleObject (int /*long*/ atkObject) {
+ static AccessibleObject getAccessibleObject (long /*int*/ atkObject) {
- return (AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
+ AccessibleObject object = (AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
+ if (object == null) return null;
+ if (object.accessible == null) return null;
+ return object;
}
- AccessibleObject getChildByHandle (int /*long*/ handle) {
@@ -831,7 +837,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
return (AccessibleObject) children.get (new LONG (handle));
}
-@@ -1209,13 +1209,13 @@
+@@ -1212,13 +1212,13 @@ class AccessibleObject {
}
String getText () {
@@ -848,7 +854,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
if (textIface.get_character_count != 0) {
characterCount = ATK.call (textIface.get_character_count, handle);
}
-@@ -1246,9 +1246,9 @@
+@@ -1249,9 +1249,9 @@ class AccessibleObject {
return result != null ? result : new AccessibleTextListener [0];
}
@@ -861,7 +867,7 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
GObjectClass objectClassStruct = new GObjectClass ();
ATK.memmove (objectClassStruct, gObjectClass);
ATK.call (objectClassStruct.finalize, atkObject);
-@@ -1365,11 +1365,11 @@
+@@ -1368,11 +1368,11 @@ class AccessibleObject {
Vector idsToKeep = new Vector (children.size ());
if (event.children [0] instanceof Integer) {
/* an array of child id's (Integers) was answered */
@@ -875,10 +881,11 @@ diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecl
object = new AccessibleObject (childType, 0, accessible, parentType, true);
AccessibleObjects.put (new LONG (object.handle), object);
addChild (object);
-diff -urN x86/org/eclipse/swt/awt/SWT_AWT.java x86_64/org/eclipse/swt/awt/SWT_AWT.java
---- x86/org/eclipse/swt/awt/SWT_AWT.java 2008-11-26 15:56:54.000000000 -0500
-+++ x86_64/org/eclipse/swt/awt/SWT_AWT.java 2009-09-17 08:48:16.000000000 -0400
-@@ -64,7 +64,7 @@
+diff --git a/org/eclipse/swt/awt/SWT_AWT.java b/org/eclipse/swt/awt/SWT_AWT.java
+index 2dead66..0b69b27 100644
+--- a/org/eclipse/swt/awt/SWT_AWT.java
++++ b/org/eclipse/swt/awt/SWT_AWT.java
+@@ -64,7 +64,7 @@ public class SWT_AWT {
static boolean loaded, swingInitialized;
@@ -887,7 +894,7 @@ diff -urN x86/org/eclipse/swt/awt/SWT_AWT.java x86_64/org/eclipse/swt/awt/SWT_AW
static native final void setDebug (Frame canvas, boolean debug);
static synchronized void loadLibrary () {
-@@ -152,7 +152,7 @@
+@@ -152,7 +152,7 @@ public static Frame new_Frame (final Composite parent) {
if ((parent.getStyle () & SWT.EMBEDDED) == 0) {
SWT.error (SWT.ERROR_INVALID_ARGUMENT);
}
@@ -896,7 +903,7 @@ diff -urN x86/org/eclipse/swt/awt/SWT_AWT.java x86_64/org/eclipse/swt/awt/SWT_AW
/*
* Some JREs have implemented the embedded frame constructor to take an integer
* and other JREs take a long. To handle this binary incompatibility, use
-@@ -200,9 +200,9 @@
+@@ -200,9 +200,9 @@ public static Frame new_Frame (final Composite parent) {
if (parent.isDisposed()) return;
Shell shell = parent.getShell();
loadLibrary();
@@ -908,7 +915,7 @@ diff -urN x86/org/eclipse/swt/awt/SWT_AWT.java x86_64/org/eclipse/swt/awt/SWT_AW
OS.XSetTransientForHint(OS.GDK_DISPLAY(), awtHandle, xWindow);
}
});
-@@ -300,7 +300,7 @@
+@@ -300,7 +300,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);
@@ -917,10 +924,11 @@ diff -urN x86/org/eclipse/swt/awt/SWT_AWT.java x86_64/org/eclipse/swt/awt/SWT_AW
try {
loadLibrary ();
handle = getAWTHandle (parent);
-diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse/swt/browser/AppFileLocProvider.java
---- x86/org/eclipse/swt/browser/AppFileLocProvider.java 2009-08-20 15:16:38.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/AppFileLocProvider.java 2009-09-17 08:48:20.000000000 -0400
-@@ -54,24 +54,24 @@
+diff --git a/org/eclipse/swt/browser/AppFileLocProvider.java b/org/eclipse/swt/browser/AppFileLocProvider.java
+index 8971565..b0aead6 100644
+--- a/org/eclipse/swt/browser/AppFileLocProvider.java
++++ b/org/eclipse/swt/browser/AppFileLocProvider.java
+@@ -54,24 +54,24 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -957,7 +965,7 @@ diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse
};
}
-@@ -90,32 +90,32 @@
+@@ -90,32 +90,32 @@ void disposeCOMInterfaces () {
}
}
@@ -996,7 +1004,7 @@ diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -132,7 +132,7 @@
+@@ -132,7 +132,7 @@ void setComponentsPath (String path) {
void setProfilePath (String path) {
profilePath = path;
if (!Compatibility.fileExists (path, "")) { //$NON-NLS-1$
@@ -1005,7 +1013,7 @@ diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse
nsEmbedString pathString = new nsEmbedString (path);
int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-@@ -148,7 +148,7 @@
+@@ -148,7 +148,7 @@ void setProfilePath (String path) {
/* nsIDirectoryServiceProvider2 */
@@ -1014,7 +1022,7 @@ diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse
int size = XPCOM.strlen (prop);
byte[] bytes = new byte[size];
XPCOM.memmove (bytes, prop, size);
-@@ -159,7 +159,7 @@
+@@ -159,7 +159,7 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) {
if (pluginDirs == null) {
int index = 0;
/* set the first value(s) to the MOZ_PLUGIN_PATH environment variable value if it's defined */
@@ -1023,7 +1031,7 @@ diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse
if (ptr != 0) {
int length = C.strlen (ptr);
byte[] buffer = new byte[length];
-@@ -210,9 +210,9 @@
+@@ -210,9 +210,9 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) {
propertyValues = pluginDirs;
}
@@ -1035,7 +1043,7 @@ diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse
nsISupports[] files = new nsISupports [propertyValues.length];
int index = 0;
for (int i = 0; i < propertyValues.length; i++) {
-@@ -246,7 +246,7 @@
+@@ -246,7 +246,7 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) {
SimpleEnumerator enumerator = new SimpleEnumerator (files);
enumerator.AddRef ();
@@ -1044,7 +1052,7 @@ diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse
return XPCOM.NS_OK;
}
-@@ -255,7 +255,7 @@
+@@ -255,7 +255,7 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) {
/* nsIDirectoryServiceProvider implementation */
@@ -1053,7 +1061,7 @@ diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse
int size = XPCOM.strlen (prop);
byte[] bytes = new byte[size];
XPCOM.memmove (bytes, prop, size);
-@@ -309,9 +309,9 @@
+@@ -309,9 +309,9 @@ int getFile(int /*long*/ prop, int /*long*/ persistent, int /*long*/ _retval) {
}
XPCOM.memmove (persistent, new int[] {1}, 4); /* PRBool */
@@ -1065,7 +1073,7 @@ diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse
nsEmbedString pathString = new nsEmbedString (propertyValue);
int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-@@ -324,7 +324,7 @@
+@@ -324,7 +324,7 @@ int getFile(int /*long*/ prop, int /*long*/ persistent, int /*long*/ _retval) {
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -1074,10 +1082,11 @@ diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse
localFile.Release ();
return XPCOM.NS_OK;
}
-diff -urN x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/browser/Download_1_8.java
---- x86/org/eclipse/swt/browser/Download_1_8.java 2008-08-21 15:41:30.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/Download_1_8.java 2009-09-17 08:48:20.000000000 -0400
-@@ -48,97 +48,97 @@
+diff --git a/org/eclipse/swt/browser/Download.java b/org/eclipse/swt/browser/Download.java
+index b648b33..2414a65 100644
+--- a/org/eclipse/swt/browser/Download.java
++++ b/org/eclipse/swt/browser/Download.java
+@@ -46,63 +46,63 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -1088,131 +1097,87 @@ diff -urN x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/b
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
-
- download = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3, is32 ? 10 : 6, is32 ? 8 : 7, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) {
+
+ download = new XPCOMObject (new int[] {2, 0, 0, 7, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-- public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
-- public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
-- public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
-- public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
-- public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
-- public int /*long*/ method8 (int /*long*/[] args) {
+- public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
+- public int /*long*/ method4 (int /*long*/[] args) {return GetSource (args[0]);}
+- public int /*long*/ method5 (int /*long*/[] args) {return GetTarget (args[0]);}
+- public int /*long*/ method6 (int /*long*/[] args) {return GetPersist (args[0]);}
+- public int /*long*/ method7 (int /*long*/[] args) {return GetPercentComplete (args[0]);}
+- public int /*long*/ method8 (int /*long*/[] args) {return GetDisplayName (args[0]);}
+- public int /*long*/ method9 (int /*long*/[] args) {return SetDisplayName (args[0]);}
+- public int /*long*/ method10 (int /*long*/[] args) {return GetStartTime (args[0]);}
+- public int /*long*/ method11 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}
+- public int /*long*/ method12 (int /*long*/[] args) {return GetListener (args[0]);}
+- public int /*long*/ method13 (int /*long*/[] args) {return SetListener (args[0]);}
+- public int /*long*/ method14 (int /*long*/[] args) {return GetObserver (args[0]);}
+- public int /*long*/ method15 (int /*long*/[] args) {return SetObserver (args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
-+ public long /*int*/ method3 (long /*int*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
-+ public long /*int*/ method4 (long /*int*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
-+ public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
-+ public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
-+ public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
-+ public long /*int*/ method8 (long /*int*/[] args) {
- if (args.length == 10) {
- return OnProgressChange64_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9]);
- } else {
- return OnProgressChange64 (args[0], args[1], args[2], args[3], args[4], args[5]);
- }
- }
-- public int /*long*/ method9 (int /*long*/[] args) {
-+ public long /*int*/ method9 (long /*int*/[] args) {
- if (args.length == 8) {
- return Init_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
- } else {
- return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);
- }
- }
-- public int /*long*/ method10 (int /*long*/[] args) {return GetTargetFile (args[0]);}
-- public int /*long*/ method11 (int /*long*/[] args) {return GetPercentComplete (args[0]);}
-- public int /*long*/ method12 (int /*long*/[] args) {return GetAmountTransferred (args[0]);}
-- public int /*long*/ method13 (int /*long*/[] args) {return GetSize (args[0]);}
-- public int /*long*/ method14 (int /*long*/[] args) {return GetSource (args[0]);}
-- public int /*long*/ method15 (int /*long*/[] args) {return GetTarget (args[0]);}
-- public int /*long*/ method16 (int /*long*/[] args) {return GetCancelable (args[0]);}
-- public int /*long*/ method17 (int /*long*/[] args) {return GetDisplayName (args[0]);}
-- public int /*long*/ method18 (int /*long*/[] args) {return GetStartTime (args[0]);}
-- public int /*long*/ method19 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}
-+ public long /*int*/ method10 (long /*int*/[] args) {return GetTargetFile (args[0]);}
-+ public long /*int*/ method11 (long /*int*/[] args) {return GetPercentComplete (args[0]);}
-+ public long /*int*/ method12 (long /*int*/[] args) {return GetAmountTransferred (args[0]);}
-+ public long /*int*/ method13 (long /*int*/[] args) {return GetSize (args[0]);}
-+ public long /*int*/ method14 (long /*int*/[] args) {return GetSource (args[0]);}
-+ public long /*int*/ method15 (long /*int*/[] args) {return GetTarget (args[0]);}
-+ public long /*int*/ method16 (long /*int*/[] args) {return GetCancelable (args[0]);}
-+ public long /*int*/ method17 (long /*int*/[] args) {return GetDisplayName (args[0]);}
-+ public long /*int*/ method18 (long /*int*/[] args) {return GetStartTime (args[0]);}
-+ public long /*int*/ method19 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}
++ public long /*int*/ method3 (long /*int*/[] args) {return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
++ public long /*int*/ method4 (long /*int*/[] args) {return GetSource (args[0]);}
++ public long /*int*/ method5 (long /*int*/[] args) {return GetTarget (args[0]);}
++ public long /*int*/ method6 (long /*int*/[] args) {return GetPersist (args[0]);}
++ public long /*int*/ method7 (long /*int*/[] args) {return GetPercentComplete (args[0]);}
++ public long /*int*/ method8 (long /*int*/[] args) {return GetDisplayName (args[0]);}
++ public long /*int*/ method9 (long /*int*/[] args) {return SetDisplayName (args[0]);}
++ public long /*int*/ method10 (long /*int*/[] args) {return GetStartTime (args[0]);}
++ public long /*int*/ method11 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}
++ public long /*int*/ method12 (long /*int*/[] args) {return GetListener (args[0]);}
++ public long /*int*/ method13 (long /*int*/[] args) {return SetListener (args[0]);}
++ public long /*int*/ method14 (long /*int*/[] args) {return GetObserver (args[0]);}
++ public long /*int*/ method15 (long /*int*/[] args) {return SetObserver (args[0]);}
};
-
- progressDialog = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3, is32 ? 10 : 6, is32 ? 8 : 7, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) {
+
+ progressDialog = new XPCOMObject (new int[] {2, 0, 0, 7, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-- public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
-- public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
-- public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
-- public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
-- public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
-- public int /*long*/ method8 (int /*long*/[] args) {
+- public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
+- public int /*long*/ method4 (int /*long*/[] args) {return GetSource (args[0]);}
+- public int /*long*/ method5 (int /*long*/[] args) {return GetTarget (args[0]);}
+- public int /*long*/ method6 (int /*long*/[] args) {return GetPersist (args[0]);}
+- public int /*long*/ method7 (int /*long*/[] args) {return GetPercentComplete (args[0]);}
+- public int /*long*/ method8 (int /*long*/[] args) {return GetDisplayName (args[0]);}
+- public int /*long*/ method9 (int /*long*/[] args) {return SetDisplayName (args[0]);}
+- public int /*long*/ method10 (int /*long*/[] args) {return GetStartTime (args[0]);}
+- public int /*long*/ method11 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}
+- public int /*long*/ method12 (int /*long*/[] args) {return GetListener (args[0]);}
+- public int /*long*/ method13 (int /*long*/[] args) {return SetListener (args[0]);}
+- public int /*long*/ method14 (int /*long*/[] args) {return GetObserver (args[0]);}
+- public int /*long*/ method15 (int /*long*/[] args) {return SetObserver (args[0]);}
+- public int /*long*/ method16 (int /*long*/[] args) {return Open (args[0]);}
+- public int /*long*/ method17 (int /*long*/[] args) {return GetCancelDownloadOnClose (args[0]);}
+- public int /*long*/ method18 (int /*long*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}
+- public int /*long*/ method19 (int /*long*/[] args) {return GetDialog (args[0]);}
+- public int /*long*/ method20 (int /*long*/[] args) {return SetDialog (args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
-+ public long /*int*/ method3 (long /*int*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
-+ public long /*int*/ method4 (long /*int*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
-+ public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
-+ public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
-+ public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
-+ public long /*int*/ method8 (long /*int*/[] args) {
- if (args.length == 10) {
- return OnProgressChange64_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9]);
- } else {
- return OnProgressChange64 (args[0], args[1], args[2], args[3], args[4], args[5]);
- }
- }
-- public int /*long*/ method9 (int /*long*/[] args) {
-+ public long /*int*/ method9 (long /*int*/[] args) {
- if (args.length == 8) {
- return Init_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
- } else {
- return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);
- }
- }
-- public int /*long*/ method10 (int /*long*/[] args) {return GetTargetFile (args[0]);}
-- public int /*long*/ method11 (int /*long*/[] args) {return GetPercentComplete (args[0]);}
-- public int /*long*/ method12 (int /*long*/[] args) {return GetAmountTransferred (args[0]);}
-- public int /*long*/ method13 (int /*long*/[] args) {return GetSize (args[0]);}
-- public int /*long*/ method14 (int /*long*/[] args) {return GetSource (args[0]);}
-- public int /*long*/ method15 (int /*long*/[] args) {return GetTarget (args[0]);}
-- public int /*long*/ method16 (int /*long*/[] args) {return GetCancelable (args[0]);}
-- public int /*long*/ method17 (int /*long*/[] args) {return GetDisplayName (args[0]);}
-- public int /*long*/ method18 (int /*long*/[] args) {return GetStartTime (args[0]);}
-- public int /*long*/ method19 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}
-- public int /*long*/ method20 (int /*long*/[] args) {return Open (args[0]);}
-- public int /*long*/ method21 (int /*long*/[] args) {return GetCancelDownloadOnClose (args[0]);}
-- public int /*long*/ method22 (int /*long*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}
-- public int /*long*/ method23 (int /*long*/[] args) {return GetObserver (args[0]);}
-- public int /*long*/ method24 (int /*long*/[] args) {return SetObserver (args[0]);}
-- public int /*long*/ method25 (int /*long*/[] args) {return GetDialog (args[0]);}
-- public int /*long*/ method26 (int /*long*/[] args) {return SetDialog (args[0]);}
-+ public long /*int*/ method10 (long /*int*/[] args) {return GetTargetFile (args[0]);}
-+ public long /*int*/ method11 (long /*int*/[] args) {return GetPercentComplete (args[0]);}
-+ public long /*int*/ method12 (long /*int*/[] args) {return GetAmountTransferred (args[0]);}
-+ public long /*int*/ method13 (long /*int*/[] args) {return GetSize (args[0]);}
-+ public long /*int*/ method14 (long /*int*/[] args) {return GetSource (args[0]);}
-+ public long /*int*/ method15 (long /*int*/[] args) {return GetTarget (args[0]);}
-+ public long /*int*/ method16 (long /*int*/[] args) {return GetCancelable (args[0]);}
-+ public long /*int*/ method17 (long /*int*/[] args) {return GetDisplayName (args[0]);}
-+ public long /*int*/ method18 (long /*int*/[] args) {return GetStartTime (args[0]);}
-+ public long /*int*/ method19 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}
-+ public long /*int*/ method20 (long /*int*/[] args) {return Open (args[0]);}
-+ public long /*int*/ method21 (long /*int*/[] args) {return GetCancelDownloadOnClose (args[0]);}
-+ public long /*int*/ method22 (long /*int*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}
-+ public long /*int*/ method23 (long /*int*/[] args) {return GetObserver (args[0]);}
-+ public long /*int*/ method24 (long /*int*/[] args) {return SetObserver (args[0]);}
-+ public long /*int*/ method25 (long /*int*/[] args) {return GetDialog (args[0]);}
-+ public long /*int*/ method26 (long /*int*/[] args) {return SetDialog (args[0]);}
++ public long /*int*/ method3 (long /*int*/[] args) {return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
++ public long /*int*/ method4 (long /*int*/[] args) {return GetSource (args[0]);}
++ public long /*int*/ method5 (long /*int*/[] args) {return GetTarget (args[0]);}
++ public long /*int*/ method6 (long /*int*/[] args) {return GetPersist (args[0]);}
++ public long /*int*/ method7 (long /*int*/[] args) {return GetPercentComplete (args[0]);}
++ public long /*int*/ method8 (long /*int*/[] args) {return GetDisplayName (args[0]);}
++ public long /*int*/ method9 (long /*int*/[] args) {return SetDisplayName (args[0]);}
++ public long /*int*/ method10 (long /*int*/[] args) {return GetStartTime (args[0]);}
++ public long /*int*/ method11 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}
++ public long /*int*/ method12 (long /*int*/[] args) {return GetListener (args[0]);}
++ public long /*int*/ method13 (long /*int*/[] args) {return SetListener (args[0]);}
++ public long /*int*/ method14 (long /*int*/[] args) {return GetObserver (args[0]);}
++ public long /*int*/ method15 (long /*int*/[] args) {return SetObserver (args[0]);}
++ public long /*int*/ method16 (long /*int*/[] args) {return Open (args[0]);}
++ public long /*int*/ method17 (long /*int*/[] args) {return GetCancelDownloadOnClose (args[0]);}
++ public long /*int*/ method18 (long /*int*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}
++ public long /*int*/ method19 (long /*int*/[] args) {return GetDialog (args[0]);}
++ public long /*int*/ method20 (long /*int*/[] args) {return SetDialog (args[0]);}
};
-
+
webProgressListener = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
@@ -1233,7 +1198,7 @@ diff -urN x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/b
};
}
-@@ -161,36 +161,36 @@
+@@ -125,36 +125,36 @@ void disposeCOMInterfaces () {
}
}
@@ -1254,13 +1219,13 @@ diff -urN x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/b
AddRef();
return XPCOM.NS_OK;
}
- if (guid.Equals (nsIDownload_1_8.NS_IDOWNLOAD_IID)) {
+ if (guid.Equals (nsIDownload.NS_IDOWNLOAD_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF);
AddRef();
return XPCOM.NS_OK;
}
- if (guid.Equals (nsIProgressDialog_1_8.NS_IPROGRESSDIALOG_IID)) {
+ if (guid.Equals (nsIProgressDialog.NS_IPROGRESSDIALOG_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF);
AddRef();
@@ -1276,60 +1241,64 @@ diff -urN x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/b
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-
-@@ -203,26 +203,26 @@
+
+@@ -167,13 +167,13 @@ int Release () {
/* nsIDownload */
/* Note. The argument startTime is defined as a PRInt64. This translates into two java ints. */
--int Init_32 (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, int /*long*/ startTime1, int /*long*/ startTime2, int /*long*/ aTempFile, int /*long*/ aCancelable) {
-+int Init_32 (long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long /*int*/ startTime1, long /*int*/ startTime2, long /*int*/ aTempFile, long /*int*/ aCancelable) {
- long startTime = (startTime2 << 32) + startTime1;
- return Init (aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aTempFile, aCancelable);
- }
-
--int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, long startTime, int /*long*/ aTempFile, int /*long*/ aCancelable) {
-+int Init (long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long startTime, long /*int*/ aTempFile, long /*int*/ aCancelable) {
- cancelable = new nsICancelable (aCancelable);
+-int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, int /*long*/ startTime1, int /*long*/ startTime2, int /*long*/ aPersist) {
++int Init (long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long /*int*/ startTime1, long /*int*/ startTime2, long /*int*/ aPersist) {
nsIURI source = new nsIURI (aSource);
- int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
int rc = source.GetHost (aSpec);
- if (rc != XPCOM.NS_OK) Mozilla.error(rc);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
int length = XPCOM.nsEmbedCString_Length (aSpec);
- int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
XPCOM.nsEmbedCString_delete (aSpec);
- String url = new String (dest);
-
- nsIURI target = new nsIURI (aTarget);
-- int /*long*/ aPath = XPCOM.nsEmbedCString_new ();
-+ long /*int*/ aPath = XPCOM.nsEmbedCString_new ();
- rc = target.GetPath (aPath);
- if (rc != XPCOM.NS_OK) Mozilla.error (rc);
- length = XPCOM.nsEmbedCString_Length (aPath);
-@@ -277,60 +277,60 @@
+@@ -186,12 +186,12 @@ int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName,
+ */
+ String filename = null;
+ nsISupports supports = new nsISupports (aTarget);
+- int /*long*/[] result = new int /*long*/[1];
++ long /*int*/[] result = new long /*int*/[1];
+ rc = supports.QueryInterface (nsIURI.NS_IURI_IID, result);
+ if (rc == XPCOM.NS_OK) { /* >= 1.7 */
+ nsIURI target = new nsIURI (result[0]);
+ result[0] = 0;
+- int /*long*/ aPath = XPCOM.nsEmbedCString_new ();
++ long /*int*/ aPath = XPCOM.nsEmbedCString_new ();
+ rc = target.GetPath (aPath);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ length = XPCOM.nsEmbedCString_Length (aPath);
+@@ -205,7 +205,7 @@ int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName,
+ target.Release ();
+ } else { /* < 1.7 */
+ nsILocalFile target = new nsILocalFile (aTarget);
+- int /*long*/ aNativeTarget = XPCOM.nsEmbedCString_new ();
++ long /*int*/ aNativeTarget = XPCOM.nsEmbedCString_new ();
+ rc = target.GetNativeLeafName (aNativeTarget);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ length = XPCOM.nsEmbedCString_Length (aNativeTarget);
+@@ -259,54 +259,54 @@ int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName,
return XPCOM.NS_OK;
}
--int GetAmountTransferred (int /*long*/ arg0) {
-+int GetAmountTransferred (long /*int*/ arg0) {
- return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
- }
-
--int GetCancelable (int /*long*/ arg0) {
-+int GetCancelable (long /*int*/ arg0) {
+-int GetSource (int /*long*/ aSource) {
++int GetSource (long /*int*/ aSource) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
--int GetDisplayName (int /*long*/ aDisplayName) {
-+int GetDisplayName (long /*int*/ aDisplayName) {
+-int GetTarget (int /*long*/ aTarget) {
++int GetTarget (long /*int*/ aTarget) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
--int GetMIMEInfo (int /*long*/ aMIMEInfo) {
-+int GetMIMEInfo (long /*int*/ aMIMEInfo) {
+-int GetPersist (int /*long*/ aPersist) {
++int GetPersist (long /*int*/ aPersist) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
@@ -1338,13 +1307,13 @@ diff -urN x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/b
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
--int GetSize (int /*long*/ arg0) {
-+int GetSize (long /*int*/ arg0) {
+-int GetDisplayName (int /*long*/ aDisplayName) {
++int GetDisplayName (long /*int*/ aDisplayName) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
--int GetSource (int /*long*/ aSource) {
-+int GetSource (long /*int*/ aSource) {
+-int SetDisplayName (int /*long*/ aDisplayName) {
++int SetDisplayName (long /*int*/ aDisplayName) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
@@ -1353,24 +1322,18 @@ diff -urN x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/b
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
--int GetTarget (int /*long*/ aTarget) {
-+int GetTarget (long /*int*/ aTarget) {
- return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
- }
-
--int GetTargetFile (int /*long*/ arg0) {
-+int GetTargetFile (long /*int*/ arg0) {
+-int GetMIMEInfo (int /*long*/ aMIMEInfo) {
++int GetMIMEInfo (long /*int*/ aMIMEInfo) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
- /* nsIProgressDialog */
--int GetCancelDownloadOnClose (int /*long*/ aCancelDownloadOnClose) {
-+int GetCancelDownloadOnClose (long /*int*/ aCancelDownloadOnClose) {
+-int GetListener (int /*long*/ aListener) {
++int GetListener (long /*int*/ aListener) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
--int GetDialog (int /*long*/ aDialog) {
-+int GetDialog (long /*int*/ aDialog) {
+-int SetListener (int /*long*/ aListener) {
++int SetListener (long /*int*/ aListener) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
@@ -1379,53 +1342,70 @@ diff -urN x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/b
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
+-int SetObserver (int /*long*/ aObserver) {
++int SetObserver (long /*int*/ aObserver) {
+ if (aObserver != 0) {
+ nsISupports supports = new nsISupports (aObserver);
+- int /*long*/[] result = new int /*long*/[1];
++ long /*int*/[] result = new long /*int*/[1];
+ int rc = supports.QueryInterface (nsIHelperAppLauncher.NS_IHELPERAPPLAUNCHER_IID, result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
+@@ -316,11 +316,11 @@ int SetObserver (int /*long*/ aObserver) {
+ }
+
+ /* nsIProgressDialog */
-int Open (int /*long*/ aParent) {
+int Open (long /*int*/ aParent) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-@@ -338,26 +338,26 @@
+-int GetCancelDownloadOnClose (int /*long*/ aCancelDownloadOnClose) {
++int GetCancelDownloadOnClose (long /*int*/ aCancelDownloadOnClose) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
--int SetDialog (int /*long*/ aDialog) {
-+int SetDialog (long /*int*/ aDialog) {
+@@ -328,17 +328,17 @@ int SetCancelDownloadOnClose (int aCancelDownloadOnClose) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
--int SetObserver (int /*long*/ aObserver) {
-+int SetObserver (long /*int*/ aObserver) {
+-int GetDialog (int /*long*/ aDialog) {
++int GetDialog (long /*int*/ aDialog) {
+ return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
+ }
+
+-int SetDialog (int /*long*/ aDialog) {
++int SetDialog (long /*int*/ aDialog) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
/* nsIWebProgressListener */
--int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aLocation) {
-+int OnLocationChange (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aLocation) {
+-int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {
++int OnStateChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) {
+ if ((aStateFlags & nsIWebProgressListener.STATE_STOP) != 0) {
+ if (helperAppLauncher != null) helperAppLauncher.Release ();
+ helperAppLauncher = null;
+@@ -348,7 +348,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
return XPCOM.NS_OK;
}
-int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
+int OnProgressChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
- return OnProgressChange64 (aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
+ int currentKBytes = aCurTotalProgress / 1024;
+ int totalKBytes = aMaxTotalProgress / 1024;
+ if (shell != null && !shell.isDisposed ()) {
+@@ -361,15 +361,15 @@ int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCur
+ return XPCOM.NS_OK;
}
- /* Note. The last 4 args in the original interface are defined as PRInt64. These each translate into two java ints. */
--int OnProgressChange64_32 (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aCurSelfProgress1, int /*long*/ aCurSelfProgress2, int /*long*/ aMaxSelfProgress1, int /*long*/ aMaxSelfProgress2, int /*long*/ aCurTotalProgress1, int /*long*/ aCurTotalProgress2, int /*long*/ aMaxTotalProgress1, int /*long*/ aMaxTotalProgress2) {
-+int OnProgressChange64_32 (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aCurSelfProgress1, long /*int*/ aCurSelfProgress2, long /*int*/ aMaxSelfProgress1, long /*int*/ aMaxSelfProgress2, long /*int*/ aCurTotalProgress1, long /*int*/ aCurTotalProgress2, long /*int*/ aMaxTotalProgress1, long /*int*/ aMaxTotalProgress2) {
- long aCurSelfProgress = (aCurSelfProgress2 << 32) + aCurSelfProgress1;
- long aMaxSelfProgress = (aMaxSelfProgress2 << 32) + aMaxSelfProgress1;
- long aCurTotalProgress = (aCurTotalProgress2 << 32) + aCurTotalProgress1;
-@@ -365,7 +365,7 @@
- return OnProgressChange64 (aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
+-int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aLocation) {
++int OnLocationChange (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aLocation) {
+ return XPCOM.NS_OK;
}
--int OnProgressChange64 (int /*long*/ aWebProgress, int /*long*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) {
-+int OnProgressChange64 (long /*int*/ aWebProgress, long /*int*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) {
- long currentKBytes = aCurTotalProgress / 1024;
- long totalKBytes = aMaxTotalProgress / 1024;
- if (shell != null && !shell.isDisposed ()) {
-@@ -378,11 +378,11 @@
+-int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, int /*long*/ aMessage) {
++int OnStatusChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStatus, long /*int*/ aMessage) {
return XPCOM.NS_OK;
}
@@ -1433,25 +1413,12 @@ diff -urN x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/b
+int OnSecurityChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int state) {
return XPCOM.NS_OK;
}
-
--int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {
-+int OnStateChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) {
- if ((aStateFlags & nsIWebProgressListener.STATE_STOP) != 0) {
- cancelable = null;
- if (shell != null && !shell.isDisposed ()) shell.dispose ();
-@@ -391,7 +391,7 @@
- return XPCOM.NS_OK;
- }
-
--int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, int /*long*/ aMessage) {
-+int OnStatusChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStatus, long /*int*/ aMessage) {
- return XPCOM.NS_OK;
- }
}
-diff -urN x86/org/eclipse/swt/browser/DownloadFactory_1_8.java x86_64/org/eclipse/swt/browser/DownloadFactory_1_8.java
---- x86/org/eclipse/swt/browser/DownloadFactory_1_8.java 2007-08-01 15:57:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/DownloadFactory_1_8.java 2009-09-17 08:48:20.000000000 -0400
-@@ -30,17 +30,17 @@
+diff --git a/org/eclipse/swt/browser/DownloadFactory.java b/org/eclipse/swt/browser/DownloadFactory.java
+index 901786c..a0e2f21 100644
+--- a/org/eclipse/swt/browser/DownloadFactory.java
++++ b/org/eclipse/swt/browser/DownloadFactory.java
+@@ -30,17 +30,17 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -1477,7 +1444,7 @@ diff -urN x86/org/eclipse/swt/browser/DownloadFactory_1_8.java x86_64/org/eclips
};
}
-@@ -55,27 +55,27 @@
+@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
}
}
@@ -1510,23 +1477,24 @@ diff -urN x86/org/eclipse/swt/browser/DownloadFactory_1_8.java x86_64/org/eclips
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -87,10 +87,10 @@
-
+@@ -87,10 +87,10 @@ int Release () {
+
/* nsIFactory */
-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
- Download_1_8 download = new Download_1_8 ();
+ Download download = new Download ();
download.AddRef ();
- XPCOM.memmove (result, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (result, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF);
return XPCOM.NS_OK;
}
-diff -urN x86/org/eclipse/swt/browser/DownloadFactory.java x86_64/org/eclipse/swt/browser/DownloadFactory.java
---- x86/org/eclipse/swt/browser/DownloadFactory.java 2007-08-01 15:57:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/DownloadFactory.java 2009-09-17 08:48:20.000000000 -0400
-@@ -30,17 +30,17 @@
+diff --git a/org/eclipse/swt/browser/DownloadFactory_1_8.java b/org/eclipse/swt/browser/DownloadFactory_1_8.java
+index 1af0069..a6bf534 100644
+--- a/org/eclipse/swt/browser/DownloadFactory_1_8.java
++++ b/org/eclipse/swt/browser/DownloadFactory_1_8.java
+@@ -30,17 +30,17 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -1552,7 +1520,7 @@ diff -urN x86/org/eclipse/swt/browser/DownloadFactory.java x86_64/org/eclipse/sw
};
}
-@@ -55,27 +55,27 @@
+@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
}
}
@@ -1585,23 +1553,24 @@ diff -urN x86/org/eclipse/swt/browser/DownloadFactory.java x86_64/org/eclipse/sw
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -87,10 +87,10 @@
-
+@@ -87,10 +87,10 @@ int Release () {
+
/* nsIFactory */
-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
- Download download = new Download ();
+ Download_1_8 download = new Download_1_8 ();
download.AddRef ();
- XPCOM.memmove (result, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (result, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF);
return XPCOM.NS_OK;
}
-diff -urN x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/browser/Download.java
---- x86/org/eclipse/swt/browser/Download.java 2008-08-21 15:41:30.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/Download.java 2009-09-17 08:48:20.000000000 -0400
-@@ -46,63 +46,63 @@
+diff --git a/org/eclipse/swt/browser/Download_1_8.java b/org/eclipse/swt/browser/Download_1_8.java
+index 82819f1..82ea408 100644
+--- a/org/eclipse/swt/browser/Download_1_8.java
++++ b/org/eclipse/swt/browser/Download_1_8.java
+@@ -48,97 +48,97 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -1612,87 +1581,131 @@ diff -urN x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/brows
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
-
- download = new XPCOMObject (new int[] {2, 0, 0, 7, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1}) {
+
+ download = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3, is32 ? 10 : 6, is32 ? 8 : 7, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-- public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
-- public int /*long*/ method4 (int /*long*/[] args) {return GetSource (args[0]);}
-- public int /*long*/ method5 (int /*long*/[] args) {return GetTarget (args[0]);}
-- public int /*long*/ method6 (int /*long*/[] args) {return GetPersist (args[0]);}
-- public int /*long*/ method7 (int /*long*/[] args) {return GetPercentComplete (args[0]);}
-- public int /*long*/ method8 (int /*long*/[] args) {return GetDisplayName (args[0]);}
-- public int /*long*/ method9 (int /*long*/[] args) {return SetDisplayName (args[0]);}
-- public int /*long*/ method10 (int /*long*/[] args) {return GetStartTime (args[0]);}
-- public int /*long*/ method11 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}
-- public int /*long*/ method12 (int /*long*/[] args) {return GetListener (args[0]);}
-- public int /*long*/ method13 (int /*long*/[] args) {return SetListener (args[0]);}
-- public int /*long*/ method14 (int /*long*/[] args) {return GetObserver (args[0]);}
-- public int /*long*/ method15 (int /*long*/[] args) {return SetObserver (args[0]);}
+- public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
+- public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
+- public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
+- public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
+- public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
+- public int /*long*/ method8 (int /*long*/[] args) {
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
-+ public long /*int*/ method3 (long /*int*/[] args) {return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
-+ public long /*int*/ method4 (long /*int*/[] args) {return GetSource (args[0]);}
-+ public long /*int*/ method5 (long /*int*/[] args) {return GetTarget (args[0]);}
-+ public long /*int*/ method6 (long /*int*/[] args) {return GetPersist (args[0]);}
-+ public long /*int*/ method7 (long /*int*/[] args) {return GetPercentComplete (args[0]);}
-+ public long /*int*/ method8 (long /*int*/[] args) {return GetDisplayName (args[0]);}
-+ public long /*int*/ method9 (long /*int*/[] args) {return SetDisplayName (args[0]);}
-+ public long /*int*/ method10 (long /*int*/[] args) {return GetStartTime (args[0]);}
-+ public long /*int*/ method11 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}
-+ public long /*int*/ method12 (long /*int*/[] args) {return GetListener (args[0]);}
-+ public long /*int*/ method13 (long /*int*/[] args) {return SetListener (args[0]);}
-+ public long /*int*/ method14 (long /*int*/[] args) {return GetObserver (args[0]);}
-+ public long /*int*/ method15 (long /*int*/[] args) {return SetObserver (args[0]);}
++ public long /*int*/ method3 (long /*int*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
++ public long /*int*/ method4 (long /*int*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
++ public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
++ public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
++ public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
++ public long /*int*/ method8 (long /*int*/[] args) {
+ if (args.length == 10) {
+ return OnProgressChange64_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9]);
+ } else {
+ return OnProgressChange64 (args[0], args[1], args[2], args[3], args[4], args[5]);
+ }
+ }
+- public int /*long*/ method9 (int /*long*/[] args) {
++ public long /*int*/ method9 (long /*int*/[] args) {
+ if (args.length == 8) {
+ return Init_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
+ } else {
+ return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);
+ }
+ }
+- public int /*long*/ method10 (int /*long*/[] args) {return GetTargetFile (args[0]);}
+- public int /*long*/ method11 (int /*long*/[] args) {return GetPercentComplete (args[0]);}
+- public int /*long*/ method12 (int /*long*/[] args) {return GetAmountTransferred (args[0]);}
+- public int /*long*/ method13 (int /*long*/[] args) {return GetSize (args[0]);}
+- public int /*long*/ method14 (int /*long*/[] args) {return GetSource (args[0]);}
+- public int /*long*/ method15 (int /*long*/[] args) {return GetTarget (args[0]);}
+- public int /*long*/ method16 (int /*long*/[] args) {return GetCancelable (args[0]);}
+- public int /*long*/ method17 (int /*long*/[] args) {return GetDisplayName (args[0]);}
+- public int /*long*/ method18 (int /*long*/[] args) {return GetStartTime (args[0]);}
+- public int /*long*/ method19 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}
++ public long /*int*/ method10 (long /*int*/[] args) {return GetTargetFile (args[0]);}
++ public long /*int*/ method11 (long /*int*/[] args) {return GetPercentComplete (args[0]);}
++ public long /*int*/ method12 (long /*int*/[] args) {return GetAmountTransferred (args[0]);}
++ public long /*int*/ method13 (long /*int*/[] args) {return GetSize (args[0]);}
++ public long /*int*/ method14 (long /*int*/[] args) {return GetSource (args[0]);}
++ public long /*int*/ method15 (long /*int*/[] args) {return GetTarget (args[0]);}
++ public long /*int*/ method16 (long /*int*/[] args) {return GetCancelable (args[0]);}
++ public long /*int*/ method17 (long /*int*/[] args) {return GetDisplayName (args[0]);}
++ public long /*int*/ method18 (long /*int*/[] args) {return GetStartTime (args[0]);}
++ public long /*int*/ method19 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}
};
-
- progressDialog = new XPCOMObject (new int[] {2, 0, 0, 7, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) {
+
+ progressDialog = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3, is32 ? 10 : 6, is32 ? 8 : 7, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-- public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
-- public int /*long*/ method4 (int /*long*/[] args) {return GetSource (args[0]);}
-- public int /*long*/ method5 (int /*long*/[] args) {return GetTarget (args[0]);}
-- public int /*long*/ method6 (int /*long*/[] args) {return GetPersist (args[0]);}
-- public int /*long*/ method7 (int /*long*/[] args) {return GetPercentComplete (args[0]);}
-- public int /*long*/ method8 (int /*long*/[] args) {return GetDisplayName (args[0]);}
-- public int /*long*/ method9 (int /*long*/[] args) {return SetDisplayName (args[0]);}
-- public int /*long*/ method10 (int /*long*/[] args) {return GetStartTime (args[0]);}
-- public int /*long*/ method11 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}
-- public int /*long*/ method12 (int /*long*/[] args) {return GetListener (args[0]);}
-- public int /*long*/ method13 (int /*long*/[] args) {return SetListener (args[0]);}
-- public int /*long*/ method14 (int /*long*/[] args) {return GetObserver (args[0]);}
-- public int /*long*/ method15 (int /*long*/[] args) {return SetObserver (args[0]);}
-- public int /*long*/ method16 (int /*long*/[] args) {return Open (args[0]);}
-- public int /*long*/ method17 (int /*long*/[] args) {return GetCancelDownloadOnClose (args[0]);}
-- public int /*long*/ method18 (int /*long*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}
-- public int /*long*/ method19 (int /*long*/[] args) {return GetDialog (args[0]);}
-- public int /*long*/ method20 (int /*long*/[] args) {return SetDialog (args[0]);}
+- public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
+- public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
+- public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
+- public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
+- public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
+- public int /*long*/ method8 (int /*long*/[] args) {
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
-+ public long /*int*/ method3 (long /*int*/[] args) {return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
-+ public long /*int*/ method4 (long /*int*/[] args) {return GetSource (args[0]);}
-+ public long /*int*/ method5 (long /*int*/[] args) {return GetTarget (args[0]);}
-+ public long /*int*/ method6 (long /*int*/[] args) {return GetPersist (args[0]);}
-+ public long /*int*/ method7 (long /*int*/[] args) {return GetPercentComplete (args[0]);}
-+ public long /*int*/ method8 (long /*int*/[] args) {return GetDisplayName (args[0]);}
-+ public long /*int*/ method9 (long /*int*/[] args) {return SetDisplayName (args[0]);}
-+ public long /*int*/ method10 (long /*int*/[] args) {return GetStartTime (args[0]);}
-+ public long /*int*/ method11 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}
-+ public long /*int*/ method12 (long /*int*/[] args) {return GetListener (args[0]);}
-+ public long /*int*/ method13 (long /*int*/[] args) {return SetListener (args[0]);}
-+ public long /*int*/ method14 (long /*int*/[] args) {return GetObserver (args[0]);}
-+ public long /*int*/ method15 (long /*int*/[] args) {return SetObserver (args[0]);}
-+ public long /*int*/ method16 (long /*int*/[] args) {return Open (args[0]);}
-+ public long /*int*/ method17 (long /*int*/[] args) {return GetCancelDownloadOnClose (args[0]);}
-+ public long /*int*/ method18 (long /*int*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}
-+ public long /*int*/ method19 (long /*int*/[] args) {return GetDialog (args[0]);}
-+ public long /*int*/ method20 (long /*int*/[] args) {return SetDialog (args[0]);}
++ public long /*int*/ method3 (long /*int*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
++ public long /*int*/ method4 (long /*int*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
++ public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
++ public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
++ public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
++ public long /*int*/ method8 (long /*int*/[] args) {
+ if (args.length == 10) {
+ return OnProgressChange64_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9]);
+ } else {
+ return OnProgressChange64 (args[0], args[1], args[2], args[3], args[4], args[5]);
+ }
+ }
+- public int /*long*/ method9 (int /*long*/[] args) {
++ public long /*int*/ method9 (long /*int*/[] args) {
+ if (args.length == 8) {
+ return Init_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
+ } else {
+ return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);
+ }
+ }
+- public int /*long*/ method10 (int /*long*/[] args) {return GetTargetFile (args[0]);}
+- public int /*long*/ method11 (int /*long*/[] args) {return GetPercentComplete (args[0]);}
+- public int /*long*/ method12 (int /*long*/[] args) {return GetAmountTransferred (args[0]);}
+- public int /*long*/ method13 (int /*long*/[] args) {return GetSize (args[0]);}
+- public int /*long*/ method14 (int /*long*/[] args) {return GetSource (args[0]);}
+- public int /*long*/ method15 (int /*long*/[] args) {return GetTarget (args[0]);}
+- public int /*long*/ method16 (int /*long*/[] args) {return GetCancelable (args[0]);}
+- public int /*long*/ method17 (int /*long*/[] args) {return GetDisplayName (args[0]);}
+- public int /*long*/ method18 (int /*long*/[] args) {return GetStartTime (args[0]);}
+- public int /*long*/ method19 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}
+- public int /*long*/ method20 (int /*long*/[] args) {return Open (args[0]);}
+- public int /*long*/ method21 (int /*long*/[] args) {return GetCancelDownloadOnClose (args[0]);}
+- public int /*long*/ method22 (int /*long*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}
+- public int /*long*/ method23 (int /*long*/[] args) {return GetObserver (args[0]);}
+- public int /*long*/ method24 (int /*long*/[] args) {return SetObserver (args[0]);}
+- public int /*long*/ method25 (int /*long*/[] args) {return GetDialog (args[0]);}
+- public int /*long*/ method26 (int /*long*/[] args) {return SetDialog (args[0]);}
++ public long /*int*/ method10 (long /*int*/[] args) {return GetTargetFile (args[0]);}
++ public long /*int*/ method11 (long /*int*/[] args) {return GetPercentComplete (args[0]);}
++ public long /*int*/ method12 (long /*int*/[] args) {return GetAmountTransferred (args[0]);}
++ public long /*int*/ method13 (long /*int*/[] args) {return GetSize (args[0]);}
++ public long /*int*/ method14 (long /*int*/[] args) {return GetSource (args[0]);}
++ public long /*int*/ method15 (long /*int*/[] args) {return GetTarget (args[0]);}
++ public long /*int*/ method16 (long /*int*/[] args) {return GetCancelable (args[0]);}
++ public long /*int*/ method17 (long /*int*/[] args) {return GetDisplayName (args[0]);}
++ public long /*int*/ method18 (long /*int*/[] args) {return GetStartTime (args[0]);}
++ public long /*int*/ method19 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}
++ public long /*int*/ method20 (long /*int*/[] args) {return Open (args[0]);}
++ public long /*int*/ method21 (long /*int*/[] args) {return GetCancelDownloadOnClose (args[0]);}
++ public long /*int*/ method22 (long /*int*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}
++ public long /*int*/ method23 (long /*int*/[] args) {return GetObserver (args[0]);}
++ public long /*int*/ method24 (long /*int*/[] args) {return SetObserver (args[0]);}
++ public long /*int*/ method25 (long /*int*/[] args) {return GetDialog (args[0]);}
++ public long /*int*/ method26 (long /*int*/[] args) {return SetDialog (args[0]);}
};
-
+
webProgressListener = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
@@ -1713,7 +1726,7 @@ diff -urN x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/brows
};
}
-@@ -125,36 +125,36 @@
+@@ -161,36 +161,36 @@ void disposeCOMInterfaces() {
}
}
@@ -1734,13 +1747,13 @@ diff -urN x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/brows
AddRef();
return XPCOM.NS_OK;
}
- if (guid.Equals (nsIDownload.NS_IDOWNLOAD_IID)) {
+ if (guid.Equals (nsIDownload_1_8.NS_IDOWNLOAD_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF);
AddRef();
return XPCOM.NS_OK;
}
- if (guid.Equals (nsIProgressDialog.NS_IPROGRESSDIALOG_IID)) {
+ if (guid.Equals (nsIProgressDialog_1_8.NS_IPROGRESSDIALOG_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF);
AddRef();
@@ -1756,64 +1769,60 @@ diff -urN x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/brows
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-
-@@ -167,13 +167,13 @@
+
+@@ -203,26 +203,26 @@ int Release () {
/* nsIDownload */
/* Note. The argument startTime is defined as a PRInt64. This translates into two java ints. */
--int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, int /*long*/ startTime1, int /*long*/ startTime2, int /*long*/ aPersist) {
-+int Init (long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long /*int*/ startTime1, long /*int*/ startTime2, long /*int*/ aPersist) {
+-int Init_32 (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, int /*long*/ startTime1, int /*long*/ startTime2, int /*long*/ aTempFile, int /*long*/ aCancelable) {
++int Init_32 (long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long /*int*/ startTime1, long /*int*/ startTime2, long /*int*/ aTempFile, long /*int*/ aCancelable) {
+ long startTime = (startTime2 << 32) + startTime1;
+ return Init (aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aTempFile, aCancelable);
+ }
+
+-int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, long startTime, int /*long*/ aTempFile, int /*long*/ aCancelable) {
++int Init (long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long startTime, long /*int*/ aTempFile, long /*int*/ aCancelable) {
+ cancelable = new nsICancelable (aCancelable);
nsIURI source = new nsIURI (aSource);
- int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
int rc = source.GetHost (aSpec);
- if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (rc != XPCOM.NS_OK) Mozilla.error(rc);
int length = XPCOM.nsEmbedCString_Length (aSpec);
- int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
XPCOM.nsEmbedCString_delete (aSpec);
-@@ -186,12 +186,12 @@
- */
- String filename = null;
- nsISupports supports = new nsISupports (aTarget);
-- int /*long*/[] result = new int /*long*/[1];
-+ long /*int*/[] result = new long /*int*/[1];
- rc = supports.QueryInterface (nsIURI.NS_IURI_IID, result);
- if (rc == XPCOM.NS_OK) { /* >= 1.7 */
- nsIURI target = new nsIURI (result[0]);
- result[0] = 0;
-- int /*long*/ aPath = XPCOM.nsEmbedCString_new ();
-+ long /*int*/ aPath = XPCOM.nsEmbedCString_new ();
- rc = target.GetPath (aPath);
- if (rc != XPCOM.NS_OK) Mozilla.error (rc);
- length = XPCOM.nsEmbedCString_Length (aPath);
-@@ -205,7 +205,7 @@
- target.Release ();
- } else { /* < 1.7 */
- nsILocalFile target = new nsILocalFile (aTarget);
-- int /*long*/ aNativeTarget = XPCOM.nsEmbedCString_new ();
-+ long /*int*/ aNativeTarget = XPCOM.nsEmbedCString_new ();
- rc = target.GetNativeLeafName (aNativeTarget);
- if (rc != XPCOM.NS_OK) Mozilla.error (rc);
- length = XPCOM.nsEmbedCString_Length (aNativeTarget);
-@@ -259,54 +259,54 @@
+ String url = new String (dest);
+
+ nsIURI target = new nsIURI (aTarget);
+- int /*long*/ aPath = XPCOM.nsEmbedCString_new ();
++ long /*int*/ aPath = XPCOM.nsEmbedCString_new ();
+ rc = target.GetPath (aPath);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ length = XPCOM.nsEmbedCString_Length (aPath);
+@@ -277,60 +277,60 @@ int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName,
return XPCOM.NS_OK;
}
--int GetSource (int /*long*/ aSource) {
-+int GetSource (long /*int*/ aSource) {
+-int GetAmountTransferred (int /*long*/ arg0) {
++int GetAmountTransferred (long /*int*/ arg0) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
--int GetTarget (int /*long*/ aTarget) {
-+int GetTarget (long /*int*/ aTarget) {
+-int GetCancelable (int /*long*/ arg0) {
++int GetCancelable (long /*int*/ arg0) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
--int GetPersist (int /*long*/ aPersist) {
-+int GetPersist (long /*int*/ aPersist) {
+-int GetDisplayName (int /*long*/ aDisplayName) {
++int GetDisplayName (long /*int*/ aDisplayName) {
+ return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
+ }
+
+-int GetMIMEInfo (int /*long*/ aMIMEInfo) {
++int GetMIMEInfo (long /*int*/ aMIMEInfo) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
@@ -1822,13 +1831,13 @@ diff -urN x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/brows
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
--int GetDisplayName (int /*long*/ aDisplayName) {
-+int GetDisplayName (long /*int*/ aDisplayName) {
+-int GetSize (int /*long*/ arg0) {
++int GetSize (long /*int*/ arg0) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
--int SetDisplayName (int /*long*/ aDisplayName) {
-+int SetDisplayName (long /*int*/ aDisplayName) {
+-int GetSource (int /*long*/ aSource) {
++int GetSource (long /*int*/ aSource) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
@@ -1837,90 +1846,79 @@ diff -urN x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/brows
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
--int GetMIMEInfo (int /*long*/ aMIMEInfo) {
-+int GetMIMEInfo (long /*int*/ aMIMEInfo) {
+-int GetTarget (int /*long*/ aTarget) {
++int GetTarget (long /*int*/ aTarget) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
--int GetListener (int /*long*/ aListener) {
-+int GetListener (long /*int*/ aListener) {
+-int GetTargetFile (int /*long*/ arg0) {
++int GetTargetFile (long /*int*/ arg0) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
--int SetListener (int /*long*/ aListener) {
-+int SetListener (long /*int*/ aListener) {
+ /* nsIProgressDialog */
+-int GetCancelDownloadOnClose (int /*long*/ aCancelDownloadOnClose) {
++int GetCancelDownloadOnClose (long /*int*/ aCancelDownloadOnClose) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
--int GetObserver (int /*long*/ aObserver) {
-+int GetObserver (long /*int*/ aObserver) {
+-int GetDialog (int /*long*/ aDialog) {
++int GetDialog (long /*int*/ aDialog) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
--int SetObserver (int /*long*/ aObserver) {
-+int SetObserver (long /*int*/ aObserver) {
- if (aObserver != 0) {
- nsISupports supports = new nsISupports (aObserver);
-- int /*long*/[] result = new int /*long*/[1];
-+ long /*int*/[] result = new long /*int*/[1];
- int rc = supports.QueryInterface (nsIHelperAppLauncher.NS_IHELPERAPPLAUNCHER_IID, result);
- if (rc != XPCOM.NS_OK) Mozilla.error (rc);
- if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -316,11 +316,11 @@
+-int GetObserver (int /*long*/ aObserver) {
++int GetObserver (long /*int*/ aObserver) {
+ return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
- /* nsIProgressDialog */
-int Open (int /*long*/ aParent) {
+int Open (long /*int*/ aParent) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
--int GetCancelDownloadOnClose (int /*long*/ aCancelDownloadOnClose) {
-+int GetCancelDownloadOnClose (long /*int*/ aCancelDownloadOnClose) {
+@@ -338,26 +338,26 @@ int SetCancelDownloadOnClose (int aCancelDownloadOnClose) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-@@ -328,17 +328,17 @@
- return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
- }
-
--int GetDialog (int /*long*/ aDialog) {
-+int GetDialog (long /*int*/ aDialog) {
+-int SetDialog (int /*long*/ aDialog) {
++int SetDialog (long /*int*/ aDialog) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
--int SetDialog (int /*long*/ aDialog) {
-+int SetDialog (long /*int*/ aDialog) {
+-int SetObserver (int /*long*/ aObserver) {
++int SetObserver (long /*int*/ aObserver) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
/* nsIWebProgressListener */
--int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {
-+int OnStateChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) {
- if ((aStateFlags & nsIWebProgressListener.STATE_STOP) != 0) {
- if (helperAppLauncher != null) helperAppLauncher.Release ();
- helperAppLauncher = null;
-@@ -348,7 +348,7 @@
+-int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aLocation) {
++int OnLocationChange (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aLocation) {
return XPCOM.NS_OK;
}
-int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
+int OnProgressChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
- int currentKBytes = aCurTotalProgress / 1024;
- int totalKBytes = aMaxTotalProgress / 1024;
- if (shell != null && !shell.isDisposed ()) {
-@@ -361,15 +361,15 @@
- return XPCOM.NS_OK;
+ return OnProgressChange64 (aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
}
--int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aLocation) {
-+int OnLocationChange (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aLocation) {
- return XPCOM.NS_OK;
+ /* Note. The last 4 args in the original interface are defined as PRInt64. These each translate into two java ints. */
+-int OnProgressChange64_32 (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aCurSelfProgress1, int /*long*/ aCurSelfProgress2, int /*long*/ aMaxSelfProgress1, int /*long*/ aMaxSelfProgress2, int /*long*/ aCurTotalProgress1, int /*long*/ aCurTotalProgress2, int /*long*/ aMaxTotalProgress1, int /*long*/ aMaxTotalProgress2) {
++int OnProgressChange64_32 (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aCurSelfProgress1, long /*int*/ aCurSelfProgress2, long /*int*/ aMaxSelfProgress1, long /*int*/ aMaxSelfProgress2, long /*int*/ aCurTotalProgress1, long /*int*/ aCurTotalProgress2, long /*int*/ aMaxTotalProgress1, long /*int*/ aMaxTotalProgress2) {
+ long aCurSelfProgress = (aCurSelfProgress2 << 32) + aCurSelfProgress1;
+ long aMaxSelfProgress = (aMaxSelfProgress2 << 32) + aMaxSelfProgress1;
+ long aCurTotalProgress = (aCurTotalProgress2 << 32) + aCurTotalProgress1;
+@@ -365,7 +365,7 @@ int OnProgressChange64_32 (int /*long*/ aWebProgress, int /*long*/ aRequest, int
+ return OnProgressChange64 (aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
}
--int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, int /*long*/ aMessage) {
-+int OnStatusChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStatus, long /*int*/ aMessage) {
+-int OnProgressChange64 (int /*long*/ aWebProgress, int /*long*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) {
++int OnProgressChange64 (long /*int*/ aWebProgress, long /*int*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) {
+ long currentKBytes = aCurTotalProgress / 1024;
+ long totalKBytes = aMaxTotalProgress / 1024;
+ if (shell != null && !shell.isDisposed ()) {
+@@ -378,11 +378,11 @@ int OnProgressChange64 (int /*long*/ aWebProgress, int /*long*/ aRequest, long a
return XPCOM.NS_OK;
}
@@ -1928,86 +1926,26 @@ diff -urN x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/brows
+int OnSecurityChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int state) {
return XPCOM.NS_OK;
}
- }
-diff -urN x86/org/eclipse/swt/browser/ExternalFactory.java x86_64/org/eclipse/swt/browser/ExternalFactory.java
---- x86/org/eclipse/swt/browser/ExternalFactory.java 2008-12-02 11:18:46.000000000 -0500
-+++ x86_64/org/eclipse/swt/browser/ExternalFactory.java 2009-09-17 08:48:20.000000000 -0400
-@@ -30,17 +30,17 @@
- void createCOMInterfaces () {
- /* Create each of the interfaces that this object implements */
- supports = new XPCOMObject (new int[] {2, 0, 0}) {
-- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
-+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
-+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
- };
-
- factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
-- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-- public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
-- public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
-+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
-+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
-+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
-+ public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
-+ public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
- };
- }
-
-@@ -55,27 +55,27 @@
- }
- }
-
--int /*long*/ getAddress () {
-+long /*int*/ getAddress () {
- return factory.getAddress ();
- }
-
--int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
-+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
- if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
- nsID guid = new nsID ();
- XPCOM.memmove (guid, riid, nsID.sizeof);
-
- if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
-- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
- AddRef ();
- return XPCOM.NS_OK;
- }
- if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {
-- XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
-+ XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
- AddRef ();
- return XPCOM.NS_OK;
- }
-- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
-+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
- return XPCOM.NS_ERROR_NO_INTERFACE;
- }
-
-@@ -87,10 +87,10 @@
-
- /* nsIFactory */
+-int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {
++int OnStateChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) {
+ if ((aStateFlags & nsIWebProgressListener.STATE_STOP) != 0) {
+ cancelable = null;
+ if (shell != null && !shell.isDisposed ()) shell.dispose ();
+@@ -391,7 +391,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+ return XPCOM.NS_OK;
+ }
--int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
-+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
- External external = new External ();
- external.AddRef ();
-- XPCOM.memmove (result, new int /*long*/[] {external.getAddress ()}, C.PTR_SIZEOF);
-+ XPCOM.memmove (result, new long /*int*/[] {external.getAddress ()}, C.PTR_SIZEOF);
+-int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, int /*long*/ aMessage) {
++int OnStatusChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStatus, long /*int*/ aMessage) {
return XPCOM.NS_OK;
+ }
}
-
-diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/browser/External.java
---- x86/org/eclipse/swt/browser/External.java 2009-05-29 17:30:22.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/External.java 2009-09-17 08:48:20.000000000 -0400
-@@ -39,40 +39,40 @@
+diff --git a/org/eclipse/swt/browser/External.java b/org/eclipse/swt/browser/External.java
+index 53ed58f..76141a7 100644
+--- a/org/eclipse/swt/browser/External.java
++++ b/org/eclipse/swt/browser/External.java
+@@ -39,40 +39,40 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -2073,7 +2011,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
};
}
-@@ -88,37 +88,37 @@
+@@ -88,37 +88,37 @@ void disposeCOMInterfaces () {
}
}
@@ -2118,7 +2056,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -130,8 +130,8 @@
+@@ -130,8 +130,8 @@ int Release () {
/* nsIClassInfo */
@@ -2129,7 +2067,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-@@ -147,44 +147,44 @@
+@@ -147,44 +147,44 @@ int getClassDescription (int /*long*/ _retValue) {
nsIMemory memory = new nsIMemory (result[0]);
result[0] = 0;
byte[] bytes = MozillaDelegate.wcsToMbcs (null, "external", true); //$NON-NLS-1$
@@ -2185,7 +2123,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-@@ -199,14 +199,14 @@
+@@ -199,14 +199,14 @@ int getInterfaces (int /*long*/ count, int /*long*/ array) {
nsIMemory memory = new nsIMemory (result[0]);
result[0] = 0;
@@ -2206,7 +2144,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
memory.Release ();
C.memmove (count, new int[] {2}, 4); /* PRUint */
-@@ -215,8 +215,8 @@
+@@ -215,8 +215,8 @@ int getInterfaces (int /*long*/ count, int /*long*/ array) {
/* nsISecurityCheckedComponent */
@@ -2217,7 +2155,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-@@ -232,16 +232,16 @@
+@@ -232,16 +232,16 @@ int canCreateWrapper (int /*long*/ iid, int /*long*/ _retVal) {
nsIMemory memory = new nsIMemory (result[0]);
result[0] = 0;
byte[] bytes = MozillaDelegate.wcsToMbcs (null, "allAccess", true); //$NON-NLS-1$
@@ -2238,7 +2176,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-@@ -266,16 +266,16 @@
+@@ -266,16 +266,16 @@ int canCallMethod (int /*long*/ iid, int /*long*/ methodName, int /*long*/ _retV
} else {
bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$
}
@@ -2259,7 +2197,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-@@ -291,16 +291,16 @@
+@@ -291,16 +291,16 @@ int canGetProperty (int /*long*/ iid, int /*long*/ propertyName, int /*long*/ _r
nsIMemory memory = new nsIMemory (result[0]);
result[0] = 0;
byte[] bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$
@@ -2280,7 +2218,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-@@ -316,9 +316,9 @@
+@@ -316,9 +316,9 @@ int canSetProperty (int /*long*/ iid, int /*long*/ propertyName, int /*long*/ _r
nsIMemory memory = new nsIMemory (result[0]);
result[0] = 0;
byte[] bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$
@@ -2292,7 +2230,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
memory.Release ();
return XPCOM.NS_OK;
-@@ -344,7 +344,7 @@
+@@ -344,7 +344,7 @@ Object convertToJava (nsIVariant variant, short type) {
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
return new Double (intResult[0]);
case nsIDataType.VTYPE_DOUBLE:
@@ -2301,7 +2239,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
rc = variant.GetAsDouble (doubleReturn);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
double[] doubleResult = new double[1];
-@@ -353,7 +353,7 @@
+@@ -353,7 +353,7 @@ Object convertToJava (nsIVariant variant, short type) {
return new Double (doubleResult[0]);
case nsIDataType.VTYPE_WSTRING_SIZE_IS:
int[] size = new int[1]; /* PRInt32 */
@@ -2310,7 +2248,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
rc = variant.GetAsWStringWithSize (size, wString);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
char[] chars = new char[size[0]];
-@@ -361,11 +361,11 @@
+@@ -361,11 +361,11 @@ Object convertToJava (nsIVariant variant, short type) {
return new String (chars);
case nsIDataType.VTYPE_ARRAY:
Object[] arrayReturn = new Object[0];
@@ -2324,7 +2262,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
rc = variant.GetAsArray (currentType, iid, count, ptr);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (ptr[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
-@@ -373,7 +373,7 @@
+@@ -373,7 +373,7 @@ Object convertToJava (nsIVariant variant, short type) {
XPCOM.memmove (id, iid, nsID.sizeof);
C.free (iid);
@@ -2333,7 +2271,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-@@ -392,7 +392,7 @@
+@@ -392,7 +392,7 @@ Object convertToJava (nsIVariant variant, short type) {
if (id.Equals (nsIVariant.NS_IVARIANT_IID)) {
arrayReturn = new Object[count[0]];
for (int i = 0; i < count[0]; i++) {
@@ -2342,7 +2280,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
C.memmove (arrayPtr, ptr[0] + i * C.PTR_SIZEOF, C.PTR_SIZEOF);
nsISupports supports = new nsISupports (arrayPtr[0]);
rc = supports.QueryInterface (nsIVariant.NS_IVARIANT_IID, result);
-@@ -444,8 +444,8 @@
+@@ -444,8 +444,8 @@ Object convertToJava (nsIVariant variant, short type) {
case nsIDataType.VTYPE_WCHAR_STR:
arrayReturn = new Object[count[0]];
for (int i = 0; i < count[0]; i++) {
@@ -2353,7 +2291,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
C.memmove (stringPtr, currentPtr, C.PTR_SIZEOF);
int length = XPCOM.strlen_PRUnichar (stringPtr[0]);
char[] dest = new char[length];
-@@ -468,7 +468,7 @@
+@@ -468,7 +468,7 @@ Object convertToJava (nsIVariant variant, short type) {
}
nsIVariant convertToJS (Object value, nsIComponentManager componentManager) {
@@ -2362,7 +2300,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_VARIANT_CONTRACTID, true);
int rc = componentManager.CreateInstanceByContractID (aContractID, 0, nsIWritableVariant.NS_IWRITABLEVARIANT_IID, result);
nsIWritableVariant variant = new nsIWritableVariant (result[0]);
-@@ -504,26 +504,26 @@
+@@ -504,26 +504,26 @@ nsIVariant convertToJS (Object value, nsIComponentManager componentManager) {
Object[] arrayValue = (Object[])value;
int length = arrayValue.length;
if (length > 0) {
@@ -2393,7 +2331,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
XPCOM.memmove (idPtr, nsIVariant.NS_IVARIANT_IID, nsID.sizeof);
rc = variant.SetAsArray (nsIDataType.VTYPE_INTERFACE_IS, idPtr, length, arrayPtr);
C.free (idPtr);
-@@ -538,7 +538,7 @@
+@@ -538,7 +538,7 @@ nsIVariant convertToJS (Object value, nsIComponentManager componentManager) {
return null;
}
@@ -2402,7 +2340,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
Object key = new Integer (functionId);
BrowserFunction function = (BrowserFunction)Mozilla.AllFunctions.get (key);
Object returnValue = null;
-@@ -569,7 +569,7 @@
+@@ -569,7 +569,7 @@ int callJava (int functionId, int /*long*/ args, int /*long*/ returnPtr) {
}
}
@@ -2411,7 +2349,7 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
int rc = XPCOM.NS_GetComponentManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-@@ -583,7 +583,7 @@
+@@ -583,7 +583,7 @@ int callJava (int functionId, int /*long*/ args, int /*long*/ returnPtr) {
variant = convertToJS (WebBrowser.CreateErrorString (e.getLocalizedMessage ()), componentManager);
}
componentManager.Release ();
@@ -2420,118 +2358,11 @@ diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/brows
return XPCOM.NS_OK;
}
-diff -urN x86/org/eclipse/swt/browser/FilePicker_1_8.java x86_64/org/eclipse/swt/browser/FilePicker_1_8.java
---- x86/org/eclipse/swt/browser/FilePicker_1_8.java 2007-08-01 15:57:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/FilePicker_1_8.java 2009-09-17 08:48:20.000000000 -0400
-@@ -17,30 +17,30 @@
- void createCOMInterfaces () {
- /* Create each of the interfaces that this object implements */
- supports = new XPCOMObject (new int[] {2, 0, 0}) {
-- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
-+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
-+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
- };
-
- filePicker = new XPCOMObject (new int[] {2, 0, 0, 3, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) {
-- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-- public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], (short)args[2]);}
-- public int /*long*/ method4 (int /*long*/[] args) {return AppendFilters ((int)/*64*/args[0]);}
-- public int /*long*/ method5 (int /*long*/[] args) {return AppendFilter (args[0], args[1]);}
-- public int /*long*/ method6 (int /*long*/[] args) {return GetDefaultString (args[0]);}
-- public int /*long*/ method7 (int /*long*/[] args) {return SetDefaultString (args[0]);}
-- public int /*long*/ method8 (int /*long*/[] args) {return GetDefaultExtension (args[0]);}
-- public int /*long*/ method9 (int /*long*/[] args) {return SetDefaultExtension (args[0]);}
-- public int /*long*/ method10 (int /*long*/[] args) {return GetFilterIndex (args[0]);}
-- public int /*long*/ method11 (int /*long*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}
-- public int /*long*/ method12 (int /*long*/[] args) {return GetDisplayDirectory (args[0]);}
-- public int /*long*/ method13 (int /*long*/[] args) {return SetDisplayDirectory (args[0]);}
-- public int /*long*/ method14 (int /*long*/[] args) {return GetFile (args[0]);}
-- public int /*long*/ method15 (int /*long*/[] args) {return GetFileURL (args[0]);}
-- public int /*long*/ method16 (int /*long*/[] args) {return GetFiles (args[0]);}
-- public int /*long*/ method17 (int /*long*/[] args) {return Show (args[0]);}
-+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
-+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
-+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
-+ public long /*int*/ method3 (long /*int*/[] args) {return Init (args[0], args[1], (short)args[2]);}
-+ public long /*int*/ method4 (long /*int*/[] args) {return AppendFilters ((int)/*64*/args[0]);}
-+ public long /*int*/ method5 (long /*int*/[] args) {return AppendFilter (args[0], args[1]);}
-+ public long /*int*/ method6 (long /*int*/[] args) {return GetDefaultString (args[0]);}
-+ public long /*int*/ method7 (long /*int*/[] args) {return SetDefaultString (args[0]);}
-+ public long /*int*/ method8 (long /*int*/[] args) {return GetDefaultExtension (args[0]);}
-+ public long /*int*/ method9 (long /*int*/[] args) {return SetDefaultExtension (args[0]);}
-+ public long /*int*/ method10 (long /*int*/[] args) {return GetFilterIndex (args[0]);}
-+ public long /*int*/ method11 (long /*int*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}
-+ public long /*int*/ method12 (long /*int*/[] args) {return GetDisplayDirectory (args[0]);}
-+ public long /*int*/ method13 (long /*int*/[] args) {return SetDisplayDirectory (args[0]);}
-+ public long /*int*/ method14 (long /*int*/[] args) {return GetFile (args[0]);}
-+ public long /*int*/ method15 (long /*int*/[] args) {return GetFileURL (args[0]);}
-+ public long /*int*/ method16 (long /*int*/[] args) {return GetFiles (args[0]);}
-+ public long /*int*/ method17 (long /*int*/[] args) {return Show (args[0]);}
- };
- }
-
-@@ -49,10 +49,10 @@
- * answers a java string based on the type of string that is appropriate for the Mozilla
- * version being used.
- */
--String parseAString (int /*long*/ string) {
-+String parseAString (long /*int*/ string) {
- if (string == 0) return null;
- int length = XPCOM.nsEmbedString_Length (string);
-- int /*long*/ buffer = XPCOM.nsEmbedString_get (string);
-+ long /*int*/ buffer = XPCOM.nsEmbedString_get (string);
- char[] chars = new char[length];
- XPCOM.memmove (chars, buffer, length * 2);
- return new String (chars);
-diff -urN x86/org/eclipse/swt/browser/FilePickerFactory_1_8.java x86_64/org/eclipse/swt/browser/FilePickerFactory_1_8.java
---- x86/org/eclipse/swt/browser/FilePickerFactory_1_8.java 2007-08-01 15:57:26.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/FilePickerFactory_1_8.java 2009-09-17 08:48:20.000000000 -0400
-@@ -18,26 +18,26 @@
- void createCOMInterfaces () {
- /* Create each of the interfaces that this object implements */
- supports = new XPCOMObject (new int[] {2, 0, 0}) {
-- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
-+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
-+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
- };
-
- factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
-- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-- public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
-- public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
-+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
-+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
-+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
-+ public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
-+ public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
- };
- }
-
- /* nsIFactory */
-
--int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
-+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
- FilePicker_1_8 picker = new FilePicker_1_8 ();
- picker.AddRef ();
-- XPCOM.memmove (result, new int /*long*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
-+ XPCOM.memmove (result, new long /*int*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
- return XPCOM.NS_OK;
- }
-
-diff -urN x86/org/eclipse/swt/browser/FilePickerFactory.java x86_64/org/eclipse/swt/browser/FilePickerFactory.java
---- x86/org/eclipse/swt/browser/FilePickerFactory.java 2007-08-01 15:57:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/FilePickerFactory.java 2009-09-17 08:48:20.000000000 -0400
-@@ -30,17 +30,17 @@
+diff --git a/org/eclipse/swt/browser/ExternalFactory.java b/org/eclipse/swt/browser/ExternalFactory.java
+index 84462ec..f90ef3d 100644
+--- a/org/eclipse/swt/browser/ExternalFactory.java
++++ b/org/eclipse/swt/browser/ExternalFactory.java
+@@ -30,17 +30,17 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -2557,7 +2388,7 @@ diff -urN x86/org/eclipse/swt/browser/FilePickerFactory.java x86_64/org/eclipse/
};
}
-@@ -55,27 +55,27 @@
+@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
}
}
@@ -2584,29 +2415,30 @@ diff -urN x86/org/eclipse/swt/browser/FilePickerFactory.java x86_64/org/eclipse/
AddRef ();
return XPCOM.NS_OK;
}
-
+
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -87,10 +87,10 @@
-
+@@ -87,10 +87,10 @@ int Release () {
+
/* nsIFactory */
-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
- FilePicker picker = new FilePicker ();
- picker.AddRef ();
-- XPCOM.memmove (result, new int /*long*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
-+ XPCOM.memmove (result, new long /*int*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
+ External external = new External ();
+ external.AddRef ();
+- XPCOM.memmove (result, new int /*long*/[] {external.getAddress ()}, C.PTR_SIZEOF);
++ XPCOM.memmove (result, new long /*int*/[] {external.getAddress ()}, C.PTR_SIZEOF);
return XPCOM.NS_OK;
}
-diff -urN x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/browser/FilePicker.java
---- x86/org/eclipse/swt/browser/FilePicker.java 2008-09-05 12:40:14.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/FilePicker.java 2009-09-17 08:48:20.000000000 -0400
-@@ -21,7 +21,7 @@
+diff --git a/org/eclipse/swt/browser/FilePicker.java b/org/eclipse/swt/browser/FilePicker.java
+index cb7b397..b0f85d9 100644
+--- a/org/eclipse/swt/browser/FilePicker.java
++++ b/org/eclipse/swt/browser/FilePicker.java
+@@ -21,7 +21,7 @@ class FilePicker {
int refCount = 0;
short mode;
@@ -2615,7 +2447,7 @@ diff -urN x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/bro
String[] files, masks;
String defaultFilename, directory, title;
-@@ -39,30 +39,30 @@
+@@ -39,30 +39,30 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -2667,7 +2499,7 @@ diff -urN x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/bro
};
}
-@@ -77,32 +77,32 @@
+@@ -77,32 +77,32 @@ void disposeCOMInterfaces () {
}
}
@@ -2706,7 +2538,7 @@ diff -urN x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/bro
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -112,7 +112,7 @@
+@@ -112,7 +112,7 @@ int Release () {
return refCount;
}
@@ -2715,7 +2547,7 @@ diff -urN x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/bro
if (aDOMWindow == 0) return null;
nsIDOMWindow window = new nsIDOMWindow (aDOMWindow);
return Mozilla.findBrowser (window);
-@@ -123,20 +123,20 @@
+@@ -123,20 +123,20 @@ Browser getBrowser (int /*long*/ aDOMWindow) {
* answers a java string based on the type of string that is appropriate for the Mozilla
* version being used.
*/
@@ -2739,7 +2571,7 @@ diff -urN x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/bro
if (mode == nsIFilePicker.modeGetFolder) {
/* picking a directory */
int result = showDirectoryPicker ();
-@@ -186,20 +186,20 @@
+@@ -186,20 +186,20 @@ int showDirectoryPicker () {
return directory == null ? nsIFilePicker.returnCancel : nsIFilePicker.returnOK;
}
@@ -2764,7 +2596,7 @@ diff -urN x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/bro
int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, file);
path.dispose ();
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-@@ -208,13 +208,13 @@
+@@ -208,13 +208,13 @@ int GetFile (int /*long*/ aFile) {
return XPCOM.NS_OK;
}
@@ -2781,7 +2613,7 @@ diff -urN x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/bro
byte[] bytes = new byte[length];
XPCOM.memmove (bytes, buffer, length);
XPCOM.nsEmbedCString_delete (pathname);
-@@ -223,10 +223,10 @@
+@@ -223,10 +223,10 @@ int SetDisplayDirectory (int /*long*/ aDisplayDirectory) {
return XPCOM.NS_OK;
}
@@ -2794,7 +2626,7 @@ diff -urN x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/bro
int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, file);
path.dispose ();
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-@@ -239,31 +239,31 @@
+@@ -239,31 +239,31 @@ int SetFilterIndex (int aFilterIndex) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
@@ -2832,10 +2664,11 @@ diff -urN x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/bro
/* note that the type of arguments 1 and 2 changed as of Mozilla 1.8 */
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java x86_64/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java
---- x86/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java 2008-08-21 15:41:30.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java 2009-09-17 08:48:20.000000000 -0400
-@@ -38,17 +38,17 @@
+diff --git a/org/eclipse/swt/browser/FilePickerFactory.java b/org/eclipse/swt/browser/FilePickerFactory.java
+index 44dbff1..e4c160c 100644
+--- a/org/eclipse/swt/browser/FilePickerFactory.java
++++ b/org/eclipse/swt/browser/FilePickerFactory.java
+@@ -30,17 +30,17 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -2847,21 +2680,207 @@ diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java x86_64/or
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
- helperAppLauncherDialog = new XPCOMObject (new int[] {2, 0, 0, 3, 6}) {
+ factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
+- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+- public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
+- public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
++ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
++ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
++ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
++ public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
++ public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
+ };
+ }
+
+@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
+ }
+ }
+
+-int /*long*/ getAddress () {
++long /*int*/ getAddress () {
+ return factory.getAddress ();
+ }
+
+-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
++int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
+ if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
+ nsID guid = new nsID ();
+ XPCOM.memmove (guid, riid, nsID.sizeof);
+
+ if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
+- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
++ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ AddRef ();
+ return XPCOM.NS_OK;
+ }
+ if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {
+- XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
++ XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
+ AddRef ();
+ return XPCOM.NS_OK;
+ }
+
+- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
++ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
+ return XPCOM.NS_ERROR_NO_INTERFACE;
+ }
+
+@@ -87,10 +87,10 @@ int Release () {
+
+ /* nsIFactory */
+
+-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
++int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
+ FilePicker picker = new FilePicker ();
+ picker.AddRef ();
+- XPCOM.memmove (result, new int /*long*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
++ XPCOM.memmove (result, new long /*int*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
+ return XPCOM.NS_OK;
+ }
+
+diff --git a/org/eclipse/swt/browser/FilePickerFactory_1_8.java b/org/eclipse/swt/browser/FilePickerFactory_1_8.java
+index b47095b..856178d 100644
+--- a/org/eclipse/swt/browser/FilePickerFactory_1_8.java
++++ b/org/eclipse/swt/browser/FilePickerFactory_1_8.java
+@@ -18,26 +18,26 @@ class FilePickerFactory_1_8 extends FilePickerFactory {
+ void createCOMInterfaces () {
+ /* Create each of the interfaces that this object implements */
+ supports = new XPCOMObject (new int[] {2, 0, 0}) {
+- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
++ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
++ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
++ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ };
+
+ factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
+- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+- public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
+- public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
++ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
++ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
++ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
++ public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
++ public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
+ };
+ }
+
+ /* nsIFactory */
+
+-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
++int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
+ FilePicker_1_8 picker = new FilePicker_1_8 ();
+ picker.AddRef ();
+- XPCOM.memmove (result, new int /*long*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
++ XPCOM.memmove (result, new long /*int*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
+ return XPCOM.NS_OK;
+ }
+
+diff --git a/org/eclipse/swt/browser/FilePicker_1_8.java b/org/eclipse/swt/browser/FilePicker_1_8.java
+index a73840f..19e15e5 100644
+--- a/org/eclipse/swt/browser/FilePicker_1_8.java
++++ b/org/eclipse/swt/browser/FilePicker_1_8.java
+@@ -17,30 +17,30 @@ class FilePicker_1_8 extends FilePicker {
+ void createCOMInterfaces () {
+ /* Create each of the interfaces that this object implements */
+ supports = new XPCOMObject (new int[] {2, 0, 0}) {
+- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
++ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
++ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
++ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ };
+
+ filePicker = new XPCOMObject (new int[] {2, 0, 0, 3, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) {
+- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+- public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], (short)args[2]);}
+- public int /*long*/ method4 (int /*long*/[] args) {return AppendFilters ((int)/*64*/args[0]);}
+- public int /*long*/ method5 (int /*long*/[] args) {return AppendFilter (args[0], args[1]);}
+- public int /*long*/ method6 (int /*long*/[] args) {return GetDefaultString (args[0]);}
+- public int /*long*/ method7 (int /*long*/[] args) {return SetDefaultString (args[0]);}
+- public int /*long*/ method8 (int /*long*/[] args) {return GetDefaultExtension (args[0]);}
+- public int /*long*/ method9 (int /*long*/[] args) {return SetDefaultExtension (args[0]);}
+- public int /*long*/ method10 (int /*long*/[] args) {return GetFilterIndex (args[0]);}
+- public int /*long*/ method11 (int /*long*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}
+- public int /*long*/ method12 (int /*long*/[] args) {return GetDisplayDirectory (args[0]);}
+- public int /*long*/ method13 (int /*long*/[] args) {return SetDisplayDirectory (args[0]);}
+- public int /*long*/ method14 (int /*long*/[] args) {return GetFile (args[0]);}
+- public int /*long*/ method15 (int /*long*/[] args) {return GetFileURL (args[0]);}
+- public int /*long*/ method16 (int /*long*/[] args) {return GetFiles (args[0]);}
+- public int /*long*/ method17 (int /*long*/[] args) {return Show (args[0]);}
++ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
++ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
++ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
++ public long /*int*/ method3 (long /*int*/[] args) {return Init (args[0], args[1], (short)args[2]);}
++ public long /*int*/ method4 (long /*int*/[] args) {return AppendFilters ((int)/*64*/args[0]);}
++ public long /*int*/ method5 (long /*int*/[] args) {return AppendFilter (args[0], args[1]);}
++ public long /*int*/ method6 (long /*int*/[] args) {return GetDefaultString (args[0]);}
++ public long /*int*/ method7 (long /*int*/[] args) {return SetDefaultString (args[0]);}
++ public long /*int*/ method8 (long /*int*/[] args) {return GetDefaultExtension (args[0]);}
++ public long /*int*/ method9 (long /*int*/[] args) {return SetDefaultExtension (args[0]);}
++ public long /*int*/ method10 (long /*int*/[] args) {return GetFilterIndex (args[0]);}
++ public long /*int*/ method11 (long /*int*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}
++ public long /*int*/ method12 (long /*int*/[] args) {return GetDisplayDirectory (args[0]);}
++ public long /*int*/ method13 (long /*int*/[] args) {return SetDisplayDirectory (args[0]);}
++ public long /*int*/ method14 (long /*int*/[] args) {return GetFile (args[0]);}
++ public long /*int*/ method15 (long /*int*/[] args) {return GetFileURL (args[0]);}
++ public long /*int*/ method16 (long /*int*/[] args) {return GetFiles (args[0]);}
++ public long /*int*/ method17 (long /*int*/[] args) {return Show (args[0]);}
+ };
+ }
+
+@@ -49,10 +49,10 @@ void createCOMInterfaces () {
+ * answers a java string based on the type of string that is appropriate for the Mozilla
+ * version being used.
+ */
+-String parseAString (int /*long*/ string) {
++String parseAString (long /*int*/ string) {
+ if (string == 0) return null;
+ int length = XPCOM.nsEmbedString_Length (string);
+- int /*long*/ buffer = XPCOM.nsEmbedString_get (string);
++ long /*int*/ buffer = XPCOM.nsEmbedString_get (string);
+ char[] chars = new char[length];
+ XPCOM.memmove (chars, buffer, length * 2);
+ return new String (chars);
+diff --git a/org/eclipse/swt/browser/HelperAppLauncherDialog.java b/org/eclipse/swt/browser/HelperAppLauncherDialog.java
+index 706ec08..a8d9d5a 100644
+--- a/org/eclipse/swt/browser/HelperAppLauncherDialog.java
++++ b/org/eclipse/swt/browser/HelperAppLauncherDialog.java
+@@ -38,17 +38,17 @@ int AddRef () {
+ void createCOMInterfaces () {
+ /* Create each of the interfaces that this object implements */
+ supports = new XPCOMObject (new int[] {2, 0, 0}) {
+- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
++ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
++ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
++ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ };
+
+ helperAppLauncherDialog = new XPCOMObject (new int[] {2, 0, 0, 3, 5}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return Show (args[0], args[1], (int)/*64*/args[2]);}
-- public int /*long*/ method4 (int /*long*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], (int)/*64*/args[4], args[5]);}
+- public int /*long*/ method4 (int /*long*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], args[4]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return Show (args[0], args[1], (int)/*64*/args[2]);}
-+ public long /*int*/ method4 (long /*int*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], (int)/*64*/args[4], args[5]);}
++ public long /*int*/ method4 (long /*int*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], args[4]);}
};
}
-@@ -63,27 +63,27 @@
+@@ -63,27 +63,27 @@ void disposeCOMInterfaces () {
}
}
@@ -2875,53 +2894,67 @@ diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java x86_64/or
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
-
+
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
- if (guid.Equals (nsIHelperAppLauncherDialog_1_9.NS_IHELPERAPPLAUNCHERDIALOG_IID)) {
+ if (guid.Equals (nsIHelperAppLauncherDialog.NS_IHELPERAPPLAUNCHERDIALOG_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
-
+
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -102,12 +102,12 @@
+@@ -102,14 +102,14 @@ int Release () {
/* nsIHelperAppLauncherDialog */
-int Show (int /*long*/ aLauncher, int /*long*/ aContext, int aReason) {
+int Show (long /*int*/ aLauncher, long /*int*/ aContext, int aReason) {
- nsIHelperAppLauncher_1_9 helperAppLauncher = new nsIHelperAppLauncher_1_9 (aLauncher);
+ /*
+ * The interface for nsIHelperAppLauncher changed as of mozilla 1.8. Query the received
+ * nsIHelperAppLauncher for the new interface, and if it is not found then fall back to
+ * the old interface.
+ */
+ nsISupports supports = new nsISupports (aLauncher);
+- int /*long*/[] result = new int /*long*/[1];
++ long /*int*/[] result = new long /*int*/[1];
+ int rc = supports.QueryInterface (nsIHelperAppLauncher_1_8.NS_IHELPERAPPLAUNCHER_IID, result);
+ if (rc == XPCOM.NS_OK) { /* >= 1.8 */
+ nsIHelperAppLauncher_1_8 helperAppLauncher = new nsIHelperAppLauncher_1_8 (aLauncher);
+@@ -121,8 +121,8 @@ int Show (int /*long*/ aLauncher, int /*long*/ aContext, int aReason) {
return helperAppLauncher.SaveToDisk (0, 0);
}
--int PromptForSaveToFile (int /*long*/ aLauncher, int /*long*/ aWindowContext, int /*long*/ aDefaultFileName, int /*long*/ aSuggestedFileExtension, int aForcePrompt, int /*long*/ _retval) {
-+int PromptForSaveToFile (long /*int*/ aLauncher, long /*int*/ aWindowContext, long /*int*/ aDefaultFileName, long /*int*/ aSuggestedFileExtension, int aForcePrompt, long /*int*/ _retval) {
- int length = XPCOM.strlen_PRUnichar (aDefaultFileName);
- char[] dest = new char[length];
- XPCOM.memmove (dest, aDefaultFileName, length * 2);
-@@ -131,7 +131,7 @@
- return XPCOM.NS_ERROR_FAILURE;
- }
- nsEmbedString path = new nsEmbedString (name);
+-int PromptForSaveToFile (int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4) {
+- int /*long*/ aDefaultFile, aSuggestedFileExtension, _retval;
++int PromptForSaveToFile (long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4) {
++ long /*int*/ aDefaultFile, aSuggestedFileExtension, _retval;
+ boolean hasLauncher = false;
+
+ /*
+@@ -140,7 +140,7 @@ int PromptForSaveToFile (int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2
+ */
+ boolean using_1_8 = false;
+ nsISupports support = new nsISupports (arg0);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
- int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, result);
- path.dispose ();
- if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java x86_64/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java
---- x86/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java 2009-05-29 17:30:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java 2009-09-17 08:48:20.000000000 -0400
-@@ -30,17 +30,17 @@
+ int rc = support.QueryInterface (nsIHelperAppLauncher_1_8.NS_IHELPERAPPLAUNCHER_IID, result);
+ if (rc == XPCOM.NS_OK) {
+ using_1_8 = true;
+diff --git a/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java b/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java
+index 21008f0..481d91e 100644
+--- a/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java
++++ b/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java
+@@ -30,17 +30,17 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -2947,7 +2980,7 @@ diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java x86_64
};
}
-@@ -55,27 +55,27 @@
+@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
}
}
@@ -2980,7 +3013,7 @@ diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java x86_64
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -87,15 +87,15 @@
+@@ -87,15 +87,15 @@ int Release () {
/* nsIFactory */
@@ -2999,10 +3032,11 @@ diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java x86_64
}
return XPCOM.NS_OK;
}
-diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialog.java x86_64/org/eclipse/swt/browser/HelperAppLauncherDialog.java
---- x86/org/eclipse/swt/browser/HelperAppLauncherDialog.java 2008-08-21 15:41:30.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/HelperAppLauncherDialog.java 2009-09-17 08:48:20.000000000 -0400
-@@ -38,17 +38,17 @@
+diff --git a/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java b/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java
+index dd2e0cb..5599b9b 100644
+--- a/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java
++++ b/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java
+@@ -38,17 +38,17 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -3014,21 +3048,21 @@ diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialog.java x86_64/org/ec
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
- helperAppLauncherDialog = new XPCOMObject (new int[] {2, 0, 0, 3, 5}) {
+ helperAppLauncherDialog = new XPCOMObject (new int[] {2, 0, 0, 3, 6}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return Show (args[0], args[1], (int)/*64*/args[2]);}
-- public int /*long*/ method4 (int /*long*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], args[4]);}
+- public int /*long*/ method4 (int /*long*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], (int)/*64*/args[4], args[5]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return Show (args[0], args[1], (int)/*64*/args[2]);}
-+ public long /*int*/ method4 (long /*int*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], args[4]);}
++ public long /*int*/ method4 (long /*int*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], (int)/*64*/args[4], args[5]);}
};
}
-@@ -63,27 +63,27 @@
+@@ -63,27 +63,27 @@ void disposeCOMInterfaces () {
}
}
@@ -3042,66 +3076,54 @@ diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialog.java x86_64/org/ec
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
-
+
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
- if (guid.Equals (nsIHelperAppLauncherDialog.NS_IHELPERAPPLAUNCHERDIALOG_IID)) {
+ if (guid.Equals (nsIHelperAppLauncherDialog_1_9.NS_IHELPERAPPLAUNCHERDIALOG_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
-
+
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -102,14 +102,14 @@
+@@ -102,12 +102,12 @@ int Release () {
/* nsIHelperAppLauncherDialog */
-int Show (int /*long*/ aLauncher, int /*long*/ aContext, int aReason) {
+int Show (long /*int*/ aLauncher, long /*int*/ aContext, int aReason) {
- /*
- * The interface for nsIHelperAppLauncher changed as of mozilla 1.8. Query the received
- * nsIHelperAppLauncher for the new interface, and if it is not found then fall back to
- * the old interface.
- */
- nsISupports supports = new nsISupports (aLauncher);
-- int /*long*/[] result = new int /*long*/[1];
-+ long /*int*/[] result = new long /*int*/[1];
- int rc = supports.QueryInterface (nsIHelperAppLauncher_1_8.NS_IHELPERAPPLAUNCHER_IID, result);
- if (rc == XPCOM.NS_OK) { /* >= 1.8 */
- nsIHelperAppLauncher_1_8 helperAppLauncher = new nsIHelperAppLauncher_1_8 (aLauncher);
-@@ -121,8 +121,8 @@
+ nsIHelperAppLauncher_1_9 helperAppLauncher = new nsIHelperAppLauncher_1_9 (aLauncher);
return helperAppLauncher.SaveToDisk (0, 0);
}
--int PromptForSaveToFile (int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4) {
-- int /*long*/ aDefaultFile, aSuggestedFileExtension, _retval;
-+int PromptForSaveToFile (long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4) {
-+ long /*int*/ aDefaultFile, aSuggestedFileExtension, _retval;
- boolean hasLauncher = false;
-
- /*
-@@ -140,7 +140,7 @@
- */
- boolean using_1_8 = false;
- nsISupports support = new nsISupports (arg0);
+-int PromptForSaveToFile (int /*long*/ aLauncher, int /*long*/ aWindowContext, int /*long*/ aDefaultFileName, int /*long*/ aSuggestedFileExtension, int aForcePrompt, int /*long*/ _retval) {
++int PromptForSaveToFile (long /*int*/ aLauncher, long /*int*/ aWindowContext, long /*int*/ aDefaultFileName, long /*int*/ aSuggestedFileExtension, int aForcePrompt, long /*int*/ _retval) {
+ int length = XPCOM.strlen_PRUnichar (aDefaultFileName);
+ char[] dest = new char[length];
+ XPCOM.memmove (dest, aDefaultFileName, length * 2);
+@@ -131,7 +131,7 @@ int PromptForSaveToFile (int /*long*/ aLauncher, int /*long*/ aWindowContext, in
+ return XPCOM.NS_ERROR_FAILURE;
+ }
+ nsEmbedString path = new nsEmbedString (name);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
- int rc = support.QueryInterface (nsIHelperAppLauncher_1_8.NS_IHELPERAPPLAUNCHER_IID, result);
- if (rc == XPCOM.NS_OK) {
- using_1_8 = true;
-diff -urN x86/org/eclipse/swt/browser/InputStream.java x86_64/org/eclipse/swt/browser/InputStream.java
---- x86/org/eclipse/swt/browser/InputStream.java 2007-08-01 15:57:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/InputStream.java 2009-09-17 08:48:20.000000000 -0400
-@@ -34,14 +34,14 @@
+ int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, result);
+ path.dispose ();
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+diff --git a/org/eclipse/swt/browser/InputStream.java b/org/eclipse/swt/browser/InputStream.java
+index 3440fbb..82b0288 100644
+--- a/org/eclipse/swt/browser/InputStream.java
++++ b/org/eclipse/swt/browser/InputStream.java
+@@ -34,14 +34,14 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
inputStream = new XPCOMObject (new int[] {2, 0, 0, 0, 1, 3, 4, 1}) {
@@ -3124,7 +3146,7 @@ diff -urN x86/org/eclipse/swt/browser/InputStream.java x86_64/org/eclipse/swt/br
};
}
-@@ -52,26 +52,26 @@
+@@ -52,26 +52,26 @@ void disposeCOMInterfaces () {
}
}
@@ -3156,7 +3178,7 @@ diff -urN x86/org/eclipse/swt/browser/InputStream.java x86_64/org/eclipse/swt/br
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -89,13 +89,13 @@
+@@ -89,13 +89,13 @@ int Close () {
return XPCOM.NS_OK;
}
@@ -3172,7 +3194,7 @@ diff -urN x86/org/eclipse/swt/browser/InputStream.java x86_64/org/eclipse/swt/br
int max = Math.min (aCount, buffer == null ? 0 : buffer.length - index);
if (max > 0) {
byte[] src = new byte[max];
-@@ -107,12 +107,12 @@
+@@ -107,12 +107,12 @@ int Read(int /*long*/ aBuf, int aCount, int /*long*/ _retval) {
return XPCOM.NS_OK;
}
@@ -3187,7 +3209,7 @@ diff -urN x86/org/eclipse/swt/browser/InputStream.java x86_64/org/eclipse/swt/br
if (rc != XPCOM.NS_OK) break;
index += aWriteCount[0];
cnt -= aWriteCount[0];
-@@ -121,7 +121,7 @@
+@@ -121,7 +121,7 @@ int ReadSegments (int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int /
return XPCOM.NS_OK;
}
@@ -3196,98 +3218,11 @@ diff -urN x86/org/eclipse/swt/browser/InputStream.java x86_64/org/eclipse/swt/br
/* blocking */
XPCOM.memmove (_retval, new int[] {0}, 4);
return XPCOM.NS_OK;
-diff -urN x86/org/eclipse/swt/browser/MozillaDelegate.java x86_64/org/eclipse/swt/browser/MozillaDelegate.java
---- x86/org/eclipse/swt/browser/MozillaDelegate.java 2009-08-20 15:16:38.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/MozillaDelegate.java 2009-09-17 08:48:22.000000000 -0400
-@@ -19,11 +19,11 @@
-
- class MozillaDelegate {
- Browser browser;
-- int /*long*/ mozillaHandle, embedHandle;
-+ long /*int*/ mozillaHandle, embedHandle;
- boolean hasFocus;
- Listener listener;
- static Callback eventCallback;
-- static int /*long*/ eventProc;
-+ static long /*int*/ eventProc;
- static final int STOP_PROPOGATE = 1;
-
- static boolean IsSparc;
-@@ -47,8 +47,8 @@
- this.browser = browser;
- }
-
--static int /*long*/ eventProc (int /*long*/ handle, int /*long*/ gdkEvent, int /*long*/ pointer) {
-- int /*long*/ parent = OS.gtk_widget_get_parent (handle);
-+static long /*int*/ eventProc (long /*int*/ handle, long /*int*/ gdkEvent, long /*int*/ pointer) {
-+ long /*int*/ parent = OS.gtk_widget_get_parent (handle);
- parent = OS.gtk_widget_get_parent (parent);
- if (parent == 0) return 0;
- Widget widget = Display.getCurrent ().findWidget (parent);
-@@ -58,12 +58,12 @@
- return 0;
- }
-
--static Browser findBrowser (int /*long*/ handle) {
-+static Browser findBrowser (long /*int*/ handle) {
- /*
- * Note. On GTK, Mozilla is embedded into a GtkHBox handle
- * and not directly into the parent Composite handle.
- */
-- int /*long*/ parent = OS.gtk_widget_get_parent (handle);
-+ long /*int*/ parent = OS.gtk_widget_get_parent (handle);
- Display display = Display.getCurrent ();
- return (Browser)display.findWidget (parent);
- }
-@@ -83,7 +83,7 @@
- return baseWindow.Create ();
- }
-
--int /*long*/ getHandle () {
-+long /*int*/ getHandle () {
- /*
- * Bug in Mozilla Linux GTK. Embedding Mozilla into a GtkFixed
- * handle causes problems with some Mozilla plug-ins. For some
-@@ -112,7 +112,7 @@
- return "swt-xpcominit"; //$NON-NLS-1$
- }
-
--int /*long*/ gtk_event (int /*long*/ handle, int /*long*/ gdkEvent, int /*long*/ pointer) {
-+long /*int*/ gtk_event (long /*int*/ handle, long /*int*/ gdkEvent, long /*int*/ pointer) {
- GdkEvent event = new GdkEvent ();
- OS.memmove (event, gdkEvent, GdkEvent.sizeof);
- if (event.type == OS.GDK_BUTTON_PRESS) {
-@@ -178,7 +178,7 @@
- * forward the event to the parent embedder before Mozilla received and consumed
- * them.
- */
-- int /*long*/ list = OS.gtk_container_get_children (embedHandle);
-+ long /*int*/ list = OS.gtk_container_get_children (embedHandle);
- if (list != 0) {
- mozillaHandle = OS.g_list_data (list);
- OS.g_list_free (list);
-@@ -204,7 +204,7 @@
- return true;
- }
-
--void onDispose (int /*long*/ embedHandle) {
-+void onDispose (long /*int*/ embedHandle) {
- if (listener != null) {
- browser.getDisplay ().removeFilter (SWT.FocusIn, listener);
- browser.getShell ().removeListener (SWT.Deactivate, listener);
-@@ -216,7 +216,7 @@
- void removeWindowSubclass () {
- }
-
--void setSize (int /*long*/ embedHandle, int width, int height) {
-+void setSize (long /*int*/ embedHandle, int width, int height) {
- OS.gtk_widget_set_size_request (embedHandle, width, height);
- }
-
-diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser/Mozilla.java
---- x86/org/eclipse/swt/browser/Mozilla.java 2009-08-19 16:24:46.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/Mozilla.java 2009-09-17 08:48:20.000000000 -0400
-@@ -23,7 +23,7 @@
+diff --git a/org/eclipse/swt/browser/Mozilla.java b/org/eclipse/swt/browser/Mozilla.java
+index 9cbf020..f6c0085 100644
+--- a/org/eclipse/swt/browser/Mozilla.java
++++ b/org/eclipse/swt/browser/Mozilla.java
+@@ -23,7 +23,7 @@ import org.eclipse.swt.internal.mozilla.init.*;
import org.eclipse.swt.layout.*;
class Mozilla extends WebBrowser {
@@ -3296,7 +3231,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
nsIWebBrowser webBrowser;
Object webBrowserObject;
MozillaDelegate delegate;
-@@ -44,7 +44,7 @@
+@@ -44,7 +44,7 @@ class Mozilla extends WebBrowser {
XPCOMObject badCertListener;
int chromeFlags = nsIWebBrowserChrome.CHROME_DEFAULT;
int refCount, lastKeyCode, lastCharCode, authCount;
@@ -3305,7 +3240,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
Point location, size;
boolean visible, isChild, ignoreDispose, isRetrievingBadCert, isViewingErrorPage;
Shell tip = null;
-@@ -103,7 +103,7 @@
+@@ -103,7 +103,7 @@ class Mozilla extends WebBrowser {
MozillaClearSessions = new Runnable () {
public void run () {
if (!Initialized) return;
@@ -3314,7 +3249,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -133,9 +133,9 @@
+@@ -133,9 +133,9 @@ class Mozilla extends WebBrowser {
rc = cookie.GetExpires (expires);
if (expires[0] == 0) {
/* indicates a session cookie */
@@ -3327,7 +3262,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
cookie.GetHost (domain);
cookie.GetName (name);
cookie.GetPath (path);
-@@ -158,7 +158,7 @@
+@@ -158,7 +158,7 @@ class Mozilla extends WebBrowser {
public void run() {
if (!Initialized) return;
@@ -3336,7 +3271,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -172,7 +172,7 @@
+@@ -172,7 +172,7 @@ class Mozilla extends WebBrowser {
nsIIOService ioService = new nsIIOService (result[0]);
result[0] = 0;
byte[] bytes = MozillaDelegate.wcsToMbcs (null, CookieUrl, false);
@@ -3345,7 +3280,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = ioService.NewURI (aSpec, null, 0, result);
XPCOM.nsEmbedCString_delete (aSpec);
ioService.Release ();
-@@ -186,7 +186,7 @@
+@@ -186,7 +186,7 @@ class Mozilla extends WebBrowser {
result[0] = 0;
byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_COOKIESERVICE_CONTRACTID, true);
rc = serviceManager.GetServiceByContractID (aContractID, nsICookieService.NS_ICOOKIESERVICE_IID, result);
@@ -3354,7 +3289,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (rc == XPCOM.NS_OK && result[0] != 0) {
nsICookieService cookieService = new nsICookieService (result[0]);
result[0] = 0;
-@@ -244,7 +244,7 @@
+@@ -244,7 +244,7 @@ class Mozilla extends WebBrowser {
public void run() {
if (!Initialized) return;
@@ -3363,7 +3298,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -258,7 +258,7 @@
+@@ -258,7 +258,7 @@ class Mozilla extends WebBrowser {
nsIIOService ioService = new nsIIOService (result[0]);
result[0] = 0;
byte[] bytes = MozillaDelegate.wcsToMbcs (null, CookieUrl, false);
@@ -3372,7 +3307,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = ioService.NewURI (aSpec, null, 0, result);
XPCOM.nsEmbedCString_delete (aSpec);
ioService.Release ();
-@@ -298,7 +298,7 @@
+@@ -298,7 +298,7 @@ public void create (Composite parent, int style) {
delegate = new MozillaDelegate (browser);
final Display display = parent.getDisplay ();
@@ -3381,7 +3316,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (!Initialized) {
boolean initLoaded = false;
boolean IsXULRunner = false;
-@@ -353,20 +353,20 @@
+@@ -353,20 +353,20 @@ public void create (Composite parent, int style) {
/* attempt to discover a XULRunner to use as the GRE */
GREVersionRange range = new GREVersionRange ();
byte[] bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_LOWER, true);
@@ -3406,7 +3341,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = XPCOMInit.GRE_GetGREPathWithProperties (range, 1, propertiesPtr, 0, greBuffer, length);
/*
-@@ -409,7 +409,7 @@
+@@ -409,7 +409,7 @@ public void create (Composite parent, int style) {
if (Device.DEBUG) System.out.println ("cannot use detected XULRunner: " + mozillaPath); //$NON-NLS-1$
/* attempt to XPCOMGlueStartup the GRE pointed at by MOZILLA_FIVE_HOME */
@@ -3415,7 +3350,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (ptr == 0) {
IsXULRunner = false;
} else {
-@@ -473,7 +473,7 @@
+@@ -473,7 +473,7 @@ public void create (Composite parent, int style) {
}
/* attempt to use the GRE pointed at by MOZILLA_FIVE_HOME */
@@ -3424,7 +3359,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (ptr != 0) {
int length = C.strlen (ptr);
byte[] buffer = new byte[length];
-@@ -547,7 +547,7 @@
+@@ -547,7 +547,7 @@ public void create (Composite parent, int style) {
LocationProvider.setComponentsPath (componentsDir.getAbsolutePath ());
}
@@ -3433,7 +3368,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
nsEmbedString pathString = new nsEmbedString (mozillaPath);
int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, retVal);
pathString.dispose ();
-@@ -564,18 +564,18 @@
+@@ -564,18 +564,18 @@ public void create (Composite parent, int style) {
if (IsXULRunner) {
int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
/* alloc memory for two structs, the second is empty to signify the end of the list */
@@ -3455,7 +3390,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
result[0] = 0;
C.free (functionLoad.function);
C.free (functionLoad.functionName);
-@@ -744,14 +744,14 @@
+@@ -744,14 +744,14 @@ public void create (Composite parent, int style) {
nsIFile profileDir = new nsIFile (result[0]);
result[0] = 0;
@@ -3472,7 +3407,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
buffer = new byte [length];
XPCOM.memmove (buffer, ptr, length);
String profilePath = new String (MozillaDelegate.mbcsToWcs (null, buffer)) + PROFILE_DIR;
-@@ -801,11 +801,11 @@
+@@ -801,11 +801,11 @@ public void create (Composite parent, int style) {
functionLoad.functionName = C.malloc (bytes.length);
C.memmove (functionLoad.functionName, bytes, bytes.length);
functionLoad.function = C.malloc (C.PTR_SIZEOF);
@@ -3486,7 +3421,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
result[0] = 0;
C.free (functionLoad.function);
C.free (functionLoad.functionName);
-@@ -1187,7 +1187,7 @@
+@@ -1187,7 +1187,7 @@ public void create (Composite parent, int style) {
public void handleEvent (Event event) {
if (BrowserCount > 0) return; /* another display is still active */
@@ -3495,7 +3430,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -1258,18 +1258,18 @@
+@@ -1258,18 +1258,18 @@ public void create (Composite parent, int style) {
// int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
// /* alloc memory for two structs, the second is empty to signify the end of the list */
@@ -3517,7 +3452,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
// result[0] = 0;
// C.free (functionLoad.function);
// C.free (functionLoad.functionName);
-@@ -1530,7 +1530,7 @@
+@@ -1530,7 +1530,7 @@ public void create (Composite parent, int style) {
public boolean back () {
htmlBytes = null;
@@ -3526,7 +3461,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -1544,122 +1544,122 @@
+@@ -1544,122 +1544,122 @@ public boolean back () {
void createCOMInterfaces () {
// Create each of the interfaces that this object implements
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -3729,7 +3664,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
};
}
-@@ -1738,7 +1738,7 @@
+@@ -1738,7 +1738,7 @@ public boolean execute (String script) {
* workaround is to invoke the javascript handler directly via C++, which is
* exposed as of mozilla 1.9.
*/
@@ -3738,7 +3673,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (!IsPre_1_9) {
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -1785,12 +1785,12 @@
+@@ -1785,12 +1785,12 @@ public boolean execute (String script) {
interfaceRequestor.Release ();
if (rc == XPCOM.NS_OK && result[0] != 0) {
@@ -3754,7 +3689,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
new nsISupports (scriptGlobalObject).Release ();
if (scriptContext != 0 && globalJSObject != 0) {
-@@ -1801,7 +1801,7 @@
+@@ -1801,7 +1801,7 @@ public boolean execute (String script) {
new nsISupports (result[0]).Release ();
result[0] = 0;
@@ -3763,7 +3698,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (nativeContext != 0) {
int length = script.length ();
char[] scriptChars = new char[length];
-@@ -1809,7 +1809,7 @@
+@@ -1809,7 +1809,7 @@ public boolean execute (String script) {
byte[] urlbytes = MozillaDelegate.wcsToMbcs (null, getUrl (), true);
rc = principal.GetJSPrincipals (nativeContext, result);
if (rc == XPCOM.NS_OK && result[0] != 0) {
@@ -3772,7 +3707,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
result[0] = 0;
principal.Release ();
String mozillaPath = LocationProvider.mozillaPath + delegate.getJSLibraryName () + '\0';
-@@ -1846,12 +1846,12 @@
+@@ -1846,12 +1846,12 @@ public boolean execute (String script) {
return rc == XPCOM.NS_OK;
}
@@ -3787,7 +3722,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-@@ -1870,7 +1870,7 @@
+@@ -1870,7 +1870,7 @@ static Browser findBrowser (nsIDOMWindow aDOMWindow) {
rc = aDOMWindow.GetTop (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
@@ -3796,7 +3731,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
result[0] = 0;
rc = windowWatcher.GetChromeForWindow (topDOMWindow, result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-@@ -1898,7 +1898,7 @@
+@@ -1898,7 +1898,7 @@ static Browser findBrowser (nsIDOMWindow aDOMWindow) {
public boolean forward () {
htmlBytes = null;
@@ -3805,7 +3740,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -1919,7 +1919,7 @@
+@@ -1919,7 +1919,7 @@ int getNextFunctionIndex () {
}
public String getText () {
@@ -3814,7 +3749,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.GetContentDOMWindow (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -1931,7 +1931,7 @@
+@@ -1931,7 +1931,7 @@ public String getText () {
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
window.Release ();
@@ -3823,7 +3758,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
result[0] = 0;
rc = XPCOM.NS_GetComponentManager (result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -1948,12 +1948,12 @@
+@@ -1948,12 +1948,12 @@ public String getText () {
nsIDOMSerializer_1_7 serializer = new nsIDOMSerializer_1_7 (result[0]);
result[0] = 0;
@@ -3838,7 +3773,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
chars = new char[length];
XPCOM.memmove (chars, buffer, length * 2);
XPCOM.nsEmbedString_delete (string);
-@@ -1978,13 +1978,13 @@
+@@ -1978,13 +1978,13 @@ public String getText () {
}
public String getUrl () {
@@ -3854,7 +3789,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = webNavigation.GetCurrentURI (aCurrentURI);
if (rc != XPCOM.NS_OK) error (rc);
webNavigation.Release ();
-@@ -1992,11 +1992,11 @@
+@@ -1992,11 +1992,11 @@ public String getUrl () {
byte[] dest = null;
if (aCurrentURI[0] != 0) {
nsIURI uri = new nsIURI (aCurrentURI[0]);
@@ -3868,7 +3803,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
XPCOM.nsEmbedCString_delete (aSpec);
-@@ -2039,7 +2039,7 @@
+@@ -2039,7 +2039,7 @@ public Object getWebBrowser () {
}
public boolean isBackEnabled () {
@@ -3877,7 +3812,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -2052,7 +2052,7 @@
+@@ -2052,7 +2052,7 @@ public boolean isBackEnabled () {
}
public boolean isForwardEnabled () {
@@ -3886,7 +3821,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -2095,7 +2095,7 @@
+@@ -2095,7 +2095,7 @@ void onDispose (Display display) {
listener = null;
}
@@ -3895,7 +3830,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -2139,7 +2139,7 @@
+@@ -2139,7 +2139,7 @@ void onDispose (Display display) {
}
void Activate () {
@@ -3904,7 +3839,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.QueryInterface (nsIWebBrowserFocus.NS_IWEBBROWSERFOCUS_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -2151,7 +2151,7 @@
+@@ -2151,7 +2151,7 @@ void Activate () {
}
void Deactivate () {
@@ -3913,7 +3848,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.QueryInterface (nsIWebBrowserFocus.NS_IWEBBROWSERFOCUS_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -2167,7 +2167,7 @@
+@@ -2167,7 +2167,7 @@ void onResize () {
int width = Math.max (1, rect.width);
int height = Math.max (1, rect.height);
@@ -3922,7 +3857,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -2182,7 +2182,7 @@
+@@ -2182,7 +2182,7 @@ void onResize () {
public void refresh () {
htmlBytes = null;
@@ -3931,7 +3866,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error(rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -2244,7 +2244,7 @@
+@@ -2244,7 +2244,7 @@ public boolean setText (String html) {
*/
delegate.removeWindowSubclass ();
@@ -3940,7 +3875,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
if (rc == XPCOM.NS_OK && result[0] != 0) {
/*
-@@ -2277,9 +2277,9 @@
+@@ -2277,9 +2277,9 @@ public boolean setText (String html) {
webNavigation.Release ();
} else {
byte[] contentCharsetBuffer = MozillaDelegate.wcsToMbcs (null, "UTF-8", true); //$NON-NLS-1$
@@ -3952,7 +3887,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -2300,7 +2300,7 @@
+@@ -2300,7 +2300,7 @@ public boolean setText (String html) {
* is about:blank. The fix is to specify the file protocol.
*/
byte[] aString = MozillaDelegate.wcsToMbcs (null, URI_FROMMEMORY, false);
@@ -3961,7 +3896,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = ioService.NewURI (aSpec, null, 0, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -2345,7 +2345,7 @@
+@@ -2345,7 +2345,7 @@ public boolean setText (String html) {
public boolean setUrl (String url) {
htmlBytes = null;
@@ -3970,7 +3905,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -2368,7 +2368,7 @@
+@@ -2368,7 +2368,7 @@ public boolean setUrl (String url) {
public void stop () {
htmlBytes = null;
@@ -3979,7 +3914,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -2427,7 +2427,7 @@
+@@ -2427,7 +2427,7 @@ void hookDOMListeners (nsIDOMEventTarget target, boolean isTop) {
}
void unhookDOMListeners () {
@@ -3988,7 +3923,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.GetContentDOMWindow (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -2518,73 +2518,73 @@
+@@ -2518,73 +2518,73 @@ void unhookDOMListeners (nsIDOMEventTarget target) {
/* nsISupports */
@@ -4076,7 +4011,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -2601,18 +2601,18 @@
+@@ -2601,18 +2601,18 @@ int Release () {
/* nsIWeakReference */
@@ -4098,7 +4033,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.GetContentDOMWindow (aContentDOMWindow);
if (rc != XPCOM.NS_OK) error (rc);
if (aContentDOMWindow[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -2622,18 +2622,18 @@
+@@ -2622,18 +2622,18 @@ int GetInterface (int /*long*/ riid, int /*long*/ ppvObject) {
return QueryInterface (riid, ppvObject);
}
@@ -4121,7 +4056,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
/*
* When navigating to a site that is known to have a bad certificate, request notification
-@@ -2676,7 +2676,7 @@
+@@ -2676,7 +2676,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
* received for every window in a page, which is when these listeners
* are typically added.
*/
@@ -4130,7 +4065,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
nsIWebProgress progress = new nsIWebProgress (aWebProgress);
int rc = progress.GetDOMWindow (result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -2718,11 +2718,11 @@
+@@ -2718,11 +2718,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
*/
if (htmlBytes != null) {
nsIRequest req = new nsIRequest (aRequest);
@@ -4144,7 +4079,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
String url = new String (dest);
-@@ -2755,7 +2755,7 @@
+@@ -2755,7 +2755,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
* is about:blank. The fix is to specify the file protocol.
*/
byte[] aString = MozillaDelegate.wcsToMbcs (null, URI_FROMMEMORY, false);
@@ -4153,7 +4088,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = ioService.NewURI (aSpec, null, 0, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -2773,15 +2773,15 @@
+@@ -2773,15 +2773,15 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
result[0] = 0;
byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", true); // $NON-NLS-1$
@@ -4172,7 +4107,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
for (int i = 0; i < pageCount; i++) {
length = i == pageCount - 1 ? htmlBytes.length % pageSize : pageSize;
if (length > 0) {
-@@ -2872,7 +2872,7 @@
+@@ -2872,7 +2872,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
* Hook DOM listeners to the page's nsIDOMWindow here because this is
* the earliest opportunity to do so.
*/
@@ -4181,7 +4116,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
nsIWebProgress progress = new nsIWebProgress (aWebProgress);
int rc = progress.GetDOMWindow (result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -2911,7 +2911,7 @@
+@@ -2911,7 +2911,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
return XPCOM.NS_OK;
}
@@ -4190,7 +4125,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (progressListeners.length == 0) return XPCOM.NS_OK;
ProgressEvent event = new ProgressEvent (browser);
event.display = browser.getDisplay ();
-@@ -2924,7 +2924,7 @@
+@@ -2924,7 +2924,7 @@ int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCur
return XPCOM.NS_OK;
}
@@ -4199,7 +4134,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
/*
* Feature in Mozilla. When a page is loaded via setText before a previous
* setText page load has completed, the expected OnStateChange STATE_STOP for the
-@@ -2939,13 +2939,13 @@
+@@ -2939,13 +2939,13 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
if (locationListeners.length == 0) return XPCOM.NS_OK;
nsIWebProgress webProgress = new nsIWebProgress (aWebProgress);
@@ -4215,7 +4150,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = domWindow.GetTop (aTop);
if (rc != XPCOM.NS_OK) error (rc);
if (aTop[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -2955,10 +2955,10 @@
+@@ -2955,10 +2955,10 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
topWindow.Release ();
nsIURI location = new nsIURI (aLocation);
@@ -4228,7 +4163,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
XPCOM.nsEmbedCString_delete (aSpec);
-@@ -2988,7 +2988,7 @@
+@@ -2988,7 +2988,7 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
return XPCOM.NS_OK;
}
@@ -4237,7 +4172,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (statusTextListeners.length == 0) return XPCOM.NS_OK;
StatusTextEvent event = new StatusTextEvent (browser);
event.display = browser.getDisplay ();
-@@ -3003,13 +3003,13 @@
+@@ -3003,13 +3003,13 @@ int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatu
return XPCOM.NS_OK;
}
@@ -4253,7 +4188,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (statusTextListeners.length == 0) return XPCOM.NS_OK;
StatusTextEvent event = new StatusTextEvent (browser);
event.display = browser.getDisplay ();
-@@ -3025,8 +3025,8 @@
+@@ -3025,8 +3025,8 @@ int SetStatus (int statusType, int /*long*/ status) {
return XPCOM.NS_OK;
}
@@ -4264,7 +4199,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (webBrowser != null) {
webBrowser.AddRef ();
ret[0] = webBrowser.getAddress ();
-@@ -3035,13 +3035,13 @@
+@@ -3035,13 +3035,13 @@ int GetWebBrowser (int /*long*/ aWebBrowser) {
return XPCOM.NS_OK;
}
@@ -4280,7 +4215,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int[] ret = new int[1];
ret[0] = chromeFlags;
XPCOM.memmove (aChromeFlags, ret, 4); /* PRUint32 */
-@@ -3081,7 +3081,7 @@
+@@ -3081,7 +3081,7 @@ int SizeBrowserTo (int aCX, int aCY) {
}
int ShowAsModal () {
@@ -4289,7 +4224,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -3111,7 +3111,7 @@
+@@ -3111,7 +3111,7 @@ int ShowAsModal () {
return XPCOM.NS_OK;
}
@@ -4298,7 +4233,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int result = (chromeFlags & nsIWebBrowserChrome.CHROME_MODAL) != 0 ? 1 : 0;
XPCOM.memmove (retval, new int[] {result}, 4); /* PRBool */
return XPCOM.NS_OK;
-@@ -3137,7 +3137,7 @@
+@@ -3137,7 +3137,7 @@ int SetDimensions (int flags, int x, int y, int cx, int cy) {
return XPCOM.NS_OK;
}
@@ -4307,7 +4242,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if ((flags & nsIEmbeddingSiteWindow.DIM_FLAGS_POSITION) != 0) {
Point location = browser.getShell ().getLocation ();
if (x != 0) C.memmove (x, new int[] {location.x}, 4); /* PRInt32 */
-@@ -3157,7 +3157,7 @@
+@@ -3157,7 +3157,7 @@ int GetDimensions (int flags, int /*long*/ x, int /*long*/ y, int /*long*/ cx, i
}
int SetFocus () {
@@ -4316,7 +4251,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -3175,7 +3175,7 @@
+@@ -3175,7 +3175,7 @@ int SetFocus () {
return XPCOM.NS_OK;
}
@@ -4325,7 +4260,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
boolean visible = browser.isVisible () && !browser.getShell ().getMinimized ();
XPCOM.memmove (aVisibility, new int[] {visible ? 1 : 0}, 4); /* PRBool */
return XPCOM.NS_OK;
-@@ -3218,11 +3218,11 @@
+@@ -3218,11 +3218,11 @@ int SetVisibility (int aVisibility) {
return XPCOM.NS_OK;
}
@@ -4339,7 +4274,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
if (titleListeners.length == 0) return XPCOM.NS_OK;
TitleEvent event = new TitleEvent (browser);
event.display = browser.getDisplay ();
-@@ -3246,7 +3246,7 @@
+@@ -3246,7 +3246,7 @@ int SetTitle (int /*long*/ aTitle) {
return XPCOM.NS_OK;
}
@@ -4348,7 +4283,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
/*
* Note. The handle is expected to be an HWND on Windows and
* a GtkWidget* on GTK. This callback is invoked on Windows
-@@ -3254,7 +3254,7 @@
+@@ -3254,7 +3254,7 @@ int GetSiteWindow (int /*long*/ aSiteWindow) {
* dialog comes up. If no handle is returned, the print dialog
* does not come up on this platform.
*/
@@ -4357,7 +4292,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
return XPCOM.NS_OK;
}
-@@ -3294,9 +3294,9 @@
+@@ -3294,9 +3294,9 @@ int FocusPrevElement () {
/* nsIContextMenuListener */
@@ -4369,7 +4304,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = domEvent.QueryInterface (nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -3326,15 +3326,15 @@
+@@ -3326,15 +3326,15 @@ int OnShowContextMenu (int aContextFlags, int /*long*/ aEvent, int /*long*/ aNod
/* nsIURIContentListener */
@@ -4388,7 +4323,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
buffer = XPCOM.nsEmbedCString_get (aSpec);
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
-@@ -3383,7 +3383,7 @@
+@@ -3383,7 +3383,7 @@ int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
if (jsEnabledChanged) {
jsEnabledChanged = false;
@@ -4397,7 +4332,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = webBrowser.QueryInterface (nsIWebBrowserSetup.NS_IWEBBROWSERSETUP_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -3402,11 +3402,11 @@
+@@ -3402,11 +3402,11 @@ int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
return XPCOM.NS_OK;
}
@@ -4411,7 +4346,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
boolean preferred = false;
int size = XPCOM.strlen (aContentType);
if (size > 0) {
-@@ -3417,7 +3417,7 @@
+@@ -3417,7 +3417,7 @@ int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, in
/* do not attempt to handle known problematic content types */
if (!contentType.equals (XPCOM.CONTENT_MAYBETEXT) && !contentType.equals (XPCOM.CONTENT_MULTIPART)) {
/* determine whether browser can handle the content type */
@@ -4420,7 +4355,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -3429,7 +3429,7 @@
+@@ -3429,7 +3429,7 @@ int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, in
rc = serviceManager.GetServiceByContractID (aContractID, nsIWebNavigationInfo.NS_IWEBNAVIGATIONINFO_IID, result);
if (rc == XPCOM.NS_OK) {
byte[] bytes = MozillaDelegate.wcsToMbcs (null, contentType, true);
@@ -4429,7 +4364,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
nsIWebNavigationInfo info = new nsIWebNavigationInfo (result[0]);
result[0] = 0;
int[] isSupportedResult = new int[1]; /* PRUint32 */
-@@ -3459,34 +3459,34 @@
+@@ -3459,34 +3459,34 @@ int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, in
XPCOM.memmove(retval, new int[] {preferred ? 1 : 0}, 4); /* PRBool */
if (preferred) {
@@ -4471,7 +4406,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int length = XPCOM.strlen_PRUnichar (aTipText);
char[] dest = new char[length];
XPCOM.memmove (dest, aTipText, length * 2);
-@@ -3524,21 +3524,21 @@
+@@ -3524,21 +3524,21 @@ int OnHideTooltip () {
/* nsIDOMEventListener */
@@ -4497,7 +4432,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = domEvent.GetCurrentTarget (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -3555,7 +3555,7 @@
+@@ -3555,7 +3555,7 @@ int HandleEvent (int /*long*/ event) {
}
if (XPCOM.DOMEVENT_KEYDOWN.equals (typeString)) {
@@ -4506,7 +4441,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = domEvent.QueryInterface (nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -3663,7 +3663,7 @@
+@@ -3663,7 +3663,7 @@ int HandleEvent (int /*long*/ event) {
case SWT.SCROLL_LOCK: return XPCOM.NS_OK;
}
@@ -4515,7 +4450,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = domEvent.QueryInterface (nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -3713,7 +3713,7 @@
+@@ -3713,7 +3713,7 @@ int HandleEvent (int /*long*/ event) {
}
if (XPCOM.DOMEVENT_KEYUP.equals (typeString)) {
@@ -4524,7 +4459,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = domEvent.QueryInterface (nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -3770,7 +3770,7 @@
+@@ -3770,7 +3770,7 @@ int HandleEvent (int /*long*/ event) {
/* mouse event */
@@ -4533,7 +4468,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = domEvent.QueryInterface (nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -3876,10 +3876,10 @@
+@@ -3876,10 +3876,10 @@ int HandleEvent (int /*long*/ event) {
/* nsIBadCertListener2 */
@@ -4546,7 +4481,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
final String urlPort = new String (dest);
-@@ -3889,7 +3889,7 @@
+@@ -3889,7 +3889,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
/* create text descriptions of the certificate problem(s) */
@@ -4555,7 +4490,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
nsISupports supports = new nsISupports (status);
int rc = supports.QueryInterface (nsISSLStatus.NS_ISSLSTATUS_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -3909,7 +3909,7 @@
+@@ -3909,7 +3909,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
rc = sslStatus.GetIsDomainMismatch (intResult);
if (intResult[0] != 0) {
@@ -4564,7 +4499,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = cert.GetCommonName (ptr);
if (rc != XPCOM.NS_OK) SWT.error (rc);
length = XPCOM.nsEmbedString_Length (ptr);
-@@ -3932,7 +3932,7 @@
+@@ -3932,7 +3932,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
nsIX509CertValidity validity = new nsIX509CertValidity(result[0]);
result[0] = 0;
@@ -4573,7 +4508,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = validity.GetNotBeforeGMT (ptr);
if (rc != XPCOM.NS_OK) SWT.error (rc);
length = XPCOM.nsEmbedString_Length (ptr);
-@@ -3961,7 +3961,7 @@
+@@ -3961,7 +3961,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
rc = sslStatus.GetIsUntrusted (intResult);
if (intResult[0] != 0) {
@@ -4582,7 +4517,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = cert.GetIssuerCommonName (ptr);
if (rc != XPCOM.NS_OK) SWT.error (rc);
length = XPCOM.nsEmbedString_Length (ptr);
-@@ -3991,7 +3991,7 @@
+@@ -3991,7 +3991,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
String message = Compatibility.getMessage ("SWT_InvalidCert_Message", new String[] {urlPort}); //$NON-NLS-1$
if (new PromptDialog (browser.getShell ()).invalidCert (browser, message, finalProblems, cert)) {
@@ -4591,7 +4526,7 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -4007,7 +4007,7 @@
+@@ -4007,7 +4007,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
nsICertOverrideService overrideService = new nsICertOverrideService (result[0]);
result[0] = 0;
byte[] hostBytes = MozillaDelegate.wcsToMbcs (null, host, false);
@@ -4600,97 +4535,113 @@ diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browse
rc = overrideService.RememberValidityOverride (hostString, port, cert.getAddress (), finalFlags, 1);
browser.setUrl (url);
XPCOM.nsEmbedCString_delete (hostString);
-diff -urN x86/org/eclipse/swt/browser/PromptDialog.java x86_64/org/eclipse/swt/browser/PromptDialog.java
---- x86/org/eclipse/swt/browser/PromptDialog.java 2009-08-19 16:24:46.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/PromptDialog.java 2009-09-17 08:48:20.000000000 -0400
-@@ -141,7 +141,7 @@
- viewCertButton.setText(Compatibility.getMessage("View Certificate")); //$NON-NLS-1$
- viewCertButton.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event event) {
-- int /*long*/[] result = new int /*long*/[1];
-+ long /*int*/[] result = new long /*int*/[1];
- int rc = XPCOM.NS_GetServiceManager (result);
- if (rc != XPCOM.NS_OK) Mozilla.error (rc);
- if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-diff -urN x86/org/eclipse/swt/browser/PromptService2Factory.java x86_64/org/eclipse/swt/browser/PromptService2Factory.java
---- x86/org/eclipse/swt/browser/PromptService2Factory.java 2008-01-29 15:18:56.000000000 -0500
-+++ x86_64/org/eclipse/swt/browser/PromptService2Factory.java 2009-09-17 08:48:20.000000000 -0400
-@@ -30,17 +30,17 @@
- void createCOMInterfaces () {
- /* Create each of the interfaces that this object implements */
- supports = new XPCOMObject (new int[] {2, 0, 0}) {
-- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
-+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
-+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
- };
-
- factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
-- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-- public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
-- public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
-+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
-+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
-+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
-+ public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
-+ public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
- };
+diff --git a/org/eclipse/swt/browser/MozillaDelegate.java b/org/eclipse/swt/browser/MozillaDelegate.java
+index 76a5d83..f2e31ce 100644
+--- a/org/eclipse/swt/browser/MozillaDelegate.java
++++ b/org/eclipse/swt/browser/MozillaDelegate.java
+@@ -19,11 +19,11 @@ import org.eclipse.swt.widgets.*;
+
+ class MozillaDelegate {
+ Browser browser;
+- int /*long*/ mozillaHandle, embedHandle;
++ long /*int*/ mozillaHandle, embedHandle;
+ boolean hasFocus;
+ Listener listener;
+ static Callback eventCallback;
+- static int /*long*/ eventProc;
++ static long /*int*/ eventProc;
+ static final int STOP_PROPOGATE = 1;
+
+ static boolean IsSparc;
+@@ -47,8 +47,8 @@ MozillaDelegate (Browser browser) {
+ this.browser = browser;
}
-@@ -55,27 +55,27 @@
- }
+-static int /*long*/ eventProc (int /*long*/ handle, int /*long*/ gdkEvent, int /*long*/ pointer) {
+- int /*long*/ parent = OS.gtk_widget_get_parent (handle);
++static long /*int*/ eventProc (long /*int*/ handle, long /*int*/ gdkEvent, long /*int*/ pointer) {
++ long /*int*/ parent = OS.gtk_widget_get_parent (handle);
+ parent = OS.gtk_widget_get_parent (parent);
+ if (parent == 0) return 0;
+ Widget widget = Display.getCurrent ().findWidget (parent);
+@@ -58,12 +58,12 @@ static int /*long*/ eventProc (int /*long*/ handle, int /*long*/ gdkEvent, int /
+ return 0;
}
--int /*long*/ getAddress () {
-+long /*int*/ getAddress () {
- return factory.getAddress ();
+-static Browser findBrowser (int /*long*/ handle) {
++static Browser findBrowser (long /*int*/ handle) {
+ /*
+ * Note. On GTK, Mozilla is embedded into a GtkHBox handle
+ * and not directly into the parent Composite handle.
+ */
+- int /*long*/ parent = OS.gtk_widget_get_parent (handle);
++ long /*int*/ parent = OS.gtk_widget_get_parent (handle);
+ Display display = Display.getCurrent ();
+ return (Browser)display.findWidget (parent);
+ }
+@@ -83,7 +83,7 @@ int createBaseWindow (nsIBaseWindow baseWindow) {
+ return baseWindow.Create ();
}
--int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
-+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
- if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
- nsID guid = new nsID ();
- XPCOM.memmove (guid, riid, nsID.sizeof);
-
- if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
-- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
- AddRef ();
- return XPCOM.NS_OK;
- }
- if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {
-- XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
-+ XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
- AddRef ();
- return XPCOM.NS_OK;
- }
-
-- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
-+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
- return XPCOM.NS_ERROR_NO_INTERFACE;
+-int /*long*/ getHandle () {
++long /*int*/ getHandle () {
+ /*
+ * Bug in Mozilla Linux GTK. Embedding Mozilla into a GtkFixed
+ * handle causes problems with some Mozilla plug-ins. For some
+@@ -112,7 +112,7 @@ String getSWTInitLibraryName () {
+ return "swt-xpcominit"; //$NON-NLS-1$
}
-
-@@ -87,10 +87,10 @@
-
- /* nsIFactory */
--int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
-+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
- PromptService2 promptService = new PromptService2 ();
- promptService.AddRef ();
-- XPCOM.memmove (result, new int /*long*/[] {promptService.getAddress ()}, C.PTR_SIZEOF);
-+ XPCOM.memmove (result, new long /*int*/[] {promptService.getAddress ()}, C.PTR_SIZEOF);
- return XPCOM.NS_OK;
+-int /*long*/ gtk_event (int /*long*/ handle, int /*long*/ gdkEvent, int /*long*/ pointer) {
++long /*int*/ gtk_event (long /*int*/ handle, long /*int*/ gdkEvent, long /*int*/ pointer) {
+ GdkEvent event = new GdkEvent ();
+ OS.memmove (event, gdkEvent, GdkEvent.sizeof);
+ if (event.type == OS.GDK_BUTTON_PRESS) {
+@@ -178,7 +178,7 @@ void init () {
+ * forward the event to the parent embedder before Mozilla received and consumed
+ * them.
+ */
+- int /*long*/ list = OS.gtk_container_get_children (embedHandle);
++ long /*int*/ list = OS.gtk_container_get_children (embedHandle);
+ if (list != 0) {
+ mozillaHandle = OS.g_list_data (list);
+ OS.g_list_free (list);
+@@ -204,7 +204,7 @@ boolean needsSpinup () {
+ return true;
}
-diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt/browser/PromptService2.java
---- x86/org/eclipse/swt/browser/PromptService2.java 2009-08-19 16:24:46.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/PromptService2.java 2009-09-17 08:48:20.000000000 -0400
-@@ -33,41 +33,41 @@
+-void onDispose (int /*long*/ embedHandle) {
++void onDispose (long /*int*/ embedHandle) {
+ if (listener != null) {
+ browser.getDisplay ().removeFilter (SWT.FocusIn, listener);
+ browser.getShell ().removeListener (SWT.Deactivate, listener);
+@@ -216,7 +216,7 @@ void onDispose (int /*long*/ embedHandle) {
+ void removeWindowSubclass () {
+ }
+
+-void setSize (int /*long*/ embedHandle, int width, int height) {
++void setSize (long /*int*/ embedHandle, int width, int height) {
+ OS.gtk_widget_set_size_request (embedHandle, width, height);
+ }
+
+diff --git a/org/eclipse/swt/browser/PromptDialog.java b/org/eclipse/swt/browser/PromptDialog.java
+index df42674..d46c2f5 100644
+--- a/org/eclipse/swt/browser/PromptDialog.java
++++ b/org/eclipse/swt/browser/PromptDialog.java
+@@ -141,7 +141,7 @@ class PromptDialog extends Dialog {
+ viewCertButton.setText(Compatibility.getMessage("View Certificate")); //$NON-NLS-1$
+ viewCertButton.addListener(SWT.Selection, new Listener() {
+ public void handleEvent(Event event) {
+- int /*long*/[] result = new int /*long*/[1];
++ long /*int*/[] result = new long /*int*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+diff --git a/org/eclipse/swt/browser/PromptService2.java b/org/eclipse/swt/browser/PromptService2.java
+index e41b97a..cd60ce5 100644
+--- a/org/eclipse/swt/browser/PromptService2.java
++++ b/org/eclipse/swt/browser/PromptService2.java
+@@ -33,41 +33,41 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -4761,7 +4712,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
};
}
-@@ -86,32 +86,32 @@
+@@ -86,32 +86,32 @@ void disposeCOMInterfaces () {
}
}
@@ -4800,7 +4751,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -121,13 +121,13 @@
+@@ -121,13 +121,13 @@ int Release () {
return refCount;
}
@@ -4816,7 +4767,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
String label = null;
int flag = (buttonFlag & (0xff * index)) / index;
switch (flag) {
-@@ -148,7 +148,7 @@
+@@ -148,7 +148,7 @@ String getLabel (int buttonFlag, int index, int /*long*/ buttonTitle) {
/* nsIPromptService */
@@ -4825,7 +4776,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
final Browser browser = getBrowser (aParent);
int length = XPCOM.strlen_PRUnichar (aDialogTitle);
-@@ -188,7 +188,7 @@
+@@ -188,7 +188,7 @@ int Alert (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText)
return XPCOM.NS_OK;
}
@@ -4834,7 +4785,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
Browser browser = getBrowser (aParent);
int length = XPCOM.strlen_PRUnichar (aDialogTitle);
-@@ -215,11 +215,11 @@
+@@ -215,11 +215,11 @@ int AlertCheck (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aT
return XPCOM.NS_OK;
}
@@ -4848,7 +4799,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
Browser browser = getBrowser (aParent);
int length = XPCOM.strlen_PRUnichar (aDialogTitle);
-@@ -242,11 +242,11 @@
+@@ -242,11 +242,11 @@ int Confirm (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText
return XPCOM.NS_OK;
}
@@ -4862,7 +4813,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
Browser browser = getBrowser (aParent);
int length = XPCOM.strlen_PRUnichar (aDialogTitle);
-@@ -288,7 +288,7 @@
+@@ -288,7 +288,7 @@ int ConfirmEx (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aTe
return XPCOM.NS_OK;
}
@@ -4871,7 +4822,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
Browser browser = getBrowser (aParent);
String titleLabel = null, textLabel, checkLabel = null;
String[] valueLabel = new String[1];
-@@ -306,7 +306,7 @@
+@@ -306,7 +306,7 @@ int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText,
XPCOM.memmove (dest, aText, length * 2);
textLabel = new String (dest);
@@ -4880,7 +4831,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
XPCOM.memmove (valueAddr, aValue, C.PTR_SIZEOF);
if (valueAddr[0] != 0) {
length = XPCOM.strlen_PRUnichar (valueAddr[0]);
-@@ -337,7 +337,7 @@
+@@ -337,7 +337,7 @@ int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText,
* value that we override must be freed using the nsIMemory service.
*/
if (valueLabel[0] != null) {
@@ -4889,7 +4840,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
int rc = XPCOM.NS_GetServiceManager (result2);
if (rc != XPCOM.NS_OK) SWT.error (rc);
if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
-@@ -357,9 +357,9 @@
+@@ -357,9 +357,9 @@ int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText,
char[] buffer = new char[cnt + 1];
valueLabel[0].getChars (0, cnt, buffer, 0);
int size = buffer.length * 2;
@@ -4901,7 +4852,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
if (valueAddr[0] != 0) {
memory.Free (valueAddr[0]);
-@@ -371,7 +371,7 @@
+@@ -371,7 +371,7 @@ int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText,
return XPCOM.NS_OK;
}
@@ -4910,7 +4861,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
nsIAuthInformation auth = new nsIAuthInformation (authInfo);
Browser browser = getBrowser (aParent);
-@@ -425,11 +425,11 @@
+@@ -425,11 +425,11 @@ int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*lon
/* get initial username and password values */
@@ -4924,7 +4875,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
char[] chars = new char[length];
XPCOM.memmove (chars, buffer, length * 2);
userLabel[0] = new String (chars);
-@@ -458,13 +458,13 @@
+@@ -458,13 +458,13 @@ int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*lon
XPCOM.nsEmbedString_delete (ptr);
nsIChannel channel = new nsIChannel (aChannel);
@@ -4940,7 +4891,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
rc = nsURI.GetHost (host);
if (rc != XPCOM.NS_OK) SWT.error (rc);
length = XPCOM.nsEmbedCString_Length (host);
-@@ -505,7 +505,7 @@
+@@ -505,7 +505,7 @@ int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*lon
return XPCOM.NS_OK;
}
@@ -4949,7 +4900,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
Browser browser = getBrowser (aParent);
String user = null, password = null;
-@@ -556,7 +556,7 @@
+@@ -556,7 +556,7 @@ int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle,
XPCOM.memmove (dest, aText, length * 2);
textLabel = new String (dest);
@@ -4958,7 +4909,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);
if (userAddr[0] != 0) {
length = XPCOM.strlen_PRUnichar (userAddr[0]);
-@@ -565,7 +565,7 @@
+@@ -565,7 +565,7 @@ int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle,
userLabel[0] = new String (dest);
}
@@ -4967,7 +4918,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);
if (passAddr[0] != 0) {
length = XPCOM.strlen_PRUnichar (passAddr[0]);
-@@ -603,12 +603,12 @@
+@@ -603,12 +603,12 @@ int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle,
* User name and password are returned as PRUnichar values. Any default
* value that we override must be freed using the nsIMemory service.
*/
@@ -4983,7 +4934,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) SWT.error (rc);
if (result[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
-@@ -633,9 +633,9 @@
+@@ -633,9 +633,9 @@ int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle,
char[] buffer = new char[cnt + 1];
user.getChars (0, cnt, buffer, 0);
int size = buffer.length * 2;
@@ -4995,7 +4946,7 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
cnt = password.length ();
buffer = new char[cnt + 1];
-@@ -643,17 +643,17 @@
+@@ -643,17 +643,17 @@ int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle,
size = buffer.length * 2;
ptr = C.malloc (size);
XPCOM.memmove (ptr, buffer, size);
@@ -5016,10 +4967,87 @@ diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-diff -urN x86/org/eclipse/swt/browser/SimpleEnumerator.java x86_64/org/eclipse/swt/browser/SimpleEnumerator.java
---- x86/org/eclipse/swt/browser/SimpleEnumerator.java 2007-08-01 15:57:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/SimpleEnumerator.java 2009-09-17 08:48:20.000000000 -0400
-@@ -36,17 +36,17 @@
+diff --git a/org/eclipse/swt/browser/PromptService2Factory.java b/org/eclipse/swt/browser/PromptService2Factory.java
+index 89fdc66..7971793 100644
+--- a/org/eclipse/swt/browser/PromptService2Factory.java
++++ b/org/eclipse/swt/browser/PromptService2Factory.java
+@@ -30,17 +30,17 @@ int AddRef () {
+ void createCOMInterfaces () {
+ /* Create each of the interfaces that this object implements */
+ supports = new XPCOMObject (new int[] {2, 0, 0}) {
+- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
++ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
++ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
++ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ };
+
+ factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
+- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+- public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
+- public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
++ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
++ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
++ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
++ public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
++ public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
+ };
+ }
+
+@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
+ }
+ }
+
+-int /*long*/ getAddress () {
++long /*int*/ getAddress () {
+ return factory.getAddress ();
+ }
+
+-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
++int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
+ if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
+ nsID guid = new nsID ();
+ XPCOM.memmove (guid, riid, nsID.sizeof);
+
+ if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
+- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
++ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ AddRef ();
+ return XPCOM.NS_OK;
+ }
+ if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {
+- XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
++ XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
+ AddRef ();
+ return XPCOM.NS_OK;
+ }
+
+- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
++ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
+ return XPCOM.NS_ERROR_NO_INTERFACE;
+ }
+
+@@ -87,10 +87,10 @@ int Release () {
+
+ /* nsIFactory */
+
+-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
++int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
+ PromptService2 promptService = new PromptService2 ();
+ promptService.AddRef ();
+- XPCOM.memmove (result, new int /*long*/[] {promptService.getAddress ()}, C.PTR_SIZEOF);
++ XPCOM.memmove (result, new long /*int*/[] {promptService.getAddress ()}, C.PTR_SIZEOF);
+ return XPCOM.NS_OK;
+ }
+
+diff --git a/org/eclipse/swt/browser/SimpleEnumerator.java b/org/eclipse/swt/browser/SimpleEnumerator.java
+index 4be8516..5277bda 100644
+--- a/org/eclipse/swt/browser/SimpleEnumerator.java
++++ b/org/eclipse/swt/browser/SimpleEnumerator.java
+@@ -36,17 +36,17 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -5045,7 +5073,7 @@ diff -urN x86/org/eclipse/swt/browser/SimpleEnumerator.java x86_64/org/eclipse/s
};
}
-@@ -67,27 +67,27 @@
+@@ -67,27 +67,27 @@ void disposeCOMInterfaces () {
}
}
@@ -5078,7 +5106,7 @@ diff -urN x86/org/eclipse/swt/browser/SimpleEnumerator.java x86_64/org/eclipse/s
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -97,17 +97,17 @@
+@@ -97,17 +97,17 @@ int Release () {
return refCount;
}
@@ -5099,10 +5127,11 @@ diff -urN x86/org/eclipse/swt/browser/SimpleEnumerator.java x86_64/org/eclipse/s
return XPCOM.NS_OK;
}
}
-diff -urN x86/org/eclipse/swt/browser/WindowCreator2.java x86_64/org/eclipse/swt/browser/WindowCreator2.java
---- x86/org/eclipse/swt/browser/WindowCreator2.java 2007-08-01 15:57:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/WindowCreator2.java 2009-09-17 08:48:20.000000000 -0400
-@@ -35,24 +35,24 @@
+diff --git a/org/eclipse/swt/browser/WindowCreator2.java b/org/eclipse/swt/browser/WindowCreator2.java
+index 17ca051..9a91ba8 100644
+--- a/org/eclipse/swt/browser/WindowCreator2.java
++++ b/org/eclipse/swt/browser/WindowCreator2.java
+@@ -35,24 +35,24 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -5139,7 +5168,7 @@ diff -urN x86/org/eclipse/swt/browser/WindowCreator2.java x86_64/org/eclipse/swt
};
}
-@@ -72,32 +72,32 @@
+@@ -72,32 +72,32 @@ void disposeCOMInterfaces () {
}
}
@@ -5178,7 +5207,7 @@ diff -urN x86/org/eclipse/swt/browser/WindowCreator2.java x86_64/org/eclipse/swt
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -109,26 +109,26 @@
+@@ -109,26 +109,26 @@ int Release () {
/* nsIWindowCreator */
@@ -5209,7 +5238,7 @@ diff -urN x86/org/eclipse/swt/browser/WindowCreator2.java x86_64/org/eclipse/swt
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -136,7 +136,7 @@
+@@ -136,7 +136,7 @@ int CreateChromeWindow2 (int /*long*/ parent, int chromeFlags, int contextFlags,
nsIBaseWindow baseWindow = new nsIBaseWindow (result[0]);
result[0] = 0;
@@ -5218,7 +5247,7 @@ diff -urN x86/org/eclipse/swt/browser/WindowCreator2.java x86_64/org/eclipse/swt
rc = baseWindow.GetParentNativeWindow (aParentNativeWindow);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (aParentNativeWindow[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -178,11 +178,11 @@
+@@ -178,11 +178,11 @@ int CreateChromeWindow2 (int /*long*/ parent, int chromeFlags, int contextFlags,
});
if (uri != 0) {
nsIURI location = new nsIURI (uri);
@@ -5232,7 +5261,7 @@ diff -urN x86/org/eclipse/swt/browser/WindowCreator2.java x86_64/org/eclipse/swt
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
browser.setUrl (new String (dest));
-@@ -211,11 +211,11 @@
+@@ -211,11 +211,11 @@ int CreateChromeWindow2 (int /*long*/ parent, int chromeFlags, int contextFlags,
if (doit) {
Mozilla mozilla = (Mozilla)browser.webBrowser;
mozilla.isChild = true;
@@ -5246,10 +5275,11 @@ diff -urN x86/org/eclipse/swt/browser/WindowCreator2.java x86_64/org/eclipse/swt
} else {
if (cancel != 0) {
C.memmove (cancel, new int[] {1}, 4); /* PRBool */
-diff -urN x86/org/eclipse/swt/dnd/ByteArrayTransfer.java x86_64/org/eclipse/swt/dnd/ByteArrayTransfer.java
---- x86/org/eclipse/swt/dnd/ByteArrayTransfer.java 2008-06-05 13:31:48.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/ByteArrayTransfer.java 2009-09-17 08:48:20.000000000 -0400
-@@ -155,7 +155,7 @@
+diff --git a/org/eclipse/swt/dnd/ByteArrayTransfer.java b/org/eclipse/swt/dnd/ByteArrayTransfer.java
+index 6620e74..e8baa38 100644
+--- a/org/eclipse/swt/dnd/ByteArrayTransfer.java
++++ b/org/eclipse/swt/dnd/ByteArrayTransfer.java
+@@ -155,7 +155,7 @@ protected void javaToNative (Object object, TransferData transferData) {
}
byte[] buffer = (byte[])object;
if (buffer.length == 0) return;
@@ -5258,10 +5288,11 @@ diff -urN x86/org/eclipse/swt/dnd/ByteArrayTransfer.java x86_64/org/eclipse/swt/
if (pValue == 0) return;
OS.memmove(pValue, buffer, buffer.length);
transferData.length = buffer.length;
-diff -urN x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clipboard.java
---- x86/org/eclipse/swt/dnd/Clipboard.java 2009-05-29 17:30:20.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/Clipboard.java 2009-09-17 08:48:20.000000000 -0400
-@@ -32,14 +32,14 @@
+diff --git a/org/eclipse/swt/dnd/Clipboard.java b/org/eclipse/swt/dnd/Clipboard.java
+index 87b1e17..633e8e5 100644
+--- a/org/eclipse/swt/dnd/Clipboard.java
++++ b/org/eclipse/swt/dnd/Clipboard.java
+@@ -32,14 +32,14 @@ public class Clipboard {
private Display display;
@@ -5280,7 +5311,7 @@ diff -urN x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clip
GTKPRIMARYCLIPBOARD = OS.gtk_clipboard_get(primary);
buffer = Converter.wcsToMbcs(null, "TARGETS", true);
TARGET = OS.gdk_atom_intern(buffer, false);
-@@ -287,7 +287,7 @@
+@@ -287,7 +287,7 @@ public Object getContents(Transfer transfer) {
public Object getContents(Transfer transfer, int clipboards) {
checkWidget();
if (transfer == null) DND.error(SWT.ERROR_NULL_ARGUMENT);
@@ -5289,7 +5320,7 @@ diff -urN x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clip
int[] typeIds = transfer.getTypeIds();
for (int i = 0; i < typeIds.length; i++) {
if ((clipboards & DND.CLIPBOARD) != 0) {
-@@ -549,7 +549,7 @@
+@@ -549,7 +549,7 @@ public String[] getAvailableTypeNames() {
String[] result = new String[types1.length + types2.length];
int count = 0;
for (int i = 0; i < types1.length; i++) {
@@ -5298,7 +5329,7 @@ diff -urN x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clip
if (pName == 0) {
continue;
}
-@@ -559,7 +559,7 @@
+@@ -559,7 +559,7 @@ public String[] getAvailableTypeNames() {
result[count++] = "GTKCLIPBOARD "+new String (Converter.mbcsToWcs (null, buffer));
}
for (int i = 0; i < types2.length; i++) {
@@ -5307,7 +5338,7 @@ diff -urN x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clip
if (pName == 0) {
continue;
}
-@@ -578,7 +578,7 @@
+@@ -578,7 +578,7 @@ public String[] getAvailableTypeNames() {
private int[] getAvailablePrimaryTypes() {
int[] types = new int[0];
@@ -5316,7 +5347,7 @@ diff -urN x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clip
if (selection_data != 0) {
try {
GtkSelectionData gtkSelectionData = new GtkSelectionData();
-@@ -595,7 +595,7 @@
+@@ -595,7 +595,7 @@ private int[] getAvailablePrimaryTypes() {
}
private int[] getAvailableClipboardTypes () {
int[] types = new int[0];
@@ -5325,7 +5356,7 @@ diff -urN x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clip
if (selection_data != 0) {
try {
GtkSelectionData gtkSelectionData = new GtkSelectionData();
-@@ -611,11 +611,11 @@
+@@ -611,11 +611,11 @@ private int[] getAvailableClipboardTypes () {
return types;
}
@@ -5339,10 +5370,11 @@ diff -urN x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clip
display.setData(key, null);
return selection_data;
}
-diff -urN x86/org/eclipse/swt/dnd/ClipboardProxy.java x86_64/org/eclipse/swt/dnd/ClipboardProxy.java
---- x86/org/eclipse/swt/dnd/ClipboardProxy.java 2005-09-27 12:51:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/ClipboardProxy.java 2009-09-17 08:48:20.000000000 -0400
-@@ -71,7 +71,7 @@
+diff --git a/org/eclipse/swt/dnd/ClipboardProxy.java b/org/eclipse/swt/dnd/ClipboardProxy.java
+index 6e122cc..649eebb 100644
+--- a/org/eclipse/swt/dnd/ClipboardProxy.java
++++ b/org/eclipse/swt/dnd/ClipboardProxy.java
+@@ -71,7 +71,7 @@ void clear (Clipboard owner, int clipboards) {
}
}
@@ -5351,7 +5383,7 @@ diff -urN x86/org/eclipse/swt/dnd/ClipboardProxy.java x86_64/org/eclipse/swt/dnd
if (clipboard == Clipboard.GTKCLIPBOARD) {
activeClipboard = null;
clipboardData = null;
-@@ -104,7 +104,7 @@
+@@ -104,7 +104,7 @@ void dispose () {
* This function provides the data to the clipboard on request.
* When this clipboard is disposed, the data will no longer be available.
*/
@@ -5360,7 +5392,7 @@ diff -urN x86/org/eclipse/swt/dnd/ClipboardProxy.java x86_64/org/eclipse/swt/dnd
if (selection_data == 0) return 0;
GtkSelectionData selectionData = new GtkSelectionData();
OS.memmove(selectionData, selection_data, GtkSelectionData.sizeof);
-@@ -131,7 +131,7 @@
+@@ -131,7 +131,7 @@ int /*long*/ getFunc(int /*long*/ clipboard, int /*long*/ selection_data, int /*
boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipboards) {
GtkTargetEntry[] entries = new GtkTargetEntry [0];
@@ -5369,7 +5401,7 @@ diff -urN x86/org/eclipse/swt/dnd/ClipboardProxy.java x86_64/org/eclipse/swt/dnd
try {
for (int i = 0; i < dataTypes.length; i++) {
Transfer transfer = dataTypes[i];
-@@ -141,7 +141,7 @@
+@@ -141,7 +141,7 @@ boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipbo
GtkTargetEntry entry = new GtkTargetEntry();
entry.info = typeIds[j];
byte[] buffer = Converter.wcsToMbcs(null, typeNames[j], true);
@@ -5378,7 +5410,7 @@ diff -urN x86/org/eclipse/swt/dnd/ClipboardProxy.java x86_64/org/eclipse/swt/dnd
OS.memmove(pName, buffer, buffer.length);
entry.target = pName;
GtkTargetEntry[] tmp = new GtkTargetEntry [entries.length + 1];
-@@ -161,8 +161,8 @@
+@@ -161,8 +161,8 @@ boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipbo
if (activeClipboard != null) OS.gtk_clipboard_clear(Clipboard.GTKCLIPBOARD);
clipboardData = data;
clipboardDataTypes = dataTypes;
@@ -5389,7 +5421,7 @@ diff -urN x86/org/eclipse/swt/dnd/ClipboardProxy.java x86_64/org/eclipse/swt/dnd
if (!OS.gtk_clipboard_set_with_data(Clipboard.GTKCLIPBOARD, pTargetsList, entries.length, getFuncProc, clearFuncProc, 0)) {
return false;
}
-@@ -172,8 +172,8 @@
+@@ -172,8 +172,8 @@ boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipbo
if (activePrimaryClipboard != null) OS.gtk_clipboard_clear(Clipboard.GTKPRIMARYCLIPBOARD);
primaryClipboardData = data;
primaryClipboardDataTypes = dataTypes;
@@ -5400,10 +5432,11 @@ diff -urN x86/org/eclipse/swt/dnd/ClipboardProxy.java x86_64/org/eclipse/swt/dnd
if (!OS.gtk_clipboard_set_with_data(Clipboard.GTKPRIMARYCLIPBOARD, pTargetsList, entries.length, getFuncProc, clearFuncProc, 0)) {
return false;
}
-diff -urN x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/DragSource.java
---- x86/org/eclipse/swt/dnd/DragSource.java 2009-05-29 17:30:20.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/DragSource.java 2009-09-17 08:48:20.000000000 -0400
-@@ -106,7 +106,7 @@
+diff --git a/org/eclipse/swt/dnd/DragSource.java b/org/eclipse/swt/dnd/DragSource.java
+index 3874254..8aacf58 100644
+--- a/org/eclipse/swt/dnd/DragSource.java
++++ b/org/eclipse/swt/dnd/DragSource.java
+@@ -106,7 +106,7 @@ public class DragSource extends Widget {
Transfer[] transferAgents = new Transfer[0];
DragSourceEffect dragEffect;
@@ -5412,7 +5445,7 @@ diff -urN x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Dra
//workaround - remember action performed for DragEnd
boolean moveData = false;
-@@ -207,28 +207,28 @@
+@@ -207,28 +207,28 @@ static int checkStyle (int style) {
return style;
}
@@ -5445,7 +5478,7 @@ diff -urN x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Dra
Display display = Display.findDisplay(Thread.currentThread());
if (display == null || display.isDisposed()) return null;
Widget widget = display.findWidget(handle);
-@@ -297,15 +297,15 @@
+@@ -297,15 +297,15 @@ void drag(Event dragEvent) {
int actions = opToOsOp(getStyle());
Image image = event.image;
@@ -5464,7 +5497,7 @@ diff -urN x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Dra
/*
* Bug in GTK. If a drag is initiated using gtk_drag_begin and the
* mouse is released immediately, the mouse and keyboard remain
-@@ -341,7 +341,7 @@
+@@ -341,7 +341,7 @@ void dragEnd(int /*long*/ widget, int /*long*/ context){
moveData = false;
}
@@ -5473,7 +5506,7 @@ diff -urN x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Dra
if (selection_data == 0) return;
GtkSelectionData gtkSelectionData = new GtkSelectionData();
OS.memmove(gtkSelectionData, selection_data, GtkSelectionData.sizeof);
-@@ -376,7 +376,7 @@
+@@ -376,7 +376,7 @@ void dragGetData(int /*long*/ widget, int /*long*/ context, int /*long*/ selecti
return;
}
@@ -5482,7 +5515,7 @@ diff -urN x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Dra
moveData = true;
}
-@@ -564,7 +564,7 @@
+@@ -564,7 +564,7 @@ public void setTransfer(Transfer[] transferAgents){
}
}
@@ -5491,7 +5524,7 @@ diff -urN x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Dra
for (int i = 0; i < targets.length; i++) {
OS.memmove(pTargets + i*GtkTargetEntry.sizeof, targets[i], GtkTargetEntry.sizeof);
}
-@@ -575,29 +575,29 @@
+@@ -575,29 +575,29 @@ public void setTransfer(Transfer[] transferAgents){
}
}
@@ -5529,7 +5562,7 @@ diff -urN x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Dra
OS.memmove(maskLine, maskOffset, maskStride);
for (int x=0; x<w[0]; x++) {
if (maskLine[x * 3] == 0) {
-@@ -616,10 +616,10 @@
+@@ -616,10 +616,10 @@ static int /*long*/ createPixbuf(Image image) {
if (hasAlpha) {
byte [] alpha = data.alphaData;
int stride = OS.gdk_pixbuf_get_rowstride (pixbuf);
@@ -5542,10 +5575,11 @@ diff -urN x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Dra
OS.memmove (line, offset, stride);
for (int x = 0; x < w [0]; x++) {
line [x*4+3] = alpha [y*w [0]+x];
-diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/DropTarget.java
---- x86/org/eclipse/swt/dnd/DropTarget.java 2009-05-29 17:30:20.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/DropTarget.java 2009-09-17 08:48:20.000000000 -0400
-@@ -245,33 +245,33 @@
+diff --git a/org/eclipse/swt/dnd/DropTarget.java b/org/eclipse/swt/dnd/DropTarget.java
+index c9cc25a..1f5166d 100644
+--- a/org/eclipse/swt/dnd/DropTarget.java
++++ b/org/eclipse/swt/dnd/DropTarget.java
+@@ -245,33 +245,33 @@ static int checkStyle (int style) {
return style;
}
@@ -5584,7 +5618,7 @@ diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Dro
Display display = Display.findDisplay(Thread.currentThread());
if (display == null || display.isDisposed()) return null;
Widget widget = display.findWidget(handle);
-@@ -332,7 +332,7 @@
+@@ -332,7 +332,7 @@ protected void checkSubclass () {
}
}
@@ -5593,7 +5627,7 @@ diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Dro
DNDEvent event = new DNDEvent();
if (data == 0 || !setEventData(context, x, y, time, event)) {
keyOperation = -1;
-@@ -380,7 +380,7 @@
+@@ -380,7 +380,7 @@ void drag_data_received ( int /*long*/ widget, int /*long*/ context, int x, int
return;
}
@@ -5602,7 +5636,7 @@ diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Dro
DNDEvent event = new DNDEvent();
if (!setEventData(context, x, y, time, event)) {
keyOperation = -1;
-@@ -417,7 +417,7 @@
+@@ -417,7 +417,7 @@ boolean drag_drop(int /*long*/ widget, int /*long*/ context, int x, int y, int t
return true;
}
@@ -5611,7 +5645,7 @@ diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Dro
updateDragOverHover(0, null);
if (keyOperation == -1) return;
-@@ -430,7 +430,7 @@
+@@ -430,7 +430,7 @@ void drag_leave ( int /*long*/ widget, int /*long*/ context, int time){
notifyListeners(DND.DragLeave, event);
}
@@ -5620,7 +5654,7 @@ diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Dro
int oldKeyOperation = keyOperation;
/*
-@@ -694,7 +694,7 @@
+@@ -694,7 +694,7 @@ public void setTransfer(Transfer[] transferAgents){
}
}
@@ -5629,7 +5663,7 @@ diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Dro
for (int i = 0; i < targets.length; i++) {
OS.memmove(pTargets + i*GtkTargetEntry.sizeof, targets[i], GtkTargetEntry.sizeof);
}
-@@ -702,7 +702,7 @@
+@@ -702,7 +702,7 @@ public void setTransfer(Transfer[] transferAgents){
int actions = opToOsOp(getStyle());
if (control instanceof Combo) {
if ((control.getStyle() & SWT.READ_ONLY) == 0) {
@@ -5638,7 +5672,7 @@ diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Dro
if (entryHandle != 0) {
OS.gtk_drag_dest_unset(entryHandle);
}
-@@ -728,7 +728,7 @@
+@@ -728,7 +728,7 @@ public void setDropTargetEffect(DropTargetEffect effect) {
dropEffect = effect;
}
@@ -5647,7 +5681,7 @@ diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Dro
if (context == 0) return false;
GdkDragContext dragContext = new GdkDragContext();
OS.memmove(dragContext, context, GdkDragContext.sizeof);
-@@ -754,7 +754,7 @@
+@@ -754,7 +754,7 @@ boolean setEventData(int /*long*/ context, int x, int y, int time, DNDEvent even
int length = OS.g_list_length(dragContext.targets);
TransferData[] dataTypes = new TransferData[0];
for (int i = 0; i < length; i++) {
@@ -5656,7 +5690,7 @@ diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Dro
GtkTargetPair gtkTargetPair = new GtkTargetPair();
OS.memmove(gtkTargetPair, pData, GtkTargetPair.sizeof);
TransferData data = new TransferData();
-@@ -772,7 +772,7 @@
+@@ -772,7 +772,7 @@ boolean setEventData(int /*long*/ context, int x, int y, int time, DNDEvent even
}
if (dataTypes.length == 0) return false;
@@ -5665,10 +5699,11 @@ diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Dro
int [] origin_x = new int[1], origin_y = new int[1];
OS.gdk_window_get_origin(window, origin_x, origin_y);
Point coordinates = new Point(origin_x[0] + x, origin_y[0] + y);
-diff -urN x86/org/eclipse/swt/dnd/FileTransfer.java x86_64/org/eclipse/swt/dnd/FileTransfer.java
---- x86/org/eclipse/swt/dnd/FileTransfer.java 2009-05-29 17:30:22.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/FileTransfer.java 2009-09-17 08:48:20.000000000 -0400
-@@ -85,13 +85,13 @@
+diff --git a/org/eclipse/swt/dnd/FileTransfer.java b/org/eclipse/swt/dnd/FileTransfer.java
+index 8b0338f..f02ac24 100644
+--- a/org/eclipse/swt/dnd/FileTransfer.java
++++ b/org/eclipse/swt/dnd/FileTransfer.java
+@@ -85,13 +85,13 @@ public void javaToNative(Object object, TransferData transferData) {
if (length == 0) continue;
char[] chars = new char[length];
string.getChars(0, length, chars, 0);
@@ -5686,7 +5721,7 @@ diff -urN x86/org/eclipse/swt/dnd/FileTransfer.java x86_64/org/eclipse/swt/dnd/F
OS.g_free(localePtr);
if (error[0] != 0 || uriPtr == 0) continue;
length = OS.strlen(uriPtr);
-@@ -111,7 +111,7 @@
+@@ -111,7 +111,7 @@ public void javaToNative(Object object, TransferData transferData) {
buffer = newBuffer;
}
if (buffer.length == 0) return;
@@ -5695,7 +5730,7 @@ diff -urN x86/org/eclipse/swt/dnd/FileTransfer.java x86_64/org/eclipse/swt/dnd/F
OS.memset(ptr, '\0', buffer.length+1);
OS.memmove(ptr, buffer, buffer.length);
transferData.pValue = ptr;
-@@ -137,7 +137,7 @@
+@@ -137,7 +137,7 @@ public Object nativeToJava(TransferData transferData) {
OS.memmove(temp, transferData.pValue, length);
boolean gnomeList = transferData.type == GNOME_LIST_ID;
int sepLength = gnomeList ? 1 : 2;
@@ -5704,7 +5739,7 @@ diff -urN x86/org/eclipse/swt/dnd/FileTransfer.java x86_64/org/eclipse/swt/dnd/F
int offset = 0;
for (int i = 0; i < temp.length - 1; i++) {
boolean terminator = gnomeList ? temp[i] == '\n' : temp[i] == '\r' && temp[i+1] == '\n';
-@@ -145,11 +145,11 @@
+@@ -145,11 +145,11 @@ public Object nativeToJava(TransferData transferData) {
if (!(gnomeList && offset == 0)) {
/* The content of the first line in a gnome-list is always either 'copy' or 'cut' */
int size = i - offset;
@@ -5718,7 +5753,7 @@ diff -urN x86/org/eclipse/swt/dnd/FileTransfer.java x86_64/org/eclipse/swt/dnd/F
System.arraycopy(files, 0, newFiles, 0, files.length);
newFiles[files.length] = file;
files = newFiles;
-@@ -159,26 +159,26 @@
+@@ -159,26 +159,26 @@ public Object nativeToJava(TransferData transferData) {
}
if (offset < temp.length - sepLength) {
int size = temp.length - offset;
@@ -5752,10 +5787,11 @@ diff -urN x86/org/eclipse/swt/dnd/FileTransfer.java x86_64/org/eclipse/swt/dnd/F
OS.g_free(utf8Ptr);
length = (int)/*64*/items_written[0];
char[] buffer = new char[length];
-diff -urN x86/org/eclipse/swt/dnd/HTMLTransfer.java x86_64/org/eclipse/swt/dnd/HTMLTransfer.java
---- x86/org/eclipse/swt/dnd/HTMLTransfer.java 2008-06-05 13:31:50.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/HTMLTransfer.java 2009-09-17 08:48:20.000000000 -0400
-@@ -65,7 +65,7 @@
+diff --git a/org/eclipse/swt/dnd/HTMLTransfer.java b/org/eclipse/swt/dnd/HTMLTransfer.java
+index 5d0ccae..a83bcfa 100644
+--- a/org/eclipse/swt/dnd/HTMLTransfer.java
++++ b/org/eclipse/swt/dnd/HTMLTransfer.java
+@@ -65,7 +65,7 @@ public void javaToNative (Object object, TransferData transferData){
char [] chars = new char[charCount +1];
string.getChars(0, charCount , chars, 0);
int byteCount = chars.length*2;
@@ -5764,10 +5800,11 @@ diff -urN x86/org/eclipse/swt/dnd/HTMLTransfer.java x86_64/org/eclipse/swt/dnd/H
if (pValue == 0) return;
OS.memmove(pValue, chars, byteCount);
transferData.length = byteCount;
-diff -urN x86/org/eclipse/swt/dnd/ImageTransfer.java x86_64/org/eclipse/swt/dnd/ImageTransfer.java
---- x86/org/eclipse/swt/dnd/ImageTransfer.java 2009-05-29 17:30:20.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/ImageTransfer.java 2009-09-17 08:48:20.000000000 -0400
-@@ -89,12 +89,12 @@
+diff --git a/org/eclipse/swt/dnd/ImageTransfer.java b/org/eclipse/swt/dnd/ImageTransfer.java
+index cf28027..9061bc0 100644
+--- a/org/eclipse/swt/dnd/ImageTransfer.java
++++ b/org/eclipse/swt/dnd/ImageTransfer.java
+@@ -89,12 +89,12 @@ public void javaToNative(Object object, TransferData transferData) {
ImageData imgData = (ImageData)object;
if (imgData == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
Image image = new Image(Display.getCurrent(), imgData);
@@ -5783,7 +5820,7 @@ diff -urN x86/org/eclipse/swt/dnd/ImageTransfer.java x86_64/org/eclipse/swt/dnd/
OS.gdk_pixbuf_get_from_drawable(pixbuf, pixmap, colormap, 0, 0, 0, 0, width, height);
String typeStr = "";
-@@ -110,8 +110,8 @@
+@@ -110,8 +110,8 @@ public void javaToNative(Object object, TransferData transferData) {
if (transferData.type == XPM_ID) typeStr = "xpm";
if (transferData.type == XV_ID) typeStr = "xv";
byte[] type = Converter.wcsToMbcs(null, typeStr , true);
@@ -5794,7 +5831,7 @@ diff -urN x86/org/eclipse/swt/dnd/ImageTransfer.java x86_64/org/eclipse/swt/dnd/
if (type == null) return;
OS.gdk_pixbuf_save_to_bufferv(pixbuf, buffer, len, type, null, null, null);
OS.g_object_unref(pixbuf);
-@@ -136,15 +136,15 @@
+@@ -136,15 +136,15 @@ public Object nativeToJava(TransferData transferData) {
ImageData imgData = null;
if (transferData.length > 0)
{
@@ -5814,10 +5851,11 @@ diff -urN x86/org/eclipse/swt/dnd/ImageTransfer.java x86_64/org/eclipse/swt/dnd/
if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.g_object_unref(loader);
Image img = Image.gtk_new(Display.getCurrent(), SWT.BITMAP, handle, 0);
-diff -urN x86/org/eclipse/swt/dnd/RTFTransfer.java x86_64/org/eclipse/swt/dnd/RTFTransfer.java
---- x86/org/eclipse/swt/dnd/RTFTransfer.java 2008-06-05 13:31:48.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/RTFTransfer.java 2009-09-17 08:48:20.000000000 -0400
-@@ -65,7 +65,7 @@
+diff --git a/org/eclipse/swt/dnd/RTFTransfer.java b/org/eclipse/swt/dnd/RTFTransfer.java
+index 74aae33..98284e6 100644
+--- a/org/eclipse/swt/dnd/RTFTransfer.java
++++ b/org/eclipse/swt/dnd/RTFTransfer.java
+@@ -65,7 +65,7 @@ public void javaToNative (Object object, TransferData transferData){
}
String string = (String)object;
byte [] buffer = Converter.wcsToMbcs (null, string, true);
@@ -5826,10 +5864,11 @@ diff -urN x86/org/eclipse/swt/dnd/RTFTransfer.java x86_64/org/eclipse/swt/dnd/RT
if (pValue == 0) return;
OS.memmove(pValue, buffer, buffer.length);
transferData.length = buffer.length - 1;
-diff -urN x86/org/eclipse/swt/dnd/TableDragSourceEffect.java x86_64/org/eclipse/swt/dnd/TableDragSourceEffect.java
---- x86/org/eclipse/swt/dnd/TableDragSourceEffect.java 2008-06-05 13:31:50.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/TableDragSourceEffect.java 2009-09-17 08:48:20.000000000 -0400
-@@ -88,26 +88,26 @@
+diff --git a/org/eclipse/swt/dnd/TableDragSourceEffect.java b/org/eclipse/swt/dnd/TableDragSourceEffect.java
+index b3656bb..4b0e9cd 100644
+--- a/org/eclipse/swt/dnd/TableDragSourceEffect.java
++++ b/org/eclipse/swt/dnd/TableDragSourceEffect.java
+@@ -88,26 +88,26 @@ public class TableDragSourceEffect extends DragSourceEffect {
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
*/
@@ -5864,7 +5903,7 @@ diff -urN x86/org/eclipse/swt/dnd/TableDragSourceEffect.java x86_64/org/eclipse/
OS.gtk_tree_view_get_cell_area (handle, path, 0, rect);
pixmaps[i] = OS.gtk_tree_view_create_row_drag_icon(handle, path);
OS.gdk_drawable_get_size(pixmaps[i], w, h);
-@@ -116,10 +116,10 @@
+@@ -116,10 +116,10 @@ public class TableDragSourceEffect extends DragSourceEffect {
yy[i] = rect.y;
hh[i] = h[0];
}
@@ -5879,10 +5918,11 @@ diff -urN x86/org/eclipse/swt/dnd/TableDragSourceEffect.java x86_64/org/eclipse/
GdkColor color = new GdkColor();
color.pixel = 0;
OS.gdk_gc_set_foreground(gcMask, color);
-diff -urN x86/org/eclipse/swt/dnd/TableDropTargetEffect.java x86_64/org/eclipse/swt/dnd/TableDropTargetEffect.java
---- x86/org/eclipse/swt/dnd/TableDropTargetEffect.java 2008-06-05 13:31:48.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/TableDropTargetEffect.java 2009-09-17 08:48:20.000000000 -0400
-@@ -102,7 +102,7 @@
+diff --git a/org/eclipse/swt/dnd/TableDropTargetEffect.java b/org/eclipse/swt/dnd/TableDropTargetEffect.java
+index f4ab889..b716e6b 100644
+--- a/org/eclipse/swt/dnd/TableDropTargetEffect.java
++++ b/org/eclipse/swt/dnd/TableDropTargetEffect.java
+@@ -102,7 +102,7 @@ public class TableDropTargetEffect extends DropTargetEffect {
*/
public void dragLeave(DropTargetEvent event) {
Table table = (Table) control;
@@ -5891,7 +5931,7 @@ diff -urN x86/org/eclipse/swt/dnd/TableDropTargetEffect.java x86_64/org/eclipse/
OS.gtk_tree_view_set_drag_dest_row(handle, 0, OS.GTK_TREE_VIEW_DROP_BEFORE);
scrollBeginTime = 0;
-@@ -128,15 +128,15 @@
+@@ -128,15 +128,15 @@ public class TableDropTargetEffect extends DropTargetEffect {
*/
public void dragOver(DropTargetEvent event) {
Table table = (Table) control;
@@ -5910,10 +5950,11 @@ diff -urN x86/org/eclipse/swt/dnd/TableDropTargetEffect.java x86_64/org/eclipse/
if (indices != 0) {
int[] temp = new int[1];
OS.memmove (temp, indices, 4);
-diff -urN x86/org/eclipse/swt/dnd/TextTransfer.java x86_64/org/eclipse/swt/dnd/TextTransfer.java
---- x86/org/eclipse/swt/dnd/TextTransfer.java 2008-06-05 13:31:50.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/TextTransfer.java 2009-09-17 08:48:20.000000000 -0400
-@@ -66,9 +66,9 @@
+diff --git a/org/eclipse/swt/dnd/TextTransfer.java b/org/eclipse/swt/dnd/TextTransfer.java
+index 6a6dabc..df7b952 100644
+--- a/org/eclipse/swt/dnd/TextTransfer.java
++++ b/org/eclipse/swt/dnd/TextTransfer.java
+@@ -66,9 +66,9 @@ public void javaToNative (Object object, TransferData transferData) {
String string = (String)object;
byte[] utf8 = Converter.wcsToMbcs (null, string, true);
if (transferData.type == COMPOUND_TEXT_ID) {
@@ -5925,7 +5966,7 @@ diff -urN x86/org/eclipse/swt/dnd/TextTransfer.java x86_64/org/eclipse/swt/dnd/T
int[] length = new int[1];
boolean result = OS.gdk_utf8_to_compound_text(utf8, encoding, format, ctext, length);
if (!result) return;
-@@ -79,7 +79,7 @@
+@@ -79,7 +79,7 @@ public void javaToNative (Object object, TransferData transferData) {
transferData.result = 1;
}
if (transferData.type == UTF8_STRING_ID) {
@@ -5934,7 +5975,7 @@ diff -urN x86/org/eclipse/swt/dnd/TextTransfer.java x86_64/org/eclipse/swt/dnd/T
if (pValue == 0) return;
OS.memmove(pValue, utf8, utf8.length);
transferData.type = UTF8_STRING_ID;
-@@ -89,7 +89,7 @@
+@@ -89,7 +89,7 @@ public void javaToNative (Object object, TransferData transferData) {
transferData.result = 1;
}
if (transferData.type == STRING_ID) {
@@ -5943,7 +5984,7 @@ diff -urN x86/org/eclipse/swt/dnd/TextTransfer.java x86_64/org/eclipse/swt/dnd/T
if (string_target == 0) return;
transferData.type = STRING_ID;
transferData.format = 8;
-@@ -110,10 +110,10 @@
+@@ -110,10 +110,10 @@ public void javaToNative (Object object, TransferData transferData) {
*/
public Object nativeToJava(TransferData transferData){
if (!isSupportedType(transferData) || transferData.pValue == 0) return null;
@@ -5956,10 +5997,11 @@ diff -urN x86/org/eclipse/swt/dnd/TextTransfer.java x86_64/org/eclipse/swt/dnd/T
OS.memmove(ptr, list[0], OS.PTR_SIZEOF);
int length = OS.strlen(ptr[0]);
byte[] utf8 = new byte[length];
-diff -urN x86/org/eclipse/swt/dnd/TransferData.java x86_64/org/eclipse/swt/dnd/TransferData.java
---- x86/org/eclipse/swt/dnd/TransferData.java 2008-06-05 13:31:48.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/TransferData.java 2009-09-17 08:48:20.000000000 -0400
-@@ -38,7 +38,7 @@
+diff --git a/org/eclipse/swt/dnd/TransferData.java b/org/eclipse/swt/dnd/TransferData.java
+index 275a9da..09e766e 100644
+--- a/org/eclipse/swt/dnd/TransferData.java
++++ b/org/eclipse/swt/dnd/TransferData.java
+@@ -38,7 +38,7 @@ public class TransferData {
* platforms and should never be accessed from application code.
* </p>
*/
@@ -5968,7 +6010,7 @@ diff -urN x86/org/eclipse/swt/dnd/TransferData.java x86_64/org/eclipse/swt/dnd/T
/**
* Specifies the number of units in pValue.
-@@ -78,7 +78,7 @@
+@@ -78,7 +78,7 @@ public class TransferData {
* platforms and should never be accessed from application code.
* </p>
*/
@@ -5977,10 +6019,11 @@ diff -urN x86/org/eclipse/swt/dnd/TransferData.java x86_64/org/eclipse/swt/dnd/T
/**
* The result field contains the result of converting a
-diff -urN x86/org/eclipse/swt/dnd/TreeDragSourceEffect.java x86_64/org/eclipse/swt/dnd/TreeDragSourceEffect.java
---- x86/org/eclipse/swt/dnd/TreeDragSourceEffect.java 2008-06-05 13:31:48.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/TreeDragSourceEffect.java 2009-09-17 08:48:20.000000000 -0400
-@@ -87,26 +87,26 @@
+diff --git a/org/eclipse/swt/dnd/TreeDragSourceEffect.java b/org/eclipse/swt/dnd/TreeDragSourceEffect.java
+index f6e0067..81f0a21 100644
+--- a/org/eclipse/swt/dnd/TreeDragSourceEffect.java
++++ b/org/eclipse/swt/dnd/TreeDragSourceEffect.java
+@@ -87,26 +87,26 @@ public class TreeDragSourceEffect extends DragSourceEffect {
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
*/
@@ -6015,7 +6058,7 @@ diff -urN x86/org/eclipse/swt/dnd/TreeDragSourceEffect.java x86_64/org/eclipse/s
OS.gtk_tree_view_get_cell_area (handle, path, 0, rect);
pixmaps[i] = OS.gtk_tree_view_create_row_drag_icon(handle, path);
OS.gdk_drawable_get_size(pixmaps[i], w, h);
-@@ -115,10 +115,10 @@
+@@ -115,10 +115,10 @@ public class TreeDragSourceEffect extends DragSourceEffect {
yy[i] = rect.y;
hh[i] = h[0];
}
@@ -6030,10 +6073,11 @@ diff -urN x86/org/eclipse/swt/dnd/TreeDragSourceEffect.java x86_64/org/eclipse/s
GdkColor color = new GdkColor();
color.pixel = 0;
OS.gdk_gc_set_foreground(gcMask, color);
-diff -urN x86/org/eclipse/swt/dnd/TreeDropTargetEffect.java x86_64/org/eclipse/swt/dnd/TreeDropTargetEffect.java
---- x86/org/eclipse/swt/dnd/TreeDropTargetEffect.java 2008-06-05 13:31:48.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/TreeDropTargetEffect.java 2009-09-17 08:48:20.000000000 -0400
-@@ -111,7 +111,7 @@
+diff --git a/org/eclipse/swt/dnd/TreeDropTargetEffect.java b/org/eclipse/swt/dnd/TreeDropTargetEffect.java
+index ace9718..5af4937 100644
+--- a/org/eclipse/swt/dnd/TreeDropTargetEffect.java
++++ b/org/eclipse/swt/dnd/TreeDropTargetEffect.java
+@@ -111,7 +111,7 @@ public class TreeDropTargetEffect extends DropTargetEffect {
*/
public void dragLeave(DropTargetEvent event) {
Tree tree = (Tree) control;
@@ -6042,7 +6086,7 @@ diff -urN x86/org/eclipse/swt/dnd/TreeDropTargetEffect.java x86_64/org/eclipse/s
OS.gtk_tree_view_set_drag_dest_row(handle, 0, OS.GTK_TREE_VIEW_DROP_BEFORE);
scrollBeginTime = 0;
-@@ -142,14 +142,14 @@
+@@ -142,14 +142,14 @@ public class TreeDropTargetEffect extends DropTargetEffect {
Tree tree = (Tree) control;
int effect = checkEffect(event.feedback);
@@ -6060,10 +6104,11 @@ diff -urN x86/org/eclipse/swt/dnd/TreeDropTargetEffect.java x86_64/org/eclipse/s
if (indices != 0) {
int depth = OS.gtk_tree_path_get_depth(path[0]);
int[] temp = new int[depth];
-diff -urN x86/org/eclipse/swt/dnd/URLTransfer.java x86_64/org/eclipse/swt/dnd/URLTransfer.java
---- x86/org/eclipse/swt/dnd/URLTransfer.java 2009-05-29 17:30:22.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/URLTransfer.java 2009-09-17 08:48:20.000000000 -0400
-@@ -66,7 +66,7 @@
+diff --git a/org/eclipse/swt/dnd/URLTransfer.java b/org/eclipse/swt/dnd/URLTransfer.java
+index 63226b1..7e872fb 100644
+--- a/org/eclipse/swt/dnd/URLTransfer.java
++++ b/org/eclipse/swt/dnd/URLTransfer.java
+@@ -66,7 +66,7 @@ public void javaToNative (Object object, TransferData transferData){
char [] chars = new char[charCount +1];
string.getChars(0, charCount , chars, 0);
int byteCount = chars.length*2;
@@ -6072,10 +6117,11 @@ diff -urN x86/org/eclipse/swt/dnd/URLTransfer.java x86_64/org/eclipse/swt/dnd/UR
if (pValue == 0) return;
OS.memmove(pValue, chars, byteCount);
transferData.length = byteCount;
-diff -urN x86/org/eclipse/swt/graphics/Color.java x86_64/org/eclipse/swt/graphics/Color.java
---- x86/org/eclipse/swt/graphics/Color.java 2008-06-05 13:32:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/Color.java 2009-09-17 08:48:24.000000000 -0400
-@@ -115,7 +115,7 @@
+diff --git a/org/eclipse/swt/graphics/Color.java b/org/eclipse/swt/graphics/Color.java
+index e3fae9e..db84dfa 100644
+--- a/org/eclipse/swt/graphics/Color.java
++++ b/org/eclipse/swt/graphics/Color.java
+@@ -115,7 +115,7 @@ void destroy() {
device.gdkColors[pixel] = null;
}
}
@@ -6084,7 +6130,7 @@ diff -urN x86/org/eclipse/swt/graphics/Color.java x86_64/org/eclipse/swt/graphic
OS.gdk_colormap_free_colors(colormap, handle, 1);
handle = null;
}
-@@ -242,7 +242,7 @@
+@@ -242,7 +242,7 @@ void init(int red, int green, int blue) {
gdkColor.red = (short)((red & 0xFF) | ((red & 0xFF) << 8));
gdkColor.green = (short)((green & 0xFF) | ((green & 0xFF) << 8));
gdkColor.blue = (short)((blue & 0xFF) | ((blue & 0xFF) << 8));
@@ -6093,10 +6139,11 @@ diff -urN x86/org/eclipse/swt/graphics/Color.java x86_64/org/eclipse/swt/graphic
if (!OS.gdk_colormap_alloc_color(colormap, gdkColor, true, true)) {
/* Allocate black. */
gdkColor = new GdkColor();
-diff -urN x86/org/eclipse/swt/graphics/Cursor.java x86_64/org/eclipse/swt/graphics/Cursor.java
---- x86/org/eclipse/swt/graphics/Cursor.java 2008-06-05 13:32:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/Cursor.java 2009-09-17 08:48:24.000000000 -0400
-@@ -52,7 +52,7 @@
+diff --git a/org/eclipse/swt/graphics/Cursor.java b/org/eclipse/swt/graphics/Cursor.java
+index ce5768c..755d95e 100644
+--- a/org/eclipse/swt/graphics/Cursor.java
++++ b/org/eclipse/swt/graphics/Cursor.java
+@@ -52,7 +52,7 @@ public final class Cursor extends Resource {
* platforms and should never be accessed from application code.
* </p>
*/
@@ -6105,7 +6152,7 @@ diff -urN x86/org/eclipse/swt/graphics/Cursor.java x86_64/org/eclipse/swt/graphi
static final byte[] APPSTARTING_SRC = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-@@ -284,15 +284,15 @@
+@@ -284,15 +284,15 @@ public Cursor(Device device, ImageData source, int hotspotX, int hotspotY) {
hotspotY >= source.height || hotspotY < 0) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
@@ -6124,7 +6171,7 @@ diff -urN x86/org/eclipse/swt/graphics/Cursor.java x86_64/org/eclipse/swt/graphi
byte[] buffer = source.data;
if (!palette.isDirect || source.depth != 24 || stride != source.bytesPerLine || palette.redMask != 0xFF000000 || palette.greenMask != 0xFF0000 || palette.blueMask != 0xFF00) {
buffer = new byte[source.width * source.height * 4];
-@@ -426,10 +426,10 @@
+@@ -426,10 +426,10 @@ public Cursor(Device device, ImageData source, int hotspotX, int hotspotY) {
init();
}
@@ -6139,7 +6186,7 @@ diff -urN x86/org/eclipse/swt/graphics/Cursor.java x86_64/org/eclipse/swt/graphi
if (sourcePixmap != 0 && maskPixmap != 0) {
GdkColor foreground = new GdkColor();
if (!reverse) foreground.red = foreground.green = foreground.blue = (short)0xFFFF;
-@@ -479,7 +479,7 @@
+@@ -479,7 +479,7 @@ public boolean equals(Object object) {
*
* @private
*/
@@ -6148,10 +6195,11 @@ diff -urN x86/org/eclipse/swt/graphics/Cursor.java x86_64/org/eclipse/swt/graphi
Cursor cursor = new Cursor(device);
cursor.handle = handle;
return cursor;
-diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphics/Device.java
---- x86/org/eclipse/swt/graphics/Device.java 2009-05-29 17:30:26.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/Device.java 2009-09-17 08:48:24.000000000 -0400
-@@ -34,8 +34,8 @@
+diff --git a/org/eclipse/swt/graphics/Device.java b/org/eclipse/swt/graphics/Device.java
+index fbacfcf..2b63eca 100644
+--- a/org/eclipse/swt/graphics/Device.java
++++ b/org/eclipse/swt/graphics/Device.java
+@@ -34,8 +34,8 @@ public abstract class Device implements Drawable {
* platforms and should never be accessed from application code.
* </p>
*/
@@ -6162,7 +6210,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
/* Debugging */
public static boolean DEBUG;
-@@ -53,7 +53,7 @@
+@@ -53,7 +53,7 @@ public abstract class Device implements Drawable {
boolean disposed;
/* Warning and Error Handlers */
@@ -6171,7 +6219,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
Callback logCallback;
//NOT DONE - get list of valid names
String [] log_domains = {"GLib-GObject", "GLib", "GObject", "Pango", "ATK", "GdkPixbuf", "Gdk", "Gtk", "GnomeVFS"};
-@@ -62,7 +62,7 @@
+@@ -62,7 +62,7 @@ public abstract class Device implements Drawable {
/* X Warning and Error Handlers */
static Callback XErrorCallback, XIOErrorCallback;
@@ -6180,7 +6228,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
static Device[] Devices = new Device[4];
/*
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,7 @@ public abstract class Device implements Drawable {
/* System Font */
Font systemFont;
@@ -6189,7 +6237,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
boolean useXRender;
-@@ -160,7 +160,7 @@
+@@ -160,7 +160,7 @@ void checkCairo() {
try {
/* Check if cairo is available on the system */
byte[] buffer = Converter.wcsToMbcs(null, "libcairo.so.2", true);
@@ -6198,7 +6246,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
if (libcairo != 0) {
OS.dlclose(libcairo);
} else {
-@@ -259,7 +259,7 @@
+@@ -259,7 +259,7 @@ void dispose_Object (Object object) {
}
}
@@ -6207,7 +6255,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
for (int i=0; i<Devices.length; i++) {
Device device = Devices [i];
if (device != null && device.xDisplay == xDisplay) {
-@@ -414,13 +414,13 @@
+@@ -414,13 +414,13 @@ public Point getDPI () {
public FontData[] getFontList (String faceName, boolean scalable) {
checkDevice ();
if (!scalable) return new FontData[0];
@@ -6226,7 +6274,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
OS.pango_context_list_families(context, families, n_families);
int nFds = 0;
FontData[] fds = new FontData[faceName != null ? 4 : n_families[0]];
-@@ -428,7 +428,7 @@
+@@ -428,7 +428,7 @@ public FontData[] getFontList (String faceName, boolean scalable) {
OS.memmove(family, families[0] + i * OS.PTR_SIZEOF, OS.PTR_SIZEOF);
boolean match = true;
if (faceName != null) {
@@ -6235,7 +6283,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
int length = OS.strlen(familyName);
byte[] buffer = new byte[length];
OS.memmove(buffer, familyName, length);
-@@ -439,7 +439,7 @@
+@@ -439,7 +439,7 @@ public FontData[] getFontList (String faceName, boolean scalable) {
OS.pango_font_family_list_faces(family[0], faces, n_faces);
for (int j=0; j<n_faces[0]; j++) {
OS.memmove(face, faces[0] + j * OS.PTR_SIZEOF, OS.PTR_SIZEOF);
@@ -6244,7 +6292,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
Font font = Font.gtk_new(this, fontDesc);
FontData data = font.getFontData()[0];
if (nFds == fds.length) {
-@@ -650,7 +650,7 @@
+@@ -650,7 +650,7 @@ protected void init () {
* @param data the platform specific GC data
* @return the platform specific GC handle
*/
@@ -6253,7 +6301,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
/**
* Invokes platform specific functionality to dispose a GC handle.
-@@ -665,7 +665,7 @@
+@@ -665,7 +665,7 @@ public abstract int /*long*/ internal_new_GC (GCData data);
* @param hDC the platform specific GC handle
* @param data the platform specific GC data
*/
@@ -6262,7 +6310,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
/**
* Returns <code>true</code> if the device has been disposed,
-@@ -706,7 +706,7 @@
+@@ -706,7 +706,7 @@ public boolean loadFont (String path) {
return OS.FcConfigAppFontAddFile (0, buffer);
}
@@ -6271,7 +6319,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
if (warningLevel == 0) {
if (DEBUG || debug) {
new Error ().printStackTrace ();
-@@ -777,7 +777,7 @@
+@@ -777,7 +777,7 @@ protected void release () {
shellHandle = 0;
if (gdkColors != null) {
@@ -6280,7 +6328,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
for (int i = 0; i < gdkColors.length; i++) {
GdkColor color = gdkColors [i];
if (color != null) {
-@@ -870,7 +870,7 @@
+@@ -870,7 +870,7 @@ public void setWarnings (boolean warnings) {
}
}
@@ -6289,7 +6337,7 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
Device device = findDevice (xDisplay);
if (device != null) {
if (device.warningLevel == 0) {
-@@ -886,7 +886,7 @@
+@@ -886,7 +886,7 @@ static int /*long*/ XErrorProc (int /*long*/ xDisplay, int /*long*/ xErrorEvent)
return 0;
}
@@ -6298,10 +6346,11 @@ diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphi
Device device = findDevice (xDisplay);
if (device != null) {
if (DEBUG || device.debug) {
-diff -urN x86/org/eclipse/swt/graphics/Drawable.java x86_64/org/eclipse/swt/graphics/Drawable.java
---- x86/org/eclipse/swt/graphics/Drawable.java 2009-05-29 17:30:12.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/Drawable.java 2009-09-17 08:48:24.000000000 -0400
-@@ -43,7 +43,7 @@
+diff --git a/org/eclipse/swt/graphics/Drawable.java b/org/eclipse/swt/graphics/Drawable.java
+index 2d909d1..450d84f 100644
+--- a/org/eclipse/swt/graphics/Drawable.java
++++ b/org/eclipse/swt/graphics/Drawable.java
+@@ -43,7 +43,7 @@ public interface Drawable {
* @return the platform specific GC handle
*/
@@ -6310,7 +6359,7 @@ diff -urN x86/org/eclipse/swt/graphics/Drawable.java x86_64/org/eclipse/swt/grap
/**
* Invokes platform specific functionality to dispose a GC handle.
-@@ -58,6 +58,6 @@
+@@ -58,6 +58,6 @@ public int /*long*/ internal_new_GC (GCData data);
* @param handle the platform specific GC handle
* @param data the platform specific GC data
*/
@@ -6318,10 +6367,11 @@ diff -urN x86/org/eclipse/swt/graphics/Drawable.java x86_64/org/eclipse/swt/grap
+public void internal_dispose_GC (long /*int*/ handle, GCData data);
}
-diff -urN x86/org/eclipse/swt/graphics/Font.java x86_64/org/eclipse/swt/graphics/Font.java
---- x86/org/eclipse/swt/graphics/Font.java 2008-06-05 13:32:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/Font.java 2009-09-17 08:48:24.000000000 -0400
-@@ -42,7 +42,7 @@
+diff --git a/org/eclipse/swt/graphics/Font.java b/org/eclipse/swt/graphics/Font.java
+index 3607e38..0e7c227 100644
+--- a/org/eclipse/swt/graphics/Font.java
++++ b/org/eclipse/swt/graphics/Font.java
+@@ -42,7 +42,7 @@ public final class Font extends Resource {
* platforms and should never be accessed from application code.
* </p>
*/
@@ -6330,7 +6380,7 @@ diff -urN x86/org/eclipse/swt/graphics/Font.java x86_64/org/eclipse/swt/graphics
Font(Device device) {
super(device);
-@@ -178,7 +178,7 @@
+@@ -178,7 +178,7 @@ public boolean equals(Object object) {
public FontData[] getFontData() {
if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -6339,7 +6389,7 @@ diff -urN x86/org/eclipse/swt/graphics/Font.java x86_64/org/eclipse/swt/graphics
int length = OS.strlen(family);
byte[] buffer = new byte[length];
OS.memmove(buffer, family, length);
-@@ -190,7 +190,7 @@
+@@ -190,7 +190,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;
@@ -6348,7 +6398,7 @@ diff -urN x86/org/eclipse/swt/graphics/Font.java x86_64/org/eclipse/swt/graphics
length = OS.strlen (fontString);
buffer = new byte [length + 1];
OS.memmove (buffer, fontString, length);
-@@ -215,7 +215,7 @@
+@@ -215,7 +215,7 @@ public FontData[] getFontData() {
*
* @private
*/
@@ -6357,40 +6407,11 @@ diff -urN x86/org/eclipse/swt/graphics/Font.java x86_64/org/eclipse/swt/graphics
Font font = new Font(device);
font.handle = handle;
return font;
-diff -urN x86/org/eclipse/swt/graphics/GCData.java x86_64/org/eclipse/swt/graphics/GCData.java
---- x86/org/eclipse/swt/graphics/GCData.java 2009-05-29 17:30:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/GCData.java 2009-09-17 08:48:24.000000000 -0400
-@@ -34,7 +34,7 @@
- public Font font;
- public Pattern foregroundPattern;
- public Pattern backgroundPattern;
-- public int /*long*/ clipRgn;
-+ public long /*int*/ clipRgn;
- public float lineWidth;
- public int lineStyle = SWT.LINE_SOLID;
- public float[] lineDashes;
-@@ -46,12 +46,12 @@
- public int alpha = 0xFF;
- public int interpolation = SWT.DEFAULT;
-
-- public int /*long*/ context;
-- public int /*long*/ layout;
-- public int /*long*/ damageRgn;
-+ public long /*int*/ context;
-+ public long /*int*/ layout;
-+ public long /*int*/ damageRgn;
- public Image image;
-- public int /*long*/ drawable;
-- public int /*long*/ cairo;
-+ public long /*int*/ drawable;
-+ public long /*int*/ cairo;
- public double cairoXoffset, cairoYoffset;
- public boolean disposeCairo;
- public double[] clippingTransform;
-diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC.java
---- x86/org/eclipse/swt/graphics/GC.java 2009-05-29 17:30:26.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/GC.java 2009-09-17 08:48:24.000000000 -0400
-@@ -67,7 +67,7 @@
+diff --git a/org/eclipse/swt/graphics/GC.java b/org/eclipse/swt/graphics/GC.java
+index 78c020d..a12ea67 100644
+--- a/org/eclipse/swt/graphics/GC.java
++++ b/org/eclipse/swt/graphics/GC.java
+@@ -67,7 +67,7 @@ public final class GC extends Resource {
* platforms and should never be accessed from application code.
* </p>
*/
@@ -6399,7 +6420,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
Drawable drawable;
GCData data;
-@@ -154,7 +154,7 @@
+@@ -154,7 +154,7 @@ public GC(Drawable drawable, int style) {
if (drawable == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
GCData data = new GCData();
data.style = checkStyle(style);
@@ -6408,7 +6429,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
Device device = data.device;
if (device == null) device = Device.getDevice();
if (device == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-@@ -163,10 +163,10 @@
+@@ -163,10 +163,10 @@ public GC(Drawable drawable, int style) {
init();
}
@@ -6421,7 +6442,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (layout == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.pango_layout_set_text(layout, buffer, -1);
OS.pango_layout_set_font_description(layout, font.handle);
-@@ -192,7 +192,7 @@
+@@ -192,7 +192,7 @@ static int checkStyle (int style) {
return style & (SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT);
}
@@ -6430,7 +6451,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
GC gc = new GC();
gc.device = data.device;
gc.init(null, data, handle);
-@@ -201,7 +201,7 @@
+@@ -201,7 +201,7 @@ public static GC gtk_new(int /*long*/ handle, GCData data) {
public static GC gtk_new(Drawable drawable, GCData data) {
GC gc = new GC();
@@ -6439,7 +6460,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
gc.device = data.device;
gc.init(drawable, data, gdkGC);
return gc;
-@@ -212,7 +212,7 @@
+@@ -212,7 +212,7 @@ void checkGC (int mask) {
if ((state & mask) == mask) return;
state = (state ^ mask) & mask;
data.state |= mask;
@@ -6448,7 +6469,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
if ((state & (BACKGROUND | FOREGROUND)) != 0) {
GdkColor color;
-@@ -228,7 +228,7 @@
+@@ -228,7 +228,7 @@ void checkGC (int mask) {
}
if (pattern != null) {
if ((data.style & SWT.MIRRORED) != 0 && pattern.surface != 0) {
@@ -6457,7 +6478,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (newPattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_pattern_set_extend(newPattern, Cairo.CAIRO_EXTEND_REPEAT);
double[] matrix = {-1, 0, 0, 1, 0, 0};
-@@ -388,10 +388,10 @@
+@@ -388,10 +388,10 @@ void checkGC (int mask) {
}
}
@@ -6471,7 +6492,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.gdk_region_get_rectangles(rgn, rects, nRects);
GdkRectangle rect = new GdkRectangle();
int[] pointArray = new int[8];
-@@ -418,7 +418,7 @@
+@@ -418,7 +418,7 @@ int /*long*/ convertRgn(int /*long*/ rgn, double[] matrix) {
Cairo.cairo_matrix_transform_point(matrix, x, y);
pointArray[6] = (int)x[0];
pointArray[7] = (int)Math.round(y[0]);
@@ -6480,7 +6501,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.gdk_region_union(newRgn, polyRgn);
OS.gdk_region_destroy(polyRgn);
}
-@@ -447,7 +447,7 @@
+@@ -447,7 +447,7 @@ public void copyArea(Image image, int x, int y) {
if (image == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (image.type != SWT.BITMAP || image.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
Rectangle rect = image.getBounds();
@@ -6489,7 +6510,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.gdk_gc_set_subwindow(gdkGC, OS.GDK_INCLUDE_INFERIORS);
OS.gdk_draw_drawable(image.pixmap, gdkGC, data.drawable, x, y, 0, 0, rect.width, rect.height);
-@@ -495,7 +495,7 @@
+@@ -495,7 +495,7 @@ public void copyArea(int srcX, int srcY, int width, int height, int destX, int d
if (width <= 0 || height <= 0) return;
int deltaX = destX - srcX, deltaY = destY - srcY;
if (deltaX == 0 && deltaY == 0) return;
@@ -6498,7 +6519,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (data.image == null && paint) OS.gdk_gc_set_exposures(handle, true);
OS.gdk_draw_drawable(drawable, handle, drawable, srcX, srcY, destX, destY, width, height);
if (data.image == null & paint) {
-@@ -535,10 +535,10 @@
+@@ -535,10 +535,10 @@ public void copyArea(int srcX, int srcY, int width, int height, int destX, int d
}
void createLayout() {
@@ -6511,7 +6532,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (layout == 0) SWT.error(SWT.ERROR_NO_HANDLES);
data.layout = layout;
OS.pango_context_set_language(context, OS.gtk_get_default_language());
-@@ -558,13 +558,13 @@
+@@ -558,13 +558,13 @@ void disposeLayout() {
void destroy() {
if (data.disposeCairo) {
@@ -6527,7 +6548,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (clipRgn != 0) OS.gdk_region_destroy(clipRgn);
Image image = data.image;
if (image != null) {
-@@ -627,7 +627,7 @@
+@@ -627,7 +627,7 @@ public void drawArc(int x, int y, int width, int height, int startAngle, int arc
height = -height;
}
if (width == 0 || height == 0 || arcAngle == 0) return;
@@ -6536,7 +6557,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
if (width == height) {
-@@ -678,8 +678,8 @@
+@@ -678,8 +678,8 @@ public void drawFocus(int x, int y, int width, int height) {
* are not valid in the default style. The fix is to use a style
* from a widget.
*/
@@ -6547,7 +6568,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
checkGC(FOREGROUND);
int[] lineWidth = new int[1];
-@@ -784,7 +784,7 @@
+@@ -784,7 +784,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
}
@@ -6556,7 +6577,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
if (data.alpha != 0) {
srcImage.createSurface();
-@@ -806,7 +806,7 @@
+@@ -806,7 +806,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
case SWT.LOW: filter = Cairo.CAIRO_FILTER_FAST; break;
case SWT.HIGH: filter = Cairo.CAIRO_FILTER_BEST; break;
}
@@ -6565,7 +6586,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (pattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);
if (srcWidth != destWidth || srcHeight != destHeight) {
/*
-@@ -825,8 +825,8 @@
+@@ -825,8 +825,8 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
* the image that was created or the edges are still faded.
*/
if (Cairo.cairo_version () >= Cairo.CAIRO_VERSION_ENCODE(1, 4, 0)) {
@@ -6576,7 +6597,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
Cairo.cairo_set_source_surface(cr, srcImage.surface, imgWidth, imgHeight);
Cairo.cairo_paint(cr);
Cairo.cairo_scale(cr, -1, -1);
-@@ -849,7 +849,7 @@
+@@ -849,7 +849,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
Cairo.cairo_set_source_surface(cr, srcImage.surface, imgWidth, -imgHeight * 3);
Cairo.cairo_paint(cr);
Cairo.cairo_destroy(cr);
@@ -6585,7 +6606,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
Cairo.cairo_surface_destroy(surface);
if (newPattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_pattern_destroy(pattern);
-@@ -889,7 +889,7 @@
+@@ -889,7 +889,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
drawImageXRender(srcImage, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, simple, imgWidth, imgHeight, 0, -1);
return;
}
@@ -6594,7 +6615,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (pixbuf != 0) {
OS.gdk_pixbuf_render_to_drawable(pixbuf, data.drawable, handle, 0, 0, destX, destY, destWidth, destHeight, OS.GDK_RGB_DITHER_NORMAL, 0, 0);
OS.g_object_unref(pixbuf);
-@@ -906,12 +906,12 @@
+@@ -906,12 +906,12 @@ void drawImageAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHei
drawImageXRender(srcImage, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, simple, imgWidth, imgHeight, srcImage.mask, OS.PictStandardA8);
return;
}
@@ -6610,7 +6631,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
byte[] line = new byte[stride];
byte alpha = (byte)srcImage.alpha;
byte[] alphaData = srcImage.alphaData;
-@@ -924,7 +924,7 @@
+@@ -924,7 +924,7 @@ void drawImageAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHei
OS.memmove(pixels + (y * stride), line, stride);
}
if (srcWidth != destWidth || srcHeight != destHeight) {
@@ -6619,7 +6640,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.g_object_unref(pixbuf);
if (scaledPixbuf == 0) return;
pixbuf = scaledPixbuf;
-@@ -941,33 +941,33 @@
+@@ -941,33 +941,33 @@ void drawImageAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHei
OS.g_object_unref(pixbuf);
}
void drawImageMask(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, boolean simple, int imgWidth, int imgHeight) {
@@ -6663,7 +6684,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.memmove(maskLine, maskOffset, maskStride);
for (int x=0; x<srcWidth; x++) {
if (maskLine[x * 3] == 0) {
-@@ -977,10 +977,10 @@
+@@ -977,10 +977,10 @@ void drawImageMask(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeig
OS.memmove(offset, line, stride);
}
OS.g_object_unref(maskPixbuf);
@@ -6677,7 +6698,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.gdk_pixbuf_render_pixmap_and_mask(scaledPixbuf, colorBuffer, maskBuffer, 128);
colorPixmap = colorBuffer[0];
maskPixmap = maskBuffer[0];
-@@ -1001,9 +1001,9 @@
+@@ -1001,9 +1001,9 @@ void drawImageMask(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeig
int newHeight = srcY + srcHeight;
int bytesPerLine = (newWidth + 7) / 8;
byte[] maskData = new byte[bytesPerLine * newHeight];
@@ -6689,7 +6710,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.gdk_region_offset(data.clipRgn, -destX + srcX, -destY + srcY);
OS.gdk_gc_set_clip_region(gc, data.clipRgn);
OS.gdk_region_offset(data.clipRgn, destX - srcX, destY - srcY);
-@@ -1035,19 +1035,19 @@
+@@ -1035,19 +1035,19 @@ void drawImageMask(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeig
/* Destroy the image mask if the there is a GC created on the image */
if (srcImage.transparentPixel != -1 && srcImage.memGC != null) srcImage.destroyMask();
}
@@ -6714,7 +6735,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (maskPixmap != 0) {
int attribCount = 0;
XRenderPictureAttributes attrib = null;
-@@ -1059,10 +1059,10 @@
+@@ -1059,10 +1059,10 @@ void drawImageXRender(Image srcImage, int srcX, int srcY, int srcWidth, int srcH
maskPict = OS.XRenderCreatePicture(xDisplay, OS.gdk_x11_drawable_get_xid(maskPixmap), OS.XRenderFindStandardFormat(xDisplay, maskType), attribCount, attrib);
if (maskPict == 0) SWT.error(SWT.ERROR_NO_HANDLES);
}
@@ -6728,7 +6749,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (srcPict == 0) SWT.error(SWT.ERROR_NO_HANDLES);
if (srcWidth != destWidth || srcHeight != destHeight) {
int[] transform = new int[]{(int)(((float)srcWidth / destWidth) * 65536), 0, 0, 0, (int)(((float)srcHeight / destHeight) * 65536), 0, 0, 0, 65536};
-@@ -1071,7 +1071,7 @@
+@@ -1071,7 +1071,7 @@ void drawImageXRender(Image srcImage, int srcX, int srcY, int srcWidth, int srcH
srcX *= destWidth / (float)srcWidth;
srcY *= destHeight / (float)srcHeight;
}
@@ -6737,7 +6758,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (data.damageRgn != 0) {
if (clipping == 0) {
clipping = data.damageRgn;
-@@ -1083,7 +1083,7 @@
+@@ -1083,7 +1083,7 @@ void drawImageXRender(Image srcImage, int srcX, int srcY, int srcWidth, int srcH
}
if (clipping != 0) {
int[] nRects = new int[1];
@@ -6746,7 +6767,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.gdk_region_get_rectangles(clipping, rects, nRects);
GdkRectangle rect = new GdkRectangle();
short[] xRects = new short[nRects[0] * 4];
-@@ -1105,12 +1105,12 @@
+@@ -1105,12 +1105,12 @@ void drawImageXRender(Image srcImage, int srcX, int srcY, int srcWidth, int srcH
OS.XRenderFreePicture(xDisplay, srcPict);
if (maskPict != 0) OS.XRenderFreePicture(xDisplay, maskPict);
}
@@ -6763,7 +6784,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.g_object_unref(pixbuf);
return scaledPixbuf;
}
-@@ -1131,7 +1131,7 @@
+@@ -1131,7 +1131,7 @@ int /*long*/ scale(int /*long*/ src, int srcX, int srcY, int srcWidth, int srcHe
public void drawLine(int x1, int y1, int x2, int y2) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
checkGC(DRAW);
@@ -6772,7 +6793,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
Cairo.cairo_move_to(cairo, x1 + xOffset, y1 + yOffset);
-@@ -1174,7 +1174,7 @@
+@@ -1174,7 +1174,7 @@ public void drawOval(int x, int y, int width, int height) {
y = y + height;
height = -height;
}
@@ -6781,7 +6802,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
if (width == height) {
-@@ -1221,11 +1221,11 @@
+@@ -1221,11 +1221,11 @@ public void drawPath(Path path) {
if (path.handle == 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
initCairo();
checkGC(DRAW);
@@ -6795,7 +6816,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(cairo, copy);
Cairo.cairo_path_destroy(copy);
-@@ -1253,7 +1253,7 @@
+@@ -1253,7 +1253,7 @@ public void drawPath(Path path) {
public void drawPoint (int x, int y) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
checkGC(DRAW);
@@ -6804,7 +6825,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
Cairo.cairo_rectangle(cairo, x, y, 1, 1);
Cairo.cairo_fill(cairo);
-@@ -1283,7 +1283,7 @@
+@@ -1283,7 +1283,7 @@ public void drawPolygon(int[] pointArray) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
checkGC(DRAW);
@@ -6813,7 +6834,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
drawPolyline(cairo, pointArray, true);
Cairo.cairo_stroke(cairo);
-@@ -1313,7 +1313,7 @@
+@@ -1313,7 +1313,7 @@ public void drawPolyline(int[] pointArray) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
checkGC(DRAW);
@@ -6822,7 +6843,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
drawPolyline(cairo, pointArray, false);
Cairo.cairo_stroke(cairo);
-@@ -1322,7 +1322,7 @@
+@@ -1322,7 +1322,7 @@ public void drawPolyline(int[] pointArray) {
OS.gdk_draw_lines(data.drawable, handle, pointArray, pointArray.length / 2);
}
@@ -6831,7 +6852,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
int count = pointArray.length / 2;
if (count == 0) return;
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
-@@ -1359,7 +1359,7 @@
+@@ -1359,7 +1359,7 @@ public void drawRectangle(int x, int y, int width, int height) {
y = y + height;
height = -height;
}
@@ -6840,7 +6861,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
Cairo.cairo_rectangle(cairo, x + xOffset, y + yOffset, width, height);
-@@ -1429,7 +1429,7 @@
+@@ -1429,7 +1429,7 @@ public void drawRoundRectangle(int x, int y, int width, int height, int arcWidth
}
if (naw < 0) naw = 0 - naw;
if (nah < 0) nah = 0 - nah;
@@ -6849,7 +6870,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
if (naw == 0 || nah == 0) {
-@@ -1455,7 +1455,7 @@
+@@ -1455,7 +1455,7 @@ public void drawRoundRectangle(int x, int y, int width, int height, int arcWidth
}
int naw2 = naw / 2;
int nah2 = nah / 2;
@@ -6858,7 +6879,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (nw > naw) {
if (nh > nah) {
OS.gdk_draw_arc(drawable, handle, 0, nx, ny, naw, nah, 5760, 5760);
-@@ -1615,7 +1615,7 @@
+@@ -1615,7 +1615,7 @@ public void drawText (String string, int x, int y, int flags) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (string.length() == 0) return;
@@ -6867,7 +6888,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {
//TODO - honor flags
-@@ -1664,13 +1664,13 @@
+@@ -1664,13 +1664,13 @@ public void drawText (String string, int x, int y, int flags) {
if (!data.xorMode) {
OS.gdk_draw_layout_with_colors(data.drawable, handle, x, y, data.layout, null, background);
} else {
@@ -6884,7 +6905,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);
GdkColor black = new GdkColor();
OS.gdk_gc_set_foreground(gdkGC, black);
-@@ -1743,7 +1743,7 @@
+@@ -1743,7 +1743,7 @@ public void fillArc(int x, int y, int width, int height, int startAngle, int arc
height = -height;
}
if (width == 0 || height == 0 || arcAngle == 0) return;
@@ -6893,7 +6914,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
if (width == height) {
if (arcAngle >= 0) {
-@@ -1820,9 +1820,9 @@
+@@ -1820,9 +1820,9 @@ public void fillGradientRectangle(int x, int y, int width, int height, boolean v
fillRectangle(x, y, width, height);
return;
}
@@ -6905,7 +6926,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (vertical) {
pattern = Cairo.cairo_pattern_create_linear (0.0, 0.0, 0.0, 1.0);
} else {
-@@ -1872,7 +1872,7 @@
+@@ -1872,7 +1872,7 @@ public void fillOval(int x, int y, int width, int height) {
y = y + height;
height = -height;
}
@@ -6914,7 +6935,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
if (width == height) {
Cairo.cairo_arc_negative(cairo, x + width / 2f, y + height / 2f, width / 2f, 0, 2 * (float)Compatibility.PI);
-@@ -1918,8 +1918,8 @@
+@@ -1918,8 +1918,8 @@ public void fillPath (Path path) {
if (path.handle == 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
initCairo();
checkGC(FILL);
@@ -6925,7 +6946,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(cairo, copy);
Cairo.cairo_path_destroy(copy);
-@@ -1949,7 +1949,7 @@
+@@ -1949,7 +1949,7 @@ public void fillPolygon(int[] pointArray) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
checkGC(FILL);
@@ -6934,7 +6955,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
drawPolyline(cairo, pointArray, true);
Cairo.cairo_fill(cairo);
-@@ -1984,7 +1984,7 @@
+@@ -1984,7 +1984,7 @@ public void fillRectangle(int x, int y, int width, int height) {
y = y + height;
height = -height;
}
@@ -6943,7 +6964,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
Cairo.cairo_rectangle(cairo, x, y, width, height);
Cairo.cairo_fill(cairo);
-@@ -2050,7 +2050,7 @@
+@@ -2050,7 +2050,7 @@ public void fillRoundRectangle(int x, int y, int width, int height, int arcWidth
}
if (naw < 0) naw = 0 - naw;
if (nah < 0) nah = 0 - nah;
@@ -6952,7 +6973,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
if (naw == 0 || nah == 0) {
Cairo.cairo_rectangle(cairo, x, y, width, height);
-@@ -2075,7 +2075,7 @@
+@@ -2075,7 +2075,7 @@ public void fillRoundRectangle(int x, int y, int width, int height, int arcWidth
}
int naw2 = naw / 2;
int nah2 = nah / 2;
@@ -6961,7 +6982,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (nw > naw) {
if (nh > nah) {
OS.gdk_draw_arc(drawable, handle, 1, nx, ny, naw, nah, 5760, 5760);
-@@ -2294,11 +2294,11 @@
+@@ -2294,11 +2294,11 @@ public Rectangle getClipping() {
height = h[0];
}
/* Intersect visible bounds with clipping in device space and then convert then to user space */
@@ -6977,7 +6998,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
GdkRectangle rect = new GdkRectangle();
rect.width = width;
rect.height = height;
-@@ -2354,10 +2354,10 @@
+@@ -2354,10 +2354,10 @@ public void getClipping(Region region) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (region == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (region.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
@@ -6991,7 +7012,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (clipRgn == 0) {
GdkRectangle rect = new GdkRectangle();
if (data.width != -1 && data.height != -1) {
-@@ -2373,7 +2373,7 @@
+@@ -2373,7 +2373,7 @@ public void getClipping(Region region) {
} else {
/* Convert clipping to device space if needed */
if (data.clippingTransform != null) {
@@ -7000,7 +7021,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.gdk_region_union(clipping, rgn);
OS.gdk_region_destroy(rgn);
} else {
-@@ -2388,7 +2388,7 @@
+@@ -2388,7 +2388,7 @@ public void getClipping(Region region) {
double[] matrix = new double[6];
Cairo.cairo_get_matrix(cairo, matrix);
Cairo.cairo_matrix_invert(matrix);
@@ -7009,7 +7030,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.gdk_region_subtract(clipping, clipping);
OS.gdk_region_union(clipping, rgn);
OS.gdk_region_destroy(rgn);
-@@ -2409,7 +2409,7 @@
+@@ -2409,7 +2409,7 @@ public void getClipping(Region region) {
*/
public int getFillRule() {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -7018,7 +7039,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo == 0) return SWT.FILL_EVEN_ODD;
return Cairo.cairo_get_fill_rule(cairo) == Cairo.CAIRO_FILL_RULE_WINDING ? SWT.FILL_WINDING : SWT.FILL_EVEN_ODD;
}
-@@ -2445,9 +2445,9 @@
+@@ -2445,9 +2445,9 @@ public FontMetrics getFontMetrics() {
if (data.context == 0) createLayout();
checkGC(FONT);
Font font = data.font;
@@ -7031,7 +7052,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
FontMetrics fm = new FontMetrics();
fm.ascent = OS.PANGO_PIXELS(OS.pango_font_metrics_get_ascent(metrics));
fm.descent = OS.PANGO_PIXELS(OS.pango_font_metrics_get_descent(metrics));
-@@ -2691,13 +2691,13 @@
+@@ -2691,13 +2691,13 @@ public int getTextAntialias() {
if (data.cairo == 0) return SWT.DEFAULT;
int antialias = Cairo.CAIRO_ANTIALIAS_DEFAULT;
if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {
@@ -7047,7 +7068,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (options != 0) antialias = Cairo.cairo_font_options_get_antialias(options);
}
}
-@@ -2732,7 +2732,7 @@
+@@ -2732,7 +2732,7 @@ public void getTransform(Transform transform) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (transform == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
@@ -7056,7 +7077,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
Cairo.cairo_get_matrix(cairo, transform.handle);
double[] identity = identity();
-@@ -2792,7 +2792,7 @@
+@@ -2792,7 +2792,7 @@ double[] identity() {
return identity;
}
@@ -7065,7 +7086,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (data.foreground != null) data.state &= ~FOREGROUND;
if (data.background != null) data.state &= ~(BACKGROUND | BACKGROUND_BG);
if (data.font != null) data.state &= ~FONT;
-@@ -2812,26 +2812,26 @@
+@@ -2812,26 +2812,26 @@ void init(Drawable drawable, GCData data, int /*long*/ gdkGC) {
handle = gdkGC;
if ((data.style & SWT.MIRRORED) != 0) {
initCairo();
@@ -7099,7 +7120,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.gdk_window_get_internal_paint_info(drawable, real_drawable, x, y);
xDrawable = OS.gdk_x11_drawable_get_xid(real_drawable[0]);
translateX = -x[0];
-@@ -2841,7 +2841,7 @@
+@@ -2841,7 +2841,7 @@ void initCairo() {
int[] w = new int[1], h = new int[1];
OS.gdk_drawable_get_size(drawable, w, h);
int width = w[0], height = h[0];
@@ -7108,7 +7129,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_surface_set_device_offset(surface, translateX, translateY);
data.cairo = cairo = Cairo.cairo_create(surface);
-@@ -2962,7 +2962,7 @@
+@@ -2962,7 +2962,7 @@ public void setAdvanced(boolean advanced) {
} catch (SWTException e) {}
} else {
if (!data.disposeCairo) return;
@@ -7117,7 +7138,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) Cairo.cairo_destroy(cairo);
data.cairo = 0;
data.interpolation = SWT.DEFAULT;
-@@ -3042,7 +3042,7 @@
+@@ -3042,7 +3042,7 @@ public void setAntialias(int antialias) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
initCairo();
@@ -7126,7 +7147,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
Cairo.cairo_set_antialias(cairo, mode);
}
-@@ -3104,12 +3104,12 @@
+@@ -3104,12 +3104,12 @@ public void setBackgroundPattern(Pattern pattern) {
data.state &= ~BACKGROUND;
}
@@ -7142,7 +7163,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
int length = OS.strlen(family);
byte[] buffer = new byte[length + 1];
OS.memmove(buffer, family, length);
-@@ -3126,12 +3126,12 @@
+@@ -3126,12 +3126,12 @@ static void setCairoFont(int /*long*/ cairo, int /*long*/ font) {
Cairo.cairo_set_font_size(cairo, height);
}
@@ -7157,7 +7178,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.gdk_region_get_rectangles(rgn, rects, nRects);
GdkRectangle rect = new GdkRectangle();
for (int i=0; i<nRects[0]; i++) {
-@@ -3142,7 +3142,7 @@
+@@ -3142,7 +3142,7 @@ static void setCairoRegion(int /*long*/ cairo, int /*long*/ rgn) {
}
}
@@ -7166,7 +7187,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
GdkColor color = c.handle;
double aa = (alpha & 0xFF) / (double)0xFF;
double red = ((color.red & 0xFFFF) / (double)0xFFFF);
-@@ -3151,8 +3151,8 @@
+@@ -3151,8 +3151,8 @@ static void setCairoPatternColor(int /*long*/ pattern, int offset, Color c, int
Cairo.cairo_pattern_add_color_stop_rgba(pattern, offset, red, green, blue, aa);
}
@@ -7177,7 +7198,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
Cairo.cairo_reset_clip(cairo);
if (damageRgn != 0) {
double[] matrix = new double[6];
-@@ -3170,8 +3170,8 @@
+@@ -3170,8 +3170,8 @@ void setCairoClip(int /*long*/ damageRgn, int /*long*/ clipRgn) {
}
}
@@ -7188,7 +7209,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (clipRgn == 0) {
if (data.clipRgn != 0) {
OS.gdk_region_destroy(data.clipRgn);
-@@ -3181,7 +3181,7 @@
+@@ -3181,7 +3181,7 @@ void setClipping(int /*long*/ clipRgn) {
data.clippingTransform = null;
setCairoClip(data.damageRgn, 0);
} else {
@@ -7197,7 +7218,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.gdk_gc_set_clip_region(handle, clipping);
}
} else {
-@@ -3193,7 +3193,7 @@
+@@ -3193,7 +3193,7 @@ void setClipping(int /*long*/ clipRgn) {
Cairo.cairo_get_matrix(cairo, data.clippingTransform);
setCairoClip(data.damageRgn, clipRgn);
} else {
@@ -7206,7 +7227,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (data.damageRgn != 0) {
clipping = OS.gdk_region_new();
OS.gdk_region_union(clipping, clipRgn);
-@@ -3234,7 +3234,7 @@
+@@ -3234,7 +3234,7 @@ public void setClipping(int x, int y, int width, int height) {
rect.y = y;
rect.width = width;
rect.height = height;
@@ -7215,7 +7236,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
OS.gdk_region_union_with_rect(clipRgn, rect);
setClipping(clipRgn);
OS.gdk_region_destroy(clipRgn);
-@@ -3272,8 +3272,8 @@
+@@ -3272,8 +3272,8 @@ public void setClipping(Path path) {
setClipping(0);
if (path != null) {
initCairo();
@@ -7226,7 +7247,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(cairo, copy);
Cairo.cairo_path_destroy(copy);
-@@ -3376,7 +3376,7 @@
+@@ -3376,7 +3376,7 @@ public void setFillRule(int rule) {
}
//TODO - need fill rule in X, GDK has no API
initCairo();
@@ -7235,7 +7256,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
Cairo.cairo_set_fill_rule(cairo, cairo_mode);
}
-@@ -3767,7 +3767,7 @@
+@@ -3767,7 +3767,7 @@ void setString(String string, int flags) {
}
byte[] buffer;
int mnemonic, length = string.length ();
@@ -7244,7 +7265,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
char[] text = new char[length];
string.getChars(0, length, text, 0);
if ((flags & SWT.DRAW_MNEMONIC) != 0 && (mnemonic = fixMnemonic(text)) != -1) {
-@@ -3780,8 +3780,8 @@
+@@ -3780,8 +3780,8 @@ void setString(String string, int flags) {
buffer = new byte[buffer1.length + buffer2.length];
System.arraycopy(buffer1, 0, buffer, 0, buffer1.length);
System.arraycopy(buffer2, 0, buffer, buffer1.length, buffer2.length);
@@ -7255,7 +7276,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
PangoAttribute attribute = new PangoAttribute();
OS.memmove(attribute, attr, PangoAttribute.sizeof);
attribute.start_index = buffer1.length;
-@@ -3843,7 +3843,7 @@
+@@ -3843,7 +3843,7 @@ public void setTextAntialias(int antialias) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
initCairo();
@@ -7264,7 +7285,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
Cairo.cairo_font_options_set_antialias(options, mode);
if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {
Cairo.cairo_set_font_options(data.cairo, options);
-@@ -3885,7 +3885,7 @@
+@@ -3885,7 +3885,7 @@ public void setTransform(Transform transform) {
if (transform != null && transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
if (data.cairo == 0 && transform == null) return;
initCairo();
@@ -7273,7 +7294,7 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
double[] identity = identity();
if (transform != null) {
Cairo.cairo_matrix_multiply(identity, transform.handle, identity);
-@@ -4001,7 +4001,7 @@
+@@ -4001,7 +4001,7 @@ public Point textExtent(String string) {
public Point textExtent(String string, int flags) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
@@ -7282,10 +7303,42 @@ diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/G
if (cairo != 0) {
if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {
//TODO - honor flags
-diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics/Image.java
---- x86/org/eclipse/swt/graphics/Image.java 2008-10-21 12:10:46.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/Image.java 2009-09-17 08:48:24.000000000 -0400
-@@ -92,7 +92,7 @@
+diff --git a/org/eclipse/swt/graphics/GCData.java b/org/eclipse/swt/graphics/GCData.java
+index d507acb..e914a1b 100644
+--- a/org/eclipse/swt/graphics/GCData.java
++++ b/org/eclipse/swt/graphics/GCData.java
+@@ -34,7 +34,7 @@ public final class GCData {
+ public Font font;
+ public Pattern foregroundPattern;
+ public Pattern backgroundPattern;
+- public int /*long*/ clipRgn;
++ public long /*int*/ clipRgn;
+ public float lineWidth;
+ public int lineStyle = SWT.LINE_SOLID;
+ public float[] lineDashes;
+@@ -46,12 +46,12 @@ public final class GCData {
+ public int alpha = 0xFF;
+ public int interpolation = SWT.DEFAULT;
+
+- public int /*long*/ context;
+- public int /*long*/ layout;
+- public int /*long*/ damageRgn;
++ public long /*int*/ context;
++ public long /*int*/ layout;
++ public long /*int*/ damageRgn;
+ public Image image;
+- public int /*long*/ drawable;
+- public int /*long*/ cairo;
++ public long /*int*/ drawable;
++ public long /*int*/ cairo;
+ public double cairoXoffset, cairoYoffset;
+ public boolean disposeCairo;
+ public double[] clippingTransform;
+diff --git a/org/eclipse/swt/graphics/Image.java b/org/eclipse/swt/graphics/Image.java
+index 1754574..d52d9ee 100644
+--- a/org/eclipse/swt/graphics/Image.java
++++ b/org/eclipse/swt/graphics/Image.java
+@@ -92,7 +92,7 @@ public final class Image extends Resource implements Drawable {
* platforms and should never be accessed from application code.
* </p>
*/
@@ -7294,7 +7347,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
/**
* The handle to the OS mask resource.
-@@ -104,9 +104,9 @@
+@@ -104,9 +104,9 @@ public final class Image extends Resource implements Drawable {
* platforms and should never be accessed from application code.
* </p>
*/
@@ -7306,7 +7359,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
/**
* specifies the transparent pixel
-@@ -239,9 +239,9 @@
+@@ -239,9 +239,9 @@ public Image(Device device, Image srcImage, int flag) {
if ((srcImage.type == SWT.ICON && srcImage.mask != 0) || srcImage.transparentPixel != -1) {
/* Generate the mask if necessary. */
if (srcImage.transparentPixel != -1) srcImage.createMask();
@@ -7318,7 +7371,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.gdk_draw_drawable(mask, gdkGC, srcImage.mask, 0, 0, 0, 0, width, height);
OS.g_object_unref(gdkGC);
-@@ -260,9 +260,9 @@
+@@ -260,9 +260,9 @@ public Image(Device device, Image srcImage, int flag) {
createAlphaMask(width, height);
/* Create the new pixmap */
@@ -7330,7 +7383,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);
this.pixmap = pixmap;
-@@ -272,12 +272,12 @@
+@@ -272,12 +272,12 @@ public Image(Device device, Image srcImage, int flag) {
} else {
/* Retrieve the source pixmap data */
@@ -7346,7 +7399,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
/* Apply transformation */
switch (flag) {
-@@ -539,7 +539,7 @@
+@@ -539,7 +539,7 @@ void initNative(String filename) {
char [] chars = new char [length];
filename.getChars (0, length, chars, 0);
byte [] buffer = Converter.wcsToMbcs(null, chars, true);
@@ -7355,7 +7408,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
if (pixbuf != 0) {
boolean hasAlpha = OS.gdk_pixbuf_get_has_alpha(pixbuf);
if (hasAlpha) {
-@@ -553,7 +553,7 @@
+@@ -553,7 +553,7 @@ void initNative(String filename) {
int width = OS.gdk_pixbuf_get_width(pixbuf);
int height = OS.gdk_pixbuf_get_height(pixbuf);
int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
@@ -7364,7 +7417,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
byte[] line = new byte[stride];
alphaData = new byte[width * height];
for (int y = 0; y < height; y++) {
-@@ -566,7 +566,7 @@
+@@ -566,7 +566,7 @@ void initNative(String filename) {
}
createAlphaMask(width, height);
}
@@ -7373,7 +7426,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
OS.gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap_return, null, 0);
this.type = SWT.BITMAP;
this.pixmap = pixmap_return[0];
-@@ -580,14 +580,14 @@
+@@ -580,14 +580,14 @@ void createAlphaMask (int width, int height) {
if (device.useXRender && (alpha != -1 || alphaData != null)) {
mask = OS.gdk_pixmap_new(0, alpha != -1 ? 1 : width, alpha != -1 ? 1 : height, 8);
if (mask == 0) SWT.error(SWT.ERROR_NO_HANDLES);
@@ -7390,7 +7443,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
if (imagePtr == 0) SWT.error(SWT.ERROR_NO_HANDLES);
GdkImage gdkImage = new GdkImage();
OS.memmove(gdkImage, imagePtr);
-@@ -616,7 +616,7 @@
+@@ -616,7 +616,7 @@ void createMask() {
if (mask == 0) SWT.error(SWT.ERROR_NO_HANDLES);
}
@@ -7399,7 +7452,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
ImageData mask = image.getTransparencyMask();
byte[] data = mask.data;
byte[] maskData = copy ? new byte[data.length] : data;
-@@ -638,21 +638,21 @@
+@@ -638,21 +638,21 @@ void createSurface() {
OS.gdk_drawable_get_size(pixmap, w, h);
int width = w[0], height = h[0];
if (mask != 0 || alpha != -1 || alphaData != null) {
@@ -7427,7 +7480,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
for (int y=0; y<height; y++) {
OS.memmove(line, offset, stride);
OS.memmove(maskLine, maskOffset, maskStride);
-@@ -670,7 +670,7 @@
+@@ -670,7 +670,7 @@ void createSurface() {
}
OS.g_object_unref(maskPixbuf);
} else if (alpha != -1) {
@@ -7436,7 +7489,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
for (int y=0; y<height; y++) {
OS.memmove(line, offset, stride);
for (int x=0, offset1=0; x<width; x++, offset1 += 4) {
-@@ -690,7 +690,7 @@
+@@ -690,7 +690,7 @@ void createSurface() {
offset += stride;
}
} else if (alphaData != null) {
@@ -7445,7 +7498,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
for (int y = 0; y < h [0]; y++) {
OS.memmove (line, offset, stride);
for (int x=0, offset1=0; x<width; x++, offset1 += 4) {
-@@ -711,7 +711,7 @@
+@@ -711,7 +711,7 @@ void createSurface() {
offset += stride;
}
} else {
@@ -7454,7 +7507,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
for (int y = 0; y < h [0]; y++) {
OS.memmove (line, offset, stride);
for (int x=0, offset1=0; x<width; x++, offset1 += 4) {
-@@ -729,9 +729,9 @@
+@@ -729,9 +729,9 @@ void createSurface() {
surface = Cairo.cairo_image_surface_create_for_data(surfaceData, Cairo.CAIRO_FORMAT_ARGB32, width, height, stride);
OS.g_object_unref(pixbuf);
} else {
@@ -7467,7 +7520,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width, height);
}
/* Destroy the image mask if the there is a GC created on the image */
-@@ -841,12 +841,12 @@
+@@ -841,12 +841,12 @@ public ImageData getImageData() {
int[] w = new int[1], h = new int[1];
OS.gdk_drawable_get_size(pixmap, w, h);
int width = w[0], height = h[0];
@@ -7483,7 +7536,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
byte[] srcData = new byte[stride * height];
OS.memmove(srcData, pixels, srcData.length);
OS.g_object_unref(pixbuf);
-@@ -857,7 +857,7 @@
+@@ -857,7 +857,7 @@ public ImageData getImageData() {
if (transparentPixel == -1 && type == SWT.ICON && mask != 0) {
/* Get the icon mask data */
@@ -7492,7 +7545,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
if (gdkImagePtr == 0) SWT.error(SWT.ERROR_NO_HANDLES);
GdkImage gdkImage = new GdkImage();
OS.memmove(gdkImage, gdkImagePtr);
-@@ -909,7 +909,7 @@
+@@ -909,7 +909,7 @@ public ImageData getImageData() {
*
* @private
*/
@@ -7501,7 +7554,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
Image image = new Image(device);
image.type = type;
image.pixmap = pixmap;
-@@ -945,9 +945,9 @@
+@@ -945,9 +945,9 @@ void init(int width, int height) {
white.red = (short)0xFFFF;
white.green = (short)0xFFFF;
white.blue = (short)0xFFFF;
@@ -7513,7 +7566,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
OS.gdk_gc_set_foreground(gdkGC, white);
OS.gdk_draw_rectangle(pixmap, gdkGC, 1, 0, 0, width, height);
OS.g_object_unref(gdkGC);
-@@ -962,10 +962,10 @@
+@@ -962,10 +962,10 @@ void init(ImageData image) {
if (!(((image.depth == 1 || image.depth == 2 || image.depth == 4 || image.depth == 8) && !palette.isDirect) ||
((image.depth == 8) || (image.depth == 16 || image.depth == 24 || image.depth == 32) && palette.isDirect)))
SWT.error (SWT.ERROR_UNSUPPORTED_DEPTH);
@@ -7526,7 +7579,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
byte[] buffer = image.data;
if (!palette.isDirect || image.depth != 24 || stride != image.bytesPerLine || palette.redMask != 0xFF0000 || palette.greenMask != 0xFF00 || palette.blueMask != 0xFF) {
buffer = new byte[stride * height];
-@@ -996,9 +996,9 @@
+@@ -996,9 +996,9 @@ void init(ImageData image) {
}
}
OS.memmove(data, buffer, stride * height);
@@ -7538,7 +7591,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.gdk_pixbuf_render_to_drawable(pixbuf, pixmap, gdkGC, 0, 0, 0, 0, width, height, OS.GDK_RGB_DITHER_NORMAL, 0, 0);
OS.g_object_unref(gdkGC);
-@@ -1019,7 +1019,7 @@
+@@ -1019,7 +1019,7 @@ void init(ImageData image) {
transparentPixel = rgb.red << 16 | rgb.green << 8 | rgb.blue;
}
}
@@ -7547,7 +7600,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
if (mask == 0) SWT.error(SWT.ERROR_NO_HANDLES);
this.mask = mask;
if (isIcon) {
-@@ -1053,12 +1053,12 @@
+@@ -1053,12 +1053,12 @@ void init(ImageData image) {
* @param data the platform specific GC data
* @return the platform specific GC handle
*/
@@ -7562,7 +7615,7 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
if (data != null) {
int mask = SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT;
if ((data.style & mask) == 0) {
-@@ -1091,7 +1091,7 @@
+@@ -1091,7 +1091,7 @@ public int /*long*/ internal_new_GC (GCData data) {
* @param hDC the platform specific GC handle
* @param data the platform specific GC data
*/
@@ -7571,10 +7624,11 @@ diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphic
OS.g_object_unref(gdkGC);
}
-diff -urN x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics/Path.java
---- x86/org/eclipse/swt/graphics/Path.java 2008-06-05 13:32:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/Path.java 2009-09-17 08:48:24.000000000 -0400
-@@ -47,7 +47,7 @@
+diff --git a/org/eclipse/swt/graphics/Path.java b/org/eclipse/swt/graphics/Path.java
+index f7d2e8a..0fc84a5 100644
+--- a/org/eclipse/swt/graphics/Path.java
++++ b/org/eclipse/swt/graphics/Path.java
+@@ -47,7 +47,7 @@ public class Path extends Resource {
* platforms and should never be accessed from application code.
* </p>
*/
@@ -7583,7 +7637,7 @@ diff -urN x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics
boolean moved, closed = true;
-@@ -76,7 +76,7 @@
+@@ -76,7 +76,7 @@ public class Path extends Resource {
public Path (Device device) {
super(device);
this.device.checkCairo();
@@ -7592,7 +7646,7 @@ diff -urN x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics
if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
handle = Cairo.cairo_create(surface);
Cairo.cairo_surface_destroy(surface);
-@@ -119,12 +119,12 @@
+@@ -119,12 +119,12 @@ public Path (Device device, Path path, float flatness) {
super(device);
if (path == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (path.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
@@ -7607,7 +7661,7 @@ diff -urN x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics
flatness = Math.max(0, flatness);
if (flatness == 0) {
copy = Cairo.cairo_copy_path(path.handle);
-@@ -249,7 +249,7 @@
+@@ -249,7 +249,7 @@ public void addPath(Path path) {
if (path == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (path.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
moved = false;
@@ -7616,7 +7670,7 @@ diff -urN x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(handle, copy);
Cairo.cairo_path_destroy(copy);
-@@ -348,8 +348,8 @@
+@@ -348,8 +348,8 @@ public boolean contains(float x, float y, GC gc, boolean outline) {
gc.initCairo();
gc.checkGC(GC.LINE_CAP | GC.LINE_JOIN | GC.LINE_STYLE | GC.LINE_WIDTH);
boolean result = false;
@@ -7627,7 +7681,7 @@ diff -urN x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(cairo, copy);
Cairo.cairo_path_destroy(copy);
-@@ -407,7 +407,7 @@
+@@ -407,7 +407,7 @@ public void getBounds(float[] bounds) {
if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (bounds == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (bounds.length < 4) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
@@ -7636,7 +7690,7 @@ diff -urN x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
cairo_path_t path = new cairo_path_t();
Cairo.memmove(path, copy, cairo_path_t.sizeof);
-@@ -419,7 +419,7 @@
+@@ -419,7 +419,7 @@ public void getBounds(float[] bounds) {
double[] points = new double[6];
cairo_path_data_t data = new cairo_path_data_t();
while (i < path.num_data) {
@@ -7645,7 +7699,7 @@ diff -urN x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics
Cairo.memmove(data, offset, cairo_path_data_t.sizeof);
switch (data.type) {
case Cairo.CAIRO_PATH_MOVE_TO:
-@@ -500,7 +500,7 @@
+@@ -500,7 +500,7 @@ public void getCurrentPoint(float[] point) {
*/
public PathData getPathData() {
if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -7654,7 +7708,7 @@ diff -urN x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
cairo_path_t path = new cairo_path_t();
Cairo.memmove(path, copy, cairo_path_t.sizeof);
-@@ -512,7 +512,7 @@
+@@ -512,7 +512,7 @@ public PathData getPathData() {
double[] points = new double[6];
cairo_path_data_t data = new cairo_path_data_t();
while (i < path.num_data) {
@@ -7663,10 +7717,11 @@ diff -urN x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics
Cairo.memmove(data, offset, cairo_path_data_t.sizeof);
switch (data.type) {
case Cairo.CAIRO_PATH_MOVE_TO:
-diff -urN x86/org/eclipse/swt/graphics/Pattern.java x86_64/org/eclipse/swt/graphics/Pattern.java
---- x86/org/eclipse/swt/graphics/Pattern.java 2008-06-05 13:32:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/Pattern.java 2009-09-17 08:48:24.000000000 -0400
-@@ -44,9 +44,9 @@
+diff --git a/org/eclipse/swt/graphics/Pattern.java b/org/eclipse/swt/graphics/Pattern.java
+index 0711132..c9b9cec 100644
+--- a/org/eclipse/swt/graphics/Pattern.java
++++ b/org/eclipse/swt/graphics/Pattern.java
+@@ -44,9 +44,9 @@ public class Pattern extends Resource {
* platforms and should never be accessed from application code.
* </p>
*/
@@ -7678,10 +7733,11 @@ diff -urN x86/org/eclipse/swt/graphics/Pattern.java x86_64/org/eclipse/swt/graph
/**
* Constructs a new Pattern given an image. Drawing with the resulting
-diff -urN x86/org/eclipse/swt/graphics/Region.java x86_64/org/eclipse/swt/graphics/Region.java
---- x86/org/eclipse/swt/graphics/Region.java 2008-06-05 13:32:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/Region.java 2009-09-17 08:48:24.000000000 -0400
-@@ -38,7 +38,7 @@
+diff --git a/org/eclipse/swt/graphics/Region.java b/org/eclipse/swt/graphics/Region.java
+index 3ddb8b5..11fd2bc 100644
+--- a/org/eclipse/swt/graphics/Region.java
++++ b/org/eclipse/swt/graphics/Region.java
+@@ -38,7 +38,7 @@ public final class Region extends Resource {
* platforms and should never be accessed from application code.
* </p>
*/
@@ -7690,7 +7746,7 @@ diff -urN x86/org/eclipse/swt/graphics/Region.java x86_64/org/eclipse/swt/graphi
/**
* Constructs a new empty region.
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,7 @@ public Region(Device device) {
init();
}
@@ -7699,7 +7755,7 @@ diff -urN x86/org/eclipse/swt/graphics/Region.java x86_64/org/eclipse/swt/graphi
super(device);
this.handle = handle;
}
-@@ -107,7 +107,7 @@
+@@ -107,7 +107,7 @@ public void add (int[] pointArray) {
* with enough points for a polygon.
*/
if (pointArray.length < 6) return;
@@ -7708,7 +7764,7 @@ diff -urN x86/org/eclipse/swt/graphics/Region.java x86_64/org/eclipse/swt/graphi
OS.gdk_region_union(handle, polyRgn);
OS.gdk_region_destroy(polyRgn);
}
-@@ -263,7 +263,7 @@
+@@ -263,7 +263,7 @@ public Rectangle getBounds() {
return new Rectangle(gdkRect.x, gdkRect.y, gdkRect.width, gdkRect.height);
}
@@ -7717,7 +7773,7 @@ diff -urN x86/org/eclipse/swt/graphics/Region.java x86_64/org/eclipse/swt/graphi
return new Region(device, handle);
}
-@@ -329,7 +329,7 @@
+@@ -329,7 +329,7 @@ public void intersect(int x, int y, int width, int height) {
gdkRect.y = y;
gdkRect.width = width;
gdkRect.height = height;
@@ -7726,7 +7782,7 @@ diff -urN x86/org/eclipse/swt/graphics/Region.java x86_64/org/eclipse/swt/graphi
OS.gdk_region_intersect(handle, rectRgn);
OS.gdk_region_destroy(rectRgn);
}
-@@ -460,7 +460,7 @@
+@@ -460,7 +460,7 @@ public void subtract (int[] pointArray) {
* with enough points for a polygon.
*/
if (pointArray.length < 6) return;
@@ -7735,7 +7791,7 @@ diff -urN x86/org/eclipse/swt/graphics/Region.java x86_64/org/eclipse/swt/graphi
OS.gdk_region_subtract(handle, polyRgn);
OS.gdk_region_destroy(polyRgn);
}
-@@ -513,7 +513,7 @@
+@@ -513,7 +513,7 @@ public void subtract(int x, int y, int width, int height) {
gdkRect.y = y;
gdkRect.width = width;
gdkRect.height = height;
@@ -7744,10 +7800,11 @@ diff -urN x86/org/eclipse/swt/graphics/Region.java x86_64/org/eclipse/swt/graphi
OS.gdk_region_subtract(handle, rectRgn);
OS.gdk_region_destroy(rectRgn);
}
-diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/graphics/TextLayout.java
---- x86/org/eclipse/swt/graphics/TextLayout.java 2009-05-29 17:30:26.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/TextLayout.java 2009-09-17 08:48:24.000000000 -0400
-@@ -51,7 +51,7 @@
+diff --git a/org/eclipse/swt/graphics/TextLayout.java b/org/eclipse/swt/graphics/TextLayout.java
+index d72c2ba..3f129c3 100644
+--- a/org/eclipse/swt/graphics/TextLayout.java
++++ b/org/eclipse/swt/graphics/TextLayout.java
+@@ -51,7 +51,7 @@ public final class TextLayout extends Resource {
int[] segments;
int[] tabs;
StyleItem[] styles;
@@ -7756,7 +7813,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
int[] invalidOffsets;
static final char LTR_MARK = '\u200E', RTL_MARK = '\u200F', ZWS = '\u200B', ZWNBS = '\uFEFF';
-@@ -103,7 +103,7 @@
+@@ -103,7 +103,7 @@ void computeRuns () {
byte[] buffer = Converter.wcsToMbcs(null, segmentsText, false);
OS.pango_layout_set_text (layout, buffer, buffer.length);
if (styles.length == 2 && styles[0].style == null && ascent == -1 && descent == -1 && segments == null) return;
@@ -7765,7 +7822,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
attrList = OS.pango_attr_list_new();
PangoAttribute attribute = new PangoAttribute();
char[] chars = null;
-@@ -117,12 +117,12 @@
+@@ -117,12 +117,12 @@ void computeRuns () {
int oldPos = 0, lineIndex = 0;
PangoLayoutLine line = new PangoLayoutLine();
while (lineIndex < lineCount) {
@@ -7780,7 +7837,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = bytePos + offset;
attribute.end_index = bytePos + offset + 3;
-@@ -178,7 +178,7 @@
+@@ -178,7 +178,7 @@ void computeRuns () {
byteEnd = Math.min(byteEnd, strlen);
Font font = style.font;
if (font != null && !font.isDisposed() && !defaultFont.equals(font)) {
@@ -7789,7 +7846,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -202,7 +202,7 @@
+@@ -202,7 +202,7 @@ void computeRuns () {
break;
case SWT.UNDERLINE_LINK: {
if (style.foreground == null) {
@@ -7798,7 +7855,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -216,7 +216,7 @@
+@@ -216,7 +216,7 @@ void computeRuns () {
}
}
if (underlineStyle != OS.PANGO_UNDERLINE_NONE && style.underlineColor == null) {
@@ -7807,7 +7864,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.memmove(attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -225,7 +225,7 @@
+@@ -225,7 +225,7 @@ void computeRuns () {
}
}
if (style.strikeout && style.strikeoutColor == null) {
@@ -7816,7 +7873,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.memmove(attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -235,7 +235,7 @@
+@@ -235,7 +235,7 @@ void computeRuns () {
Color foreground = style.foreground;
if (foreground != null && !foreground.isDisposed()) {
GdkColor fg = foreground.handle;
@@ -7825,7 +7882,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -245,7 +245,7 @@
+@@ -245,7 +245,7 @@ void computeRuns () {
Color background = style.background;
if (background != null && !background.isDisposed()) {
GdkColor bg = background.handle;
@@ -7834,7 +7891,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -258,7 +258,7 @@
+@@ -258,7 +258,7 @@ void computeRuns () {
rect.y = -(metrics.ascent * OS.PANGO_SCALE);
rect.height = (metrics.ascent + metrics.descent) * OS.PANGO_SCALE;
rect.width = metrics.width * OS.PANGO_SCALE;
@@ -7843,7 +7900,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -267,7 +267,7 @@
+@@ -267,7 +267,7 @@ void computeRuns () {
}
int rise = style.rise;
if (rise != 0) {
@@ -7852,7 +7909,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -392,15 +392,15 @@
+@@ -392,15 +392,15 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
int length = text.length();
boolean hasSelection = selectionStart <= selectionEnd && selectionStart != -1 && selectionEnd != -1;
GCData data = gc.data;
@@ -7872,7 +7929,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
if (selectionBackground == null) selectionBackground = device.getSystemColor(SWT.COLOR_LIST_SELECTION);
if (cairo != 0 && OS.GTK_VERSION >= OS.VERSION(2, 8, 0)) {
Cairo.cairo_save(cairo);
-@@ -487,7 +487,7 @@
+@@ -487,7 +487,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
boolean fullSelection = selectionStart == 0 && selectionEnd == length - 1;
if (fullSelection) {
if (cairo != 0 && OS.GTK_VERSION >= OS.VERSION(2, 8, 0)) {
@@ -7881,7 +7938,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
if ((data.style & SWT.MIRRORED) != 0) {
Cairo.cairo_save(cairo);
Cairo.cairo_scale(cairo, -1, 1);
-@@ -502,7 +502,7 @@
+@@ -502,7 +502,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
drawBorder(gc, x, y, selectionForeground.handle);
}
} else {
@@ -7890,7 +7947,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
int byteSelStart = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, selectionStart) - ptr);
int byteSelEnd = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, selectionEnd + 1) - ptr);
int strlen = OS.strlen(ptr);
-@@ -524,7 +524,7 @@
+@@ -524,7 +524,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
OS.gdk_draw_layout(data.drawable, gc.handle, x, y, layout);
drawBorder(gc, x, y, null);
int[] ranges = new int[]{byteSelStart, byteSelEnd};
@@ -7899,7 +7956,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
if (rgn != 0) {
OS.gdk_gc_set_clip_region(gc.handle, rgn);
OS.gdk_region_destroy(rgn);
-@@ -540,7 +540,7 @@
+@@ -540,7 +540,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
void drawWithCairo(GC gc, int x, int y, int start, int end, boolean fullSelection, GdkColor fg, GdkColor bg) {
GCData data = gc.data;
@@ -7908,7 +7965,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
Cairo.cairo_save(cairo);
if (!fullSelection) {
Cairo.cairo_move_to(cairo, x, y);
-@@ -548,7 +548,7 @@
+@@ -548,7 +548,7 @@ void drawWithCairo(GC gc, int x, int y, int start, int end, boolean fullSelectio
drawBorder(gc, x, y, null);
}
int[] ranges = new int[]{start, end};
@@ -7917,7 +7974,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
if (rgn != 0) {
OS.gdk_cairo_region(cairo, rgn);
Cairo.cairo_clip(cairo);
-@@ -565,9 +565,9 @@
+@@ -565,9 +565,9 @@ void drawWithCairo(GC gc, int x, int y, int start, int end, boolean fullSelectio
void drawBorder(GC gc, int x, int y, GdkColor selectionColor) {
GCData data = gc.data;
@@ -7930,7 +7987,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
GdkGCValues gcValues = null;
if (cairo != 0 && OS.GTK_VERSION >= OS.VERSION(2, 8, 0)) {
Cairo.cairo_save(cairo);
-@@ -587,10 +587,10 @@
+@@ -587,10 +587,10 @@ void drawBorder(GC gc, int x, int y, GdkColor selectionColor) {
int byteStart = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, start) - ptr);
int byteEnd = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, end + 1) - ptr);
int[] ranges = new int[]{byteStart, byteEnd};
@@ -7943,7 +8000,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.gdk_region_get_rectangles(rgn, rects, nRects);
GdkRectangle rect = new GdkRectangle();
GdkColor color = null;
-@@ -665,10 +665,10 @@
+@@ -665,10 +665,10 @@ void drawBorder(GC gc, int x, int y, GdkColor selectionColor) {
int byteStart = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, start) - ptr);
int byteEnd = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, end + 1) - ptr);
int[] ranges = new int[]{byteStart, byteEnd};
@@ -7956,7 +8013,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.gdk_region_get_rectangles(rgn, rects, nRects);
GdkRectangle rect = new GdkRectangle();
GdkColor color = null;
-@@ -691,8 +691,8 @@
+@@ -691,8 +691,8 @@ void drawBorder(GC gc, int x, int y, GdkColor selectionColor) {
Font font = style.font;
if (font == null) font = this.font;
if (font == null) font = device.systemFont;
@@ -7967,7 +8024,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
underlinePosition = OS.PANGO_PIXELS(OS.pango_font_metrics_get_underline_position(metrics));
underlineThickness = OS.PANGO_PIXELS(OS.pango_font_metrics_get_underline_thickness(metrics));
OS.pango_font_metrics_unref(metrics);
-@@ -764,10 +764,10 @@
+@@ -764,10 +764,10 @@ void drawBorder(GC gc, int x, int y, GdkColor selectionColor) {
int byteStart = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, start) - ptr);
int byteEnd = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, end + 1) - ptr);
int[] ranges = new int[]{byteStart, byteEnd};
@@ -7980,7 +8037,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.gdk_region_get_rectangles(rgn, rects, nRects);
GdkRectangle rect = new GdkRectangle();
GdkColor color = null;
-@@ -790,8 +790,8 @@
+@@ -790,8 +790,8 @@ void drawBorder(GC gc, int x, int y, GdkColor selectionColor) {
Font font = style.font;
if (font == null) font = this.font;
if (font == null) font = device.systemFont;
@@ -7991,7 +8048,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
strikeoutPosition = OS.PANGO_PIXELS(OS.pango_font_metrics_get_strikethrough_position(metrics));
strikeoutThickness = OS.PANGO_PIXELS(OS.pango_font_metrics_get_strikethrough_thickness(metrics));
OS.pango_font_metrics_unref(metrics);
-@@ -930,14 +930,14 @@
+@@ -930,14 +930,14 @@ public Rectangle getBounds(int start, int end) {
end = Math.min(Math.max(0, end), length - 1);
start = translateOffset(start);
end = translateOffset(end);
@@ -8008,7 +8065,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
if (clipRegion == 0) return new Rectangle(0, 0, 0, 0);
GdkRectangle rect = new GdkRectangle();
-@@ -947,9 +947,9 @@
+@@ -947,9 +947,9 @@ public Rectangle getBounds(int start, int end) {
* is to subtract these areas from the clip region.
*/
PangoRectangle pangoRect = new PangoRectangle();
@@ -8020,7 +8077,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
if (linesRegion == 0) SWT.error(SWT.ERROR_NO_HANDLES);
int lineEnd = 0;
do {
-@@ -1064,17 +1064,17 @@
+@@ -1064,17 +1064,17 @@ public int getLevel(int offset) {
int length = text.length();
if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_RANGE);
offset = translateOffset(offset);
@@ -8042,7 +8099,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
if (runPtr != 0) {
OS.memmove(run, runPtr, PangoLayoutRun.sizeof);
OS.memmove(item, run.item, PangoItem.sizeof);
-@@ -1106,7 +1106,7 @@
+@@ -1106,7 +1106,7 @@ public Rectangle getLineBounds(int lineIndex) {
computeRuns();
int lineCount = OS.pango_layout_get_line_count(layout);
if (!(0 <= lineIndex && lineIndex < lineCount)) SWT.error(SWT.ERROR_INVALID_RANGE);
@@ -8051,7 +8108,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES);
for (int i = 0; i < lineIndex; i++) OS.pango_layout_iter_next_line(iter);
PangoRectangle rect = new PangoRectangle();
-@@ -1162,11 +1162,11 @@
+@@ -1162,11 +1162,11 @@ public int getLineIndex(int offset) {
if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
offset = translateOffset(offset);
int line = 0;
@@ -8066,7 +8123,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES);
while (OS.pango_layout_iter_next_line(iter)) {
if (OS.pango_layout_iter_get_index(iter) > byteOffset) break;
-@@ -1198,9 +1198,9 @@
+@@ -1198,9 +1198,9 @@ public FontMetrics getLineMetrics (int lineIndex) {
PangoLayoutLine line = new PangoLayoutLine();
OS.memmove(line, OS.pango_layout_get_line(layout, lineIndex), PangoLayoutLine.sizeof);
if (line.runs == 0) {
@@ -8079,7 +8136,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
ascent = OS.pango_font_metrics_get_ascent(metrics);
descent = OS.pango_font_metrics_get_descent(metrics);
OS.pango_font_metrics_unref(metrics);
-@@ -1231,10 +1231,10 @@
+@@ -1231,10 +1231,10 @@ public int[] getLineOffsets() {
computeRuns();
int lineCount = OS.pango_layout_get_line_count(layout);
int[] offsets = new int [lineCount + 1];
@@ -8092,7 +8149,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
OS.memmove(line, linePtr, PangoLayoutLine.sizeof);
int pos = (int)/*64*/OS.g_utf8_pointer_to_offset(ptr, ptr + line.start_index);
offsets[i] = untranslateOffset(pos);
-@@ -1265,7 +1265,7 @@
+@@ -1265,7 +1265,7 @@ public Point getLocation(int offset, boolean trailing) {
int length = text.length();
if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_RANGE);
offset = translateOffset(offset);
@@ -8101,7 +8158,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
int byteOffset = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, offset) - ptr);
int strlen = OS.strlen(ptr);
byteOffset = Math.min(byteOffset, strlen);
-@@ -1315,7 +1315,7 @@
+@@ -1315,7 +1315,7 @@ int _getOffset (int offset, int movement, boolean forward) {
}
int step = forward ? 1 : -1;
if ((movement & SWT.MOVEMENT_CHAR) != 0) return offset + step;
@@ -8110,7 +8167,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
int[] nAttrs = new int[1];
OS.pango_layout_get_log_attrs(layout, attrs, nAttrs);
if (attrs[0] == 0) return offset + step;
-@@ -1412,7 +1412,7 @@
+@@ -1412,7 +1412,7 @@ public int getOffset(int x, int y, int[] trailing) {
* visual offset. The fix is to clamp the coordinates inside the
* line bounds.
*/
@@ -8119,7 +8176,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES);
PangoRectangle rect = new PangoRectangle();
do {
-@@ -1432,7 +1432,7 @@
+@@ -1432,7 +1432,7 @@ public int getOffset(int x, int y, int[] trailing) {
int[] index = new int[1];
int[] piTrailing = new int[1];
OS.pango_layout_xy_to_index(layout, x * OS.PANGO_SCALE, y * OS.PANGO_SCALE, index, piTrailing);
@@ -8128,7 +8185,7 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
int offset = (int)/*64*/OS.g_utf8_pointer_to_offset(ptr, ptr + index[0]);
if (trailing != null) trailing[0] = piTrailing[0];
return untranslateOffset(offset);
-@@ -2037,7 +2037,7 @@
+@@ -2037,7 +2037,7 @@ public void setTabs(int[] tabs) {
if (tabs == null) {
OS.pango_layout_set_tabs(layout, device.emptyTab);
} else {
@@ -8137,99 +8194,286 @@ diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gr
if (tabArray != 0) {
for (int i = 0; i < tabs.length; i++) {
OS.pango_tab_array_set_tab(tabArray, i, OS.PANGO_TAB_LEFT, tabs[i]);
-diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java 2009-05-29 17:30:18.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java 2009-09-17 08:48:24.000000000 -0400
-@@ -18,17 +18,17 @@
- public class AtkActionIface {
- // GTypeInterface parent;
- /** @field cast=(gboolean (*)()) */
-- public int /*long*/ do_action;
-+ public long /*int*/ do_action;
- /** @field cast=(gint (*)()) */
-- public int /*long*/ get_n_actions;
-+ public long /*int*/ get_n_actions;
- /** @field cast=(G_CONST_RETURN gchar *(*)()) */
-- public int /*long*/ get_description;
-+ public long /*int*/ get_description;
- /** @field cast=(G_CONST_RETURN gchar *(*)()) */
-- public int /*long*/ get_name;
-+ public long /*int*/ get_name;
- /** @field cast=(G_CONST_RETURN gchar *(*)()) */
-- public int /*long*/ get_keybinding;
-+ public long /*int*/ get_keybinding;
- /** @field cast=(gboolean (*)()) */
-- public int /*long*/ set_description;
-+ public long /*int*/ set_description;
- // AtkFunction pad1;
- // AtkFunction pad2;
+diff --git a/org/eclipse/swt/internal/BidiUtil.java b/org/eclipse/swt/internal/BidiUtil.java
+index b46c263..d39ac6c 100644
+--- a/org/eclipse/swt/internal/BidiUtil.java
++++ b/org/eclipse/swt/internal/BidiUtil.java
+@@ -42,7 +42,7 @@ public class BidiUtil {
+ /*
+ * Not implemented.
+ */
+-public static void addLanguageListener(int /*long*/ hwnd, Runnable runnable) {
++public static void addLanguageListener(long /*int*/ hwnd, Runnable runnable) {
+ }
+ public static void addLanguageListener (Control control, Runnable runnable) {
+ }
+@@ -93,7 +93,7 @@ public static int getKeyboardLanguage() {
+ /*
+ * Not implemented.
+ */
+-public static void removeLanguageListener(int /*long*/ hwnd) {
++public static void removeLanguageListener(long /*int*/ hwnd) {
+ }
+ public static void removeLanguageListener (Control control) {
}
-diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java 2009-05-29 17:30:18.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,29 +17,29 @@
+@@ -105,7 +105,7 @@ public static void setKeyboardLanguage(int language) {
+ /*
+ * Not implemented.
+ */
+-public static boolean setOrientation(int /*long*/ hwnd, int orientation) {
++public static boolean setOrientation(long /*int*/ hwnd, int orientation) {
+ return false;
+ }
+ public static boolean setOrientation (Control control, int orientation) {
+diff --git a/org/eclipse/swt/internal/C.java b/org/eclipse/swt/internal/C.java
+index 886cb6e..34d0658 100644
+--- a/org/eclipse/swt/internal/C.java
++++ b/org/eclipse/swt/internal/C.java
+@@ -24,118 +24,118 @@ public class C extends Platform {
+ public static final int PTR_SIZEOF = PTR_sizeof ();
- public class AtkComponentIface {
- /** @field cast=(guint (*)()) */
-- public int /*long*/ add_focus_handler;
-+ public long /*int*/ add_focus_handler;
- /** @field cast=(gboolean (*)()) */
-- public int /*long*/ contains;
-+ public long /*int*/ contains;
- /** @field cast=(AtkObject *(*)()) */
-- public int /*long*/ ref_accessible_at_point;
-+ public long /*int*/ ref_accessible_at_point;
- /** @field cast=(void (*)()) */
-- public int /*long*/ get_extents;
-+ public long /*int*/ get_extents;
- /** @field cast=(void (*)()) */
-- public int /*long*/ get_position;
-+ public long /*int*/ get_position;
- /** @field cast=(void (*)()) */
-- public int /*long*/ get_size;
-+ public long /*int*/ get_size;
- /** @field cast=(gboolean (*)()) */
-- public int /*long*/ grab_focus;
-+ public long /*int*/ grab_focus;
- /** @field cast=(void (*)()) */
-- public int /*long*/ remove_focus_handler;
-+ public long /*int*/ remove_focus_handler;
- /** @field cast=(gboolean (*)()) */
-- public int /*long*/ set_extents;
-+ public long /*int*/ set_extents;
- /** @field cast=(gboolean (*)()) */
-- public int /*long*/ set_position;
-+ public long /*int*/ set_position;
- /** @field cast=(gboolean (*)()) */
-- public int /*long*/ set_size;
-+ public long /*int*/ set_size;
- /** @field cast=(AtkLayer (*)()) */
-- public int /*long*/ get_layer;
-+ public long /*int*/ get_layer;
- /** @field cast=(gint (*)()) */
-- public int /*long*/ get_mdi_zorder;
-+ public long /*int*/ get_mdi_zorder;
+ /** @param ptr cast=(void *) */
+-public static final native void free (int /*long*/ ptr);
++public static final native void free (long /*int*/ ptr);
+ /** @param env cast=(const char *) */
+-public static final native int /*long*/ getenv (byte[] env);
+-public static final native int /*long*/ malloc (int /*long*/ size);
++public static final native long /*int*/ getenv (byte[] env);
++public static final native long /*int*/ malloc (long /*int*/ size);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out critical
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove (int /*long*/ dest, byte[] src, int /*long*/ size);
++public static final native void memmove (long /*int*/ dest, byte[] src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out critical
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove (int /*long*/ dest, char[] src, int /*long*/ size);
++public static final native void memmove (long /*int*/ dest, char[] src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out critical
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove (int /*long*/ dest, double[] src, int /*long*/ size);
++public static final native void memmove (long /*int*/ dest, double[] src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out critical
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove (int /*long*/ dest, float[] src, int /*long*/ size);
++public static final native void memmove (long /*int*/ dest, float[] src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out critical
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove (int /*long*/ dest, int[] src, int /*long*/ size);
++public static final native void memmove (long /*int*/ dest, int[] src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out critical
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove (int /*long*/ dest, long[] src, int /*long*/ size);
++public static final native void memmove (long /*int*/ dest, long[] src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out critical
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove (int /*long*/ dest, short[] src, int /*long*/ size);
++public static final native void memmove (long /*int*/ dest, short[] src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(const void *),flags=no_out critical
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove (byte[] dest, char[] src, int /*long*/ size);
++public static final native void memmove (byte[] dest, char[] src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove (byte[] dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove (byte[] dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove (int /*long*/ dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove (long /*int*/ dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove (char[] dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove (char[] dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove (double[] dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove (double[] dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove (float[] dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove (float[] dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove (int[] dest, byte[] src, int /*long*/ size);
++public static final native void memmove (int[] dest, byte[] src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove (short[] dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove (short[] dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove (int[] dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove (int[] dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove (long[] dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove (long[] dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param buffer cast=(void *),flags=critical
+ * @param num cast=(size_t)
+ */
+-public static final native int /*long*/ memset (int /*long*/ buffer, int c, int /*long*/ num);
++public static final native long /*int*/ memset (long /*int*/ buffer, int c, long /*int*/ num);
+ public static final native int PTR_sizeof ();
+ /** @param s cast=(char *) */
+-public static final native int strlen (int /*long*/ s);
++public static final native int strlen (long /*int*/ s);
}
-diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java 2009-05-29 17:30:18.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,9 +17,9 @@
+diff --git a/org/eclipse/swt/internal/Callback.java b/org/eclipse/swt/internal/Callback.java
+index ce73d17..086bf2e 100644
+--- a/org/eclipse/swt/internal/Callback.java
++++ b/org/eclipse/swt/internal/Callback.java
+@@ -28,7 +28,7 @@ public class Callback {
+ Object object;
+ String method, signature;
+ int argCount;
+- int /*long*/ address, errorResult;
++ long /*int*/ address, errorResult;
+ boolean isStatic, isArrayBased;
- public class AtkHypertextIface {
- /** @field cast=(AtkHyperlink *(*)()) */
-- public int /*long*/ get_link;
-+ public long /*int*/ get_link;
- /** @field cast=(gint (*)()) */
-- public int /*long*/ get_n_links;
-+ public long /*int*/ get_n_links;
- /** @field cast=(gint (*)()) */
-- public int /*long*/ get_link_index;
-+ public long /*int*/ get_link_index;
+ static final String PTR_SIGNATURE = C.PTR_SIZEOF == 4 ? "I" : "J"; //$NON-NLS-1$ //$NON-NLS-2$
+@@ -88,7 +88,7 @@ public Callback (Object object, String method, int argCount, boolean isArrayBase
+ * @param isArrayBased <code>true</code> if the arguments should be passed in an array and false otherwise
+ * @param errorResult the return value if the java code throws an exception
+ */
+-public Callback (Object object, String method, int argCount, boolean isArrayBased, int /*long*/ errorResult) {
++public Callback (Object object, String method, int argCount, boolean isArrayBased, long /*int*/ errorResult) {
+
+ /* Set the callback fields */
+ this.object = object;
+@@ -131,7 +131,7 @@ public Callback (Object object, String method, int argCount, boolean isArrayBase
+ * @param isArrayBased whether the callback's method is array based
+ * @param errorResult the callback's error result
+ */
+-static native synchronized int /*long*/ bind (Callback callback, Object object, String method, String signature, int argCount, boolean isStatic, boolean isArrayBased, int /*long*/ errorResult);
++static native synchronized long /*int*/ bind (Callback callback, Object object, String method, String signature, int argCount, boolean isStatic, boolean isArrayBased, long /*int*/ errorResult);
+
+ /**
+ * Releases the native level resources associated with the callback,
+@@ -152,7 +152,7 @@ public void dispose () {
+ *
+ * @return the callback address
+ */
+-public int /*long*/ getAddress () {
++public long /*int*/ getAddress () {
+ return address;
+ }
+
+diff --git a/org/eclipse/swt/internal/Converter.java b/org/eclipse/swt/internal/Converter.java
+index 779baed..717965f 100644
+--- a/org/eclipse/swt/internal/Converter.java
++++ b/org/eclipse/swt/internal/Converter.java
+@@ -37,8 +37,8 @@ public static String defaultCodePage () {
+ }
+
+ public static char [] mbcsToWcs (String codePage, byte [] buffer) {
+- int /*long*/ [] items_written = new int /*long*/ [1];
+- int /*long*/ ptr = OS.g_utf8_to_utf16 (buffer, buffer.length, null, items_written, null);
++ long /*int*/ [] items_written = new long /*int*/ [1];
++ long /*int*/ ptr = OS.g_utf8_to_utf16 (buffer, buffer.length, null, items_written, null);
+ if (ptr == 0) return EmptyCharArray;
+ int length = (int)/*64*/items_written [0];
+ char [] chars = new char [length];
+@@ -55,12 +55,12 @@ public static byte [] wcsToMbcs (String codePage, String string, boolean termina
}
-diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/eclipse/swt/internal/accessibility/gtk/ATK.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java 2009-05-29 17:30:18.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/ATK.java 2009-09-17 08:48:24.000000000 -0400
-@@ -90,8 +90,8 @@
+
+ public static byte [] wcsToMbcs (String codePage, char [] buffer, boolean terminate) {
+- int /*long*/ [] items_read = new int /*long*/ [1], items_written = new int /*long*/ [1];
++ long /*int*/ [] items_read = new long /*int*/ [1], items_written = new long /*int*/ [1];
+ /*
+ * Note that g_utf16_to_utf8() stops converting
+ * when it finds the first NULL.
+ */
+- int /*long*/ ptr = OS.g_utf16_to_utf8 (buffer, buffer.length, items_read, items_written, null);
++ long /*int*/ ptr = OS.g_utf16_to_utf8 (buffer, buffer.length, items_read, items_written, null);
+ if (ptr == 0) return terminate ? NullByteArray : EmptyByteArray;
+ int written = (int)/*64*/items_written [0];
+ byte [] bytes = new byte [written + (terminate ? 1 : 0)];
+diff --git a/org/eclipse/swt/internal/LONG.java b/org/eclipse/swt/internal/LONG.java
+index 8609adc..c0fb680 100644
+--- a/org/eclipse/swt/internal/LONG.java
++++ b/org/eclipse/swt/internal/LONG.java
+@@ -12,9 +12,9 @@ package org.eclipse.swt.internal;
+
+ /** @jniclass flags=no_gen */
+ public class LONG {
+- public int /*long*/ value;
++ public long /*int*/ value;
+
+- public LONG (int /*long*/ value) {
++ public LONG (long /*int*/ value) {
+ this.value = value;
+ }
+
+diff --git a/org/eclipse/swt/internal/Library.java b/org/eclipse/swt/internal/Library.java
+index 1f9a8c5..ed2a9bd 100644
+--- a/org/eclipse/swt/internal/Library.java
++++ b/org/eclipse/swt/internal/Library.java
+@@ -39,7 +39,7 @@ public class Library {
+ static final String SEPARATOR;
+
+ /* 64-bit support */
+- static /*final*/ boolean IS_64 = 0x1FFFFFFFFL == (int /*long*/)0x1FFFFFFFFL;
++ static /*final*/ boolean IS_64 = 0x1FFFFFFFFL == (long /*int*/)0x1FFFFFFFFL;
+ static final String SUFFIX_64 = "-64"; //$NON-NLS-1$
+ static final String SWTDIR_32 = "swtlib-32"; //$NON-NLS-1$
+ static final String SWTDIR_64 = "swtlib-64"; //$NON-NLS-1$
+diff --git a/org/eclipse/swt/internal/accessibility/gtk/ATK.java b/org/eclipse/swt/internal/accessibility/gtk/ATK.java
+index 77201aa..9378db6 100644
+--- a/org/eclipse/swt/internal/accessibility/gtk/ATK.java
++++ b/org/eclipse/swt/internal/accessibility/gtk/ATK.java
+@@ -90,8 +90,8 @@ public static final native int AtkObjectFactory_sizeof ();
public static final native int AtkObjectFactoryClass_sizeof ();
/** Natives */
@@ -8240,7 +8484,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _ATK_ACTION_GET_IFACE(obj);
-@@ -99,8 +99,8 @@
+@@ -99,8 +99,8 @@ public static final int /*long*/ ATK_ACTION_GET_IFACE (int /*long*/ obj) {
lock.unlock();
}
}
@@ -8251,7 +8495,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _ATK_COMPONENT_GET_IFACE(atkHandle);
-@@ -108,8 +108,8 @@
+@@ -108,8 +108,8 @@ public static final int /*long*/ ATK_COMPONENT_GET_IFACE(int /*long*/ atkHandle)
lock.unlock();
}
}
@@ -8262,7 +8506,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _ATK_OBJECT_FACTORY_CLASS(klass);
-@@ -117,8 +117,8 @@
+@@ -117,8 +117,8 @@ public static final int /*long*/ ATK_OBJECT_FACTORY_CLASS (int /*long*/ klass) {
lock.unlock();
}
}
@@ -8273,7 +8517,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _ATK_SELECTION_GET_IFACE(obj);
-@@ -126,8 +126,8 @@
+@@ -126,8 +126,8 @@ public static final int /*long*/ ATK_SELECTION_GET_IFACE (int /*long*/ obj) {
lock.unlock();
}
}
@@ -8284,7 +8528,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _ATK_TEXT_GET_IFACE(handle);
-@@ -135,8 +135,8 @@
+@@ -135,8 +135,8 @@ public static final int /*long*/ ATK_TEXT_GET_IFACE (int /*long*/ handle) {
lock.unlock();
}
}
@@ -8295,7 +8539,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _GTK_ACCESSIBLE(handle);
-@@ -145,8 +145,8 @@
+@@ -145,8 +145,8 @@ public static final int /*long*/ GTK_ACCESSIBLE (int /*long*/ handle) {
}
}
/** @param object cast=(AtkObject *) */
@@ -8306,7 +8550,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
_atk_focus_tracker_notify(object);
-@@ -154,8 +154,8 @@
+@@ -154,8 +154,8 @@ public static final void atk_focus_tracker_notify (int /*long*/ object) {
lock.unlock();
}
}
@@ -8317,7 +8561,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _atk_get_default_registry();
-@@ -167,8 +167,8 @@
+@@ -167,8 +167,8 @@ public static final int /*long*/ atk_get_default_registry () {
* @param factory cast=(AtkObjectFactory *)
* @param obj cast=(GObject *)
*/
@@ -8328,7 +8572,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _atk_object_factory_create_accessible(factory, obj);
-@@ -177,8 +177,8 @@
+@@ -177,8 +177,8 @@ public static final int /*long*/ atk_object_factory_create_accessible (int /*lon
}
}
/** @param factory cast=(AtkObjectFactory *) */
@@ -8339,7 +8583,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _atk_object_factory_get_accessible_type(factory);
-@@ -190,8 +190,8 @@
+@@ -190,8 +190,8 @@ public static final int /*long*/ atk_object_factory_get_accessible_type (int /*l
* @param accessible cast=(AtkObject *)
* @param data cast=(gpointer)
*/
@@ -8350,7 +8594,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
_atk_object_initialize(accessible, data);
-@@ -200,8 +200,8 @@
+@@ -200,8 +200,8 @@ public static final void atk_object_initialize (int /*long*/ accessible, int /*l
}
}
/** @param accessible cast=(AtkObject *) */
@@ -8361,7 +8605,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _atk_object_ref_relation_set(accessible);
-@@ -213,8 +213,8 @@
+@@ -213,8 +213,8 @@ public static final int /*long*/ atk_object_ref_relation_set (int /*long*/ acces
* @param registry cast=(AtkRegistry *)
* @param type cast=(GType)
*/
@@ -8372,7 +8616,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _atk_registry_get_factory(registry, type);
-@@ -227,8 +227,8 @@
+@@ -227,8 +227,8 @@ public static final int /*long*/ atk_registry_get_factory (int /*long*/ registry
* @param type cast=(GType)
* @param factory_type cast=(GType)
*/
@@ -8383,7 +8627,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
_atk_registry_set_factory_type(registry, type, factory_type);
-@@ -237,8 +237,8 @@
+@@ -237,8 +237,8 @@ public static final void atk_registry_set_factory_type (int /*long*/ registry, i
}
}
/** @param set cast=(AtkRelationSet *) */
@@ -8394,7 +8638,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _atk_relation_set_get_n_relations(set);
-@@ -247,8 +247,8 @@
+@@ -247,8 +247,8 @@ public static final int atk_relation_set_get_n_relations (int /*long*/ set) {
}
}
/** @param set cast=(AtkRelationSet *) */
@@ -8405,7 +8649,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _atk_relation_set_get_relation (set, i);
-@@ -260,8 +260,8 @@
+@@ -260,8 +260,8 @@ public static final int /*long*/ atk_relation_set_get_relation (int /*long*/ set
* @param set cast=(AtkRelationSet *)
* @param relation cast=(AtkRelation *)
*/
@@ -8416,7 +8660,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
_atk_relation_set_remove (set, relation);
-@@ -273,8 +273,8 @@
+@@ -273,8 +273,8 @@ public static final void atk_relation_set_remove (int /*long*/ set, int /*long*/
* @param set cast=(AtkStateSet *)
* @param type cast=(AtkStateType)
*/
@@ -8427,7 +8671,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _atk_state_set_add_state(set, type);
-@@ -282,8 +282,8 @@
+@@ -282,8 +282,8 @@ public static final boolean atk_state_set_add_state (int /*long*/ set, int type)
lock.unlock();
}
}
@@ -8438,7 +8682,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _atk_state_set_new();
-@@ -291,8 +291,8 @@
+@@ -291,8 +291,8 @@ public static final int /*long*/ atk_state_set_new () {
lock.unlock();
}
}
@@ -8449,7 +8693,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _call(function, arg0);
-@@ -300,8 +300,8 @@
+@@ -300,8 +300,8 @@ public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0)
lock.unlock();
}
}
@@ -8460,7 +8704,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _call(function, arg0, arg1);
-@@ -309,8 +309,8 @@
+@@ -309,8 +309,8 @@ public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0,
lock.unlock();
}
}
@@ -8471,7 +8715,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _call(function, arg0, arg1, arg2);
-@@ -318,8 +318,8 @@
+@@ -318,8 +318,8 @@ public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0,
lock.unlock();
}
}
@@ -8482,7 +8726,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _call(function, arg0, arg1, arg2, arg3);
-@@ -327,8 +327,8 @@
+@@ -327,8 +327,8 @@ public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0,
lock.unlock();
}
}
@@ -8493,7 +8737,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _call(function, arg0, arg1, arg2, arg3, arg4);
-@@ -336,8 +336,8 @@
+@@ -336,8 +336,8 @@ public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0,
lock.unlock();
}
}
@@ -8504,7 +8748,7 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
lock.lock();
try {
return _call(function, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -345,19 +345,19 @@
+@@ -345,19 +345,19 @@ public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0,
lock.unlock();
}
}
@@ -8539,10 +8783,103 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecl
+public static final native void memmove (long /*int*/ dest, AtkSelectionIface src);
+public static final native void memmove (long /*int*/ dest, AtkTextIface src);
}
-diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java 2009-05-29 17:30:18.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,49 +17,49 @@
+diff --git a/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java b/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java
+index 94409fc..8d4f7f2 100644
+--- a/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java
++++ b/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java
+@@ -18,17 +18,17 @@ package org.eclipse.swt.internal.accessibility.gtk;
+ public class AtkActionIface {
+ // GTypeInterface parent;
+ /** @field cast=(gboolean (*)()) */
+- public int /*long*/ do_action;
++ public long /*int*/ do_action;
+ /** @field cast=(gint (*)()) */
+- public int /*long*/ get_n_actions;
++ public long /*int*/ get_n_actions;
+ /** @field cast=(G_CONST_RETURN gchar *(*)()) */
+- public int /*long*/ get_description;
++ public long /*int*/ get_description;
+ /** @field cast=(G_CONST_RETURN gchar *(*)()) */
+- public int /*long*/ get_name;
++ public long /*int*/ get_name;
+ /** @field cast=(G_CONST_RETURN gchar *(*)()) */
+- public int /*long*/ get_keybinding;
++ public long /*int*/ get_keybinding;
+ /** @field cast=(gboolean (*)()) */
+- public int /*long*/ set_description;
++ public long /*int*/ set_description;
+ // AtkFunction pad1;
+ // AtkFunction pad2;
+ }
+diff --git a/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java b/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java
+index 50fdc76..9902c13 100644
+--- a/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java
++++ b/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java
+@@ -17,29 +17,29 @@ package org.eclipse.swt.internal.accessibility.gtk;
+
+ public class AtkComponentIface {
+ /** @field cast=(guint (*)()) */
+- public int /*long*/ add_focus_handler;
++ public long /*int*/ add_focus_handler;
+ /** @field cast=(gboolean (*)()) */
+- public int /*long*/ contains;
++ public long /*int*/ contains;
+ /** @field cast=(AtkObject *(*)()) */
+- public int /*long*/ ref_accessible_at_point;
++ public long /*int*/ ref_accessible_at_point;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ get_extents;
++ public long /*int*/ get_extents;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ get_position;
++ public long /*int*/ get_position;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ get_size;
++ public long /*int*/ get_size;
+ /** @field cast=(gboolean (*)()) */
+- public int /*long*/ grab_focus;
++ public long /*int*/ grab_focus;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ remove_focus_handler;
++ public long /*int*/ remove_focus_handler;
+ /** @field cast=(gboolean (*)()) */
+- public int /*long*/ set_extents;
++ public long /*int*/ set_extents;
+ /** @field cast=(gboolean (*)()) */
+- public int /*long*/ set_position;
++ public long /*int*/ set_position;
+ /** @field cast=(gboolean (*)()) */
+- public int /*long*/ set_size;
++ public long /*int*/ set_size;
+ /** @field cast=(AtkLayer (*)()) */
+- public int /*long*/ get_layer;
++ public long /*int*/ get_layer;
+ /** @field cast=(gint (*)()) */
+- public int /*long*/ get_mdi_zorder;
++ public long /*int*/ get_mdi_zorder;
+ }
+diff --git a/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java b/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java
+index 44e2331..4366595 100644
+--- a/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java
++++ b/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java
+@@ -17,9 +17,9 @@ package org.eclipse.swt.internal.accessibility.gtk;
+
+ public class AtkHypertextIface {
+ /** @field cast=(AtkHyperlink *(*)()) */
+- public int /*long*/ get_link;
++ public long /*int*/ get_link;
+ /** @field cast=(gint (*)()) */
+- public int /*long*/ get_n_links;
++ public long /*int*/ get_n_links;
+ /** @field cast=(gint (*)()) */
+- public int /*long*/ get_link_index;
++ public long /*int*/ get_link_index;
+ }
+diff --git a/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java b/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java
+index fc61911..2e51552 100644
+--- a/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java
++++ b/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java
+@@ -17,49 +17,49 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class AtkObjectClass {
/** @field cast=(G_CONST_RETURN gchar *(*)()) */
@@ -8615,10 +8952,11 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java x86
- public int /*long*/ visible_data_changed;
+ public long /*int*/ visible_data_changed;
}
-diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java 2009-05-29 17:30:18.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,9 +17,9 @@
+diff --git a/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java b/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java
+index cf340b8..b7880e7 100644
+--- a/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java
++++ b/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java
+@@ -17,9 +17,9 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class AtkObjectFactoryClass {
/** @field cast=(AtkObject *(*)()) */
@@ -8631,10 +8969,11 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.j
- public int /*long*/ get_accessible_type;
+ public long /*int*/ get_accessible_type;
}
-diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java 2009-05-29 17:30:18.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,19 +17,19 @@
+diff --git a/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java b/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java
+index 71052af..08f37eb 100644
+--- a/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java
++++ b/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java
+@@ -17,19 +17,19 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class AtkSelectionIface {
/** @field cast=(gboolean (*)()) */
@@ -8662,10 +9001,11 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java
- public int /*long*/ selection_changed;
+ public long /*int*/ selection_changed;
}
-diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java 2009-05-29 17:30:18.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,43 +17,43 @@
+diff --git a/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java b/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java
+index 5e74aa7..a9fd298 100644
+--- a/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java
++++ b/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java
+@@ -17,43 +17,43 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class AtkTextIface {
/** @field cast=(gchar *(*)()) */
@@ -8729,50 +9069,22 @@ diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java x86_6
- public int /*long*/ text_selection_changed;
+ public long /*int*/ text_selection_changed;
}
-diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java x86_64/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java 2009-05-29 17:30:18.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,5 +17,5 @@
+diff --git a/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java b/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java
+index 6b1013b..68ead1b 100644
+--- a/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java
++++ b/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java
+@@ -17,5 +17,5 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class GtkAccessible {
/** @field cast=(GtkWidget *) */
- public int /*long*/ widget;
+ public long /*int*/ widget;
}
-diff -urN x86/org/eclipse/swt/internal/BidiUtil.java x86_64/org/eclipse/swt/internal/BidiUtil.java
---- x86/org/eclipse/swt/internal/BidiUtil.java 2008-06-05 13:31:46.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/BidiUtil.java 2009-09-17 08:48:24.000000000 -0400
-@@ -42,7 +42,7 @@
- /*
- * Not implemented.
- */
--public static void addLanguageListener(int /*long*/ hwnd, Runnable runnable) {
-+public static void addLanguageListener(long /*int*/ hwnd, Runnable runnable) {
- }
- public static void addLanguageListener (Control control, Runnable runnable) {
- }
-@@ -93,7 +93,7 @@
- /*
- * Not implemented.
- */
--public static void removeLanguageListener(int /*long*/ hwnd) {
-+public static void removeLanguageListener(long /*int*/ hwnd) {
- }
- public static void removeLanguageListener (Control control) {
- }
-@@ -105,7 +105,7 @@
- /*
- * Not implemented.
- */
--public static boolean setOrientation(int /*long*/ hwnd, int orientation) {
-+public static boolean setOrientation(long /*int*/ hwnd, int orientation) {
- return false;
- }
- public static boolean setOrientation (Control control, int orientation) {
-diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/internal/cairo/Cairo.java
---- x86/org/eclipse/swt/internal/cairo/Cairo.java 2009-05-29 17:30:14.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/cairo/Cairo.java 2009-09-17 08:48:22.000000000 -0400
-@@ -109,8 +109,8 @@
+diff --git a/org/eclipse/swt/internal/cairo/Cairo.java b/org/eclipse/swt/internal/cairo/Cairo.java
+index 8836edd..c3d59f6 100644
+--- a/org/eclipse/swt/internal/cairo/Cairo.java
++++ b/org/eclipse/swt/internal/cairo/Cairo.java
+@@ -109,8 +109,8 @@ public static final native int CAIRO_VERSION_ENCODE(int major, int minor, int mi
* @param cr cast=(cairo_t *)
* @param path cast=(cairo_path_t *)
*/
@@ -8783,7 +9095,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_append_path(cr, path);
-@@ -119,8 +119,8 @@
+@@ -119,8 +119,8 @@ public static final void cairo_append_path(int /*long*/ cr, int /*long*/ path) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -8794,7 +9106,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_arc(cr, xc, yc, radius, angle1, angle2);
-@@ -129,8 +129,8 @@
+@@ -129,8 +129,8 @@ public static final void cairo_arc(int /*long*/ cr, double xc, double yc, double
}
}
/** @param cr cast=(cairo_t *) */
@@ -8805,7 +9117,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_arc_negative(cr, xc, yc, radius, angle1, angle2);
-@@ -139,8 +139,8 @@
+@@ -139,8 +139,8 @@ public static final void cairo_arc_negative(int /*long*/ cr, double xc, double y
}
}
/** @param cr cast=(cairo_t *) */
@@ -8816,7 +9128,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_clip(cr);
-@@ -149,8 +149,8 @@
+@@ -149,8 +149,8 @@ public static final void cairo_clip(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -8827,7 +9139,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_clip_preserve(cr);
-@@ -159,8 +159,8 @@
+@@ -159,8 +159,8 @@ public static final void cairo_clip_preserve(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -8838,7 +9150,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_close_path(cr);
-@@ -169,8 +169,8 @@
+@@ -169,8 +169,8 @@ public static final void cairo_close_path(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -8849,7 +9161,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_copy_page(cr);
-@@ -179,8 +179,8 @@
+@@ -179,8 +179,8 @@ public static final void cairo_copy_page(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -8860,7 +9172,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_copy_path(cr);
-@@ -189,8 +189,8 @@
+@@ -189,8 +189,8 @@ public static final int /*long*/ cairo_copy_path(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -8871,7 +9183,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_copy_path_flat(cr);
-@@ -199,8 +199,8 @@
+@@ -199,8 +199,8 @@ public static final int /*long*/ cairo_copy_path_flat(int /*long*/ cr) {
}
}
/** @param target cast=(cairo_surface_t *) */
@@ -8882,7 +9194,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_create(target);
-@@ -209,8 +209,8 @@
+@@ -209,8 +209,8 @@ public static final int /*long*/ cairo_create(int /*long*/ target) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -8893,7 +9205,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_curve_to(cr, x1, y1, x2, y2, x3, y3);
-@@ -219,8 +219,8 @@
+@@ -219,8 +219,8 @@ public static final void cairo_curve_to(int /*long*/ cr, double x1, double y1, d
}
}
/** @param cr cast=(cairo_t *) */
@@ -8904,7 +9216,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_destroy(cr);
-@@ -229,8 +229,8 @@
+@@ -229,8 +229,8 @@ public static final void cairo_destroy(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -8915,7 +9227,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_device_to_user(cr, x, y);
-@@ -239,8 +239,8 @@
+@@ -239,8 +239,8 @@ public static final void cairo_device_to_user(int /*long*/ cr, double[] x, doubl
}
}
/** @param cr cast=(cairo_t *) */
@@ -8926,7 +9238,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_device_to_user_distance(cr, dx, dy);
-@@ -249,8 +249,8 @@
+@@ -249,8 +249,8 @@ public static final void cairo_device_to_user_distance(int /*long*/ cr, double[]
}
}
/** @param cr cast=(cairo_t *) */
@@ -8937,7 +9249,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_fill(cr);
-@@ -259,8 +259,8 @@
+@@ -259,8 +259,8 @@ public static final void cairo_fill(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -8948,7 +9260,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_fill_extents(cr, x1, y1, x2, y2);
-@@ -269,8 +269,8 @@
+@@ -269,8 +269,8 @@ public static final void cairo_fill_extents(int /*long*/ cr, double[] x1, double
}
}
/** @param cr cast=(cairo_t *) */
@@ -8959,7 +9271,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_fill_preserve(cr);
-@@ -279,8 +279,8 @@
+@@ -279,8 +279,8 @@ public static final void cairo_fill_preserve(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -8970,7 +9282,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_font_extents(cr, extents);
-@@ -288,8 +288,8 @@
+@@ -288,8 +288,8 @@ public static final void cairo_font_extents(int /*long*/ cr, cairo_font_extents_
lock.unlock();
}
}
@@ -8981,7 +9293,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_font_options_create();
-@@ -298,8 +298,8 @@
+@@ -298,8 +298,8 @@ public static final int /*long*/ cairo_font_options_create() {
}
}
/** @param options cast=(cairo_font_options_t *) */
@@ -8992,7 +9304,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_font_options_destroy(options);
-@@ -308,8 +308,8 @@
+@@ -308,8 +308,8 @@ public static final void cairo_font_options_destroy(int /*long*/ options) {
}
}
/** @param options cast=(cairo_font_options_t *) */
@@ -9003,7 +9315,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_font_options_get_antialias(options);
-@@ -318,8 +318,8 @@
+@@ -318,8 +318,8 @@ public static final int cairo_font_options_get_antialias(int /*long*/ options) {
}
}
/** @param options cast=(cairo_font_options_t *) */
@@ -9014,7 +9326,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_font_options_set_antialias(options, antialias);
-@@ -328,8 +328,8 @@
+@@ -328,8 +328,8 @@ public static final void cairo_font_options_set_antialias(int /*long*/ options,
}
}
/** @param cr cast=(cairo_t *) */
@@ -9025,7 +9337,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_get_antialias(cr);
-@@ -338,8 +338,8 @@
+@@ -338,8 +338,8 @@ public static final int cairo_get_antialias(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9036,7 +9348,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_get_current_point(cr, x, y);
-@@ -348,8 +348,8 @@
+@@ -348,8 +348,8 @@ public static final void cairo_get_current_point(int /*long*/ cr, double[] x, do
}
}
/** @param cr cast=(cairo_t *) */
@@ -9047,7 +9359,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_get_fill_rule(cr);
-@@ -358,8 +358,8 @@
+@@ -358,8 +358,8 @@ public static final int cairo_get_fill_rule(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9058,7 +9370,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_get_font_face(cr);
-@@ -371,8 +371,8 @@
+@@ -371,8 +371,8 @@ public static final int /*long*/ cairo_get_font_face(int /*long*/ cr) {
* @param cr cast=(cairo_t *)
* @param matrix cast=(cairo_matrix_t *)
*/
@@ -9069,7 +9381,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_get_font_matrix(cr, matrix);
-@@ -384,8 +384,8 @@
+@@ -384,8 +384,8 @@ public static final void cairo_get_font_matrix(int /*long*/ cr, double[] matrix)
* @param cr cast=(cairo_t *)
* @param options cast=(cairo_font_options_t *)
*/
@@ -9080,7 +9392,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_get_font_options(cr, options);
-@@ -394,8 +394,8 @@
+@@ -394,8 +394,8 @@ public static final void cairo_get_font_options(int /*long*/ cr, int /*long*/ op
}
}
/** @param cr cast=(cairo_t *) */
@@ -9091,7 +9403,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_get_line_cap(cr);
-@@ -404,8 +404,8 @@
+@@ -404,8 +404,8 @@ public static final int cairo_get_line_cap(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9102,7 +9414,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_get_line_join(cr);
-@@ -414,8 +414,8 @@
+@@ -414,8 +414,8 @@ public static final int cairo_get_line_join(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9113,7 +9425,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_get_line_width(cr);
-@@ -427,8 +427,8 @@
+@@ -427,8 +427,8 @@ public static final double cairo_get_line_width(int /*long*/ cr) {
* @param cr cast=(cairo_t *)
* @param matrix cast=(cairo_matrix_t *)
*/
@@ -9124,7 +9436,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_get_matrix(cr, matrix);
-@@ -437,8 +437,8 @@
+@@ -437,8 +437,8 @@ public static final void cairo_get_matrix(int /*long*/ cr, double[] matrix) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9135,7 +9447,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_get_miter_limit(cr);
-@@ -447,8 +447,8 @@
+@@ -447,8 +447,8 @@ public static final double cairo_get_miter_limit(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9146,7 +9458,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_get_operator(cr);
-@@ -457,8 +457,8 @@
+@@ -457,8 +457,8 @@ public static final int cairo_get_operator(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9157,7 +9469,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_get_source(cr);
-@@ -467,8 +467,8 @@
+@@ -467,8 +467,8 @@ public static final int /*long*/ cairo_get_source(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9168,7 +9480,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_get_target(cr);
-@@ -477,8 +477,8 @@
+@@ -477,8 +477,8 @@ public static final int /*long*/ cairo_get_target(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9179,7 +9491,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_get_tolerance(cr);
-@@ -491,8 +491,8 @@
+@@ -491,8 +491,8 @@ public static final double cairo_get_tolerance(int /*long*/ cr) {
* @param glyphs cast=(cairo_glyph_t *)
* @param extents cast=(cairo_text_extents_t *)
*/
@@ -9190,7 +9502,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_glyph_extents(cr, glyphs, num_glyphs, extents);
-@@ -504,8 +504,8 @@
+@@ -504,8 +504,8 @@ public static final void cairo_glyph_extents(int /*long*/ cr, int /*long*/ glyph
* @param cr cast=(cairo_t *)
* @param glyphs cast=(cairo_glyph_t *)
*/
@@ -9201,7 +9513,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_glyph_path(cr, glyphs, num_glyphs);
-@@ -514,8 +514,8 @@
+@@ -514,8 +514,8 @@ public static final void cairo_glyph_path(int /*long*/ cr, int /*long*/ glyphs,
}
}
/** @param cr cast=(cairo_t *) */
@@ -9212,7 +9524,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_identity_matrix(cr);
-@@ -523,8 +523,8 @@
+@@ -523,8 +523,8 @@ public static final void cairo_identity_matrix(int /*long*/ cr) {
lock.unlock();
}
}
@@ -9223,7 +9535,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_image_surface_create(format, width, height);
-@@ -533,8 +533,8 @@
+@@ -533,8 +533,8 @@ public static final int /*long*/ cairo_image_surface_create(int format, int widt
}
}
/** @param data cast=(unsigned char *) */
@@ -9234,7 +9546,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_image_surface_create_for_data(data, format, width, height, stride);
-@@ -543,8 +543,8 @@
+@@ -543,8 +543,8 @@ public static final int /*long*/ cairo_image_surface_create_for_data(int /*long*
}
}
/** @param surface cast=(cairo_surface_t *) */
@@ -9245,7 +9557,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_image_surface_get_height(surface);
-@@ -553,8 +553,8 @@
+@@ -553,8 +553,8 @@ public static final int cairo_image_surface_get_height(int /*long*/ surface) {
}
}
/** @param surface cast=(cairo_surface_t *) */
@@ -9256,7 +9568,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_image_surface_get_width(surface);
-@@ -563,8 +563,8 @@
+@@ -563,8 +563,8 @@ public static final int cairo_image_surface_get_width(int /*long*/ surface) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9267,7 +9579,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_in_fill(cr, x, y);
-@@ -573,8 +573,8 @@
+@@ -573,8 +573,8 @@ public static final int cairo_in_fill(int /*long*/ cr, double x, double y) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9278,7 +9590,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_in_stroke(cr, x, y);
-@@ -583,8 +583,8 @@
+@@ -583,8 +583,8 @@ public static final int cairo_in_stroke(int /*long*/ cr, double x, double y) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9289,7 +9601,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_line_to(cr, x, y);
-@@ -596,8 +596,8 @@
+@@ -596,8 +596,8 @@ public static final void cairo_line_to(int /*long*/ cr, double x, double y) {
* @param cr cast=(cairo_t *)
* @param pattern cast=(cairo_pattern_t *)
*/
@@ -9300,7 +9612,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_mask(cr, pattern);
-@@ -609,8 +609,8 @@
+@@ -609,8 +609,8 @@ public static final void cairo_mask(int /*long*/ cr, int /*long*/ pattern) {
* @param cr cast=(cairo_t *)
* @param surface cast=(cairo_surface_t *)
*/
@@ -9311,7 +9623,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_mask_surface(cr, surface, surface_x, surface_y);
-@@ -743,8 +743,8 @@
+@@ -743,8 +743,8 @@ public static final void cairo_matrix_translate(double[] matrix, double tx, doub
}
}
/** @param cr cast=(cairo_t *) */
@@ -9322,7 +9634,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_move_to(cr, x, y);
-@@ -753,8 +753,8 @@
+@@ -753,8 +753,8 @@ public static final void cairo_move_to(int /*long*/ cr, double x, double y) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9333,7 +9645,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_new_path(cr);
-@@ -763,8 +763,8 @@
+@@ -763,8 +763,8 @@ public static final void cairo_new_path(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9344,7 +9656,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_paint(cr);
-@@ -773,8 +773,8 @@
+@@ -773,8 +773,8 @@ public static final void cairo_paint(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9355,7 +9667,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_paint_with_alpha(cr, alpha);
-@@ -783,8 +783,8 @@
+@@ -783,8 +783,8 @@ public static final void cairo_paint_with_alpha(int /*long*/ cr, double alpha) {
}
}
/** @param path cast=(cairo_path_t *) */
@@ -9366,7 +9678,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_path_destroy(path);
-@@ -793,8 +793,8 @@
+@@ -793,8 +793,8 @@ public static final void cairo_path_destroy(int /*long*/ path) {
}
}
/** @param pattern cast=(cairo_pattern_t *) */
@@ -9377,7 +9689,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_pattern_add_color_stop_rgb(pattern, offset, red, green, blue);
-@@ -803,8 +803,8 @@
+@@ -803,8 +803,8 @@ public static final void cairo_pattern_add_color_stop_rgb(int /*long*/ pattern,
}
}
/** @param pattern cast=(cairo_pattern_t *) */
@@ -9388,7 +9700,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_pattern_add_color_stop_rgba(pattern, offset, red, green, blue, alpha);
-@@ -813,8 +813,8 @@
+@@ -813,8 +813,8 @@ public static final void cairo_pattern_add_color_stop_rgba(int /*long*/ pattern,
}
}
/** @param surface cast=(cairo_surface_t *) */
@@ -9399,7 +9711,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_pattern_create_for_surface(surface);
-@@ -822,8 +822,8 @@
+@@ -822,8 +822,8 @@ public static final int /*long*/ cairo_pattern_create_for_surface(int /*long*/ s
lock.unlock();
}
}
@@ -9410,7 +9722,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_pattern_create_linear(x0, y0, x1, y1);
-@@ -831,8 +831,8 @@
+@@ -831,8 +831,8 @@ public static final int /*long*/ cairo_pattern_create_linear(double x0, double y
lock.unlock();
}
}
@@ -9421,7 +9733,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_pattern_create_radial(cx0, cy0, radius0, cx1, cy1, radius1);
-@@ -841,8 +841,8 @@
+@@ -841,8 +841,8 @@ public static final int /*long*/ cairo_pattern_create_radial(double cx0, double
}
}
/** @param pattern cast=(cairo_pattern_t *) */
@@ -9432,7 +9744,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_pattern_destroy(pattern);
-@@ -851,8 +851,8 @@
+@@ -851,8 +851,8 @@ public static final void cairo_pattern_destroy(int /*long*/ pattern) {
}
}
/** @param pattern cast=(cairo_pattern_t *) */
@@ -9443,7 +9755,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_pattern_get_extend(pattern);
-@@ -861,8 +861,8 @@
+@@ -861,8 +861,8 @@ public static final int cairo_pattern_get_extend(int /*long*/ pattern) {
}
}
/** @param pattern cast=(cairo_pattern_t *) */
@@ -9454,7 +9766,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_pattern_get_filter(pattern);
-@@ -874,8 +874,8 @@
+@@ -874,8 +874,8 @@ public static final int cairo_pattern_get_filter(int /*long*/ pattern) {
* @param pattern cast=(cairo_pattern_t *)
* @param matrix cast=(cairo_matrix_t *)
*/
@@ -9465,7 +9777,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_pattern_get_matrix(pattern, matrix);
-@@ -884,8 +884,8 @@
+@@ -884,8 +884,8 @@ public static final void cairo_pattern_get_matrix(int /*long*/ pattern, double[]
}
}
/** @param pattern cast=(cairo_pattern_t *) */
@@ -9476,7 +9788,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_pattern_reference(pattern);
-@@ -894,8 +894,8 @@
+@@ -894,8 +894,8 @@ public static final void cairo_pattern_reference(int /*long*/ pattern) {
}
}
/** @param pattern cast=(cairo_pattern_t *) */
@@ -9487,7 +9799,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_pattern_set_extend(pattern, extend);
-@@ -904,8 +904,8 @@
+@@ -904,8 +904,8 @@ public static final void cairo_pattern_set_extend(int /*long*/ pattern, int exte
}
}
/** @param pattern cast=(cairo_pattern_t *) */
@@ -9498,7 +9810,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_pattern_set_filter(pattern, filter);
-@@ -917,8 +917,8 @@
+@@ -917,8 +917,8 @@ public static final void cairo_pattern_set_filter(int /*long*/ pattern, int filt
* @param pattern cast=(cairo_pattern_t *)
* @param matrix cast=(cairo_matrix_t *)
*/
@@ -9509,7 +9821,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_pattern_set_matrix(pattern, matrix);
-@@ -930,8 +930,8 @@
+@@ -930,8 +930,8 @@ public static final void cairo_pattern_set_matrix(int /*long*/ pattern, double[]
* @method flags=dynamic
* @param surface cast=(cairo_surface_t *)
*/
@@ -9520,7 +9832,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_pdf_surface_set_size(surface, width_in_points, height_in_points);
-@@ -943,8 +943,8 @@
+@@ -943,8 +943,8 @@ public static final void cairo_pdf_surface_set_size(int /*long*/ surface, double
* @method flags=dynamic
* @param surface cast=(cairo_surface_t *)
*/
@@ -9531,7 +9843,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_ps_surface_set_size(surface, width_in_points, height_in_points);
-@@ -953,8 +953,8 @@
+@@ -953,8 +953,8 @@ public static final void cairo_ps_surface_set_size(int /*long*/ surface, double
}
}
/** @param cr cast=(cairo_t *) */
@@ -9542,7 +9854,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_rectangle(cr, x, y, width, height);
-@@ -963,8 +963,8 @@
+@@ -963,8 +963,8 @@ public static final void cairo_rectangle(int /*long*/ cr, double x, double y, do
}
}
/** @param cr cast=(cairo_t *) */
@@ -9553,7 +9865,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_reference(cr);
-@@ -973,8 +973,8 @@
+@@ -973,8 +973,8 @@ public static final int /*long*/ cairo_reference(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9564,7 +9876,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_rel_curve_to(cr, dx1, dy1, dx2, dy2, dx3, dy3);
-@@ -983,8 +983,8 @@
+@@ -983,8 +983,8 @@ public static final void cairo_rel_curve_to(int /*long*/ cr, double dx1, double
}
}
/** @param cr cast=(cairo_t *) */
@@ -9575,7 +9887,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_rel_line_to(cr, dx, dy);
-@@ -993,8 +993,8 @@
+@@ -993,8 +993,8 @@ public static final void cairo_rel_line_to(int /*long*/ cr, double dx, double dy
}
}
/** @param cr cast=(cairo_t *) */
@@ -9586,7 +9898,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_rel_move_to(cr, dx, dy);
-@@ -1003,8 +1003,8 @@
+@@ -1003,8 +1003,8 @@ public static final void cairo_rel_move_to(int /*long*/ cr, double dx, double dy
}
}
/** @param cr cast=(cairo_t *) */
@@ -9597,7 +9909,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_reset_clip(cr);
-@@ -1013,8 +1013,8 @@
+@@ -1013,8 +1013,8 @@ public static final void cairo_reset_clip(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9608,7 +9920,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_restore(cr);
-@@ -1023,8 +1023,8 @@
+@@ -1023,8 +1023,8 @@ public static final void cairo_restore(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9619,7 +9931,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_rotate(cr, angle);
-@@ -1033,8 +1033,8 @@
+@@ -1033,8 +1033,8 @@ public static final void cairo_rotate(int /*long*/ cr, double angle) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9630,7 +9942,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_save(cr);
-@@ -1043,8 +1043,8 @@
+@@ -1043,8 +1043,8 @@ public static final void cairo_save(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9641,7 +9953,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_scale(cr, sx, sy);
-@@ -1056,8 +1056,8 @@
+@@ -1056,8 +1056,8 @@ public static final void cairo_scale(int /*long*/ cr, double sx, double sy) {
* @param cr cast=(cairo_t *)
* @param family cast=(const char *)
*/
@@ -9652,7 +9964,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_select_font_face(cr, family, slant, weight);
-@@ -1066,8 +1066,8 @@
+@@ -1066,8 +1066,8 @@ public static final void cairo_select_font_face(int /*long*/ cr, byte[] family,
}
}
/** @param cr cast=(cairo_t *) */
@@ -9663,7 +9975,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_antialias(cr, antialias);
-@@ -1076,8 +1076,8 @@
+@@ -1076,8 +1076,8 @@ public static final void cairo_set_antialias(int /*long*/ cr, int antialias) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9674,7 +9986,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_dash(cr, dashes, ndash, offset);
-@@ -1086,8 +1086,8 @@
+@@ -1086,8 +1086,8 @@ public static final void cairo_set_dash(int /*long*/ cr, double[] dashes, int nd
}
}
/** @param cr cast=(cairo_t *) */
@@ -9685,7 +9997,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_fill_rule(cr, fill_rule);
-@@ -1099,8 +1099,8 @@
+@@ -1099,8 +1099,8 @@ public static final void cairo_set_fill_rule(int /*long*/ cr, int fill_rule) {
* @param cr cast=(cairo_t *)
* @param font_face cast=(cairo_font_face_t *)
*/
@@ -9696,7 +10008,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_font_face(cr, font_face);
-@@ -1112,8 +1112,8 @@
+@@ -1112,8 +1112,8 @@ public static final void cairo_set_font_face(int /*long*/ cr, int /*long*/ font_
* @param cr cast=(cairo_t *)
* @param matrix cast=(cairo_matrix_t *)
*/
@@ -9707,7 +10019,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_font_matrix(cr, matrix);
-@@ -1125,8 +1125,8 @@
+@@ -1125,8 +1125,8 @@ public static final void cairo_set_font_matrix(int /*long*/ cr, double[] matrix)
* @param cr cast=(cairo_t *)
* @param options cast=(cairo_font_options_t *)
*/
@@ -9718,7 +10030,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_font_options(cr, options);
-@@ -1135,8 +1135,8 @@
+@@ -1135,8 +1135,8 @@ public static final void cairo_set_font_options(int /*long*/ cr, int /*long*/ op
}
}
/** @param cr cast=(cairo_t *) */
@@ -9729,7 +10041,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_font_size(cr, size);
-@@ -1145,8 +1145,8 @@
+@@ -1145,8 +1145,8 @@ public static final void cairo_set_font_size(int /*long*/ cr, double size) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9740,7 +10052,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_line_cap(cr, line_cap);
-@@ -1155,8 +1155,8 @@
+@@ -1155,8 +1155,8 @@ public static final void cairo_set_line_cap(int /*long*/ cr, int line_cap) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9751,7 +10063,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_line_join(cr, line_join);
-@@ -1165,8 +1165,8 @@
+@@ -1165,8 +1165,8 @@ public static final void cairo_set_line_join(int /*long*/ cr, int line_join) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9762,7 +10074,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_line_width(cr, width);
-@@ -1178,8 +1178,8 @@
+@@ -1178,8 +1178,8 @@ public static final void cairo_set_line_width(int /*long*/ cr, double width) {
* @param cr cast=(cairo_t *)
* @param matrix cast=(cairo_matrix_t *)
*/
@@ -9773,7 +10085,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_matrix(cr, matrix);
-@@ -1188,8 +1188,8 @@
+@@ -1188,8 +1188,8 @@ public static final void cairo_set_matrix(int /*long*/ cr, double[] matrix) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9784,7 +10096,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_miter_limit(cr, limit);
-@@ -1198,8 +1198,8 @@
+@@ -1198,8 +1198,8 @@ public static final void cairo_set_miter_limit(int /*long*/ cr, double limit) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9795,7 +10107,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_operator(cr, op);
-@@ -1211,8 +1211,8 @@
+@@ -1211,8 +1211,8 @@ public static final void cairo_set_operator(int /*long*/ cr, int op) {
* @param cr cast=(cairo_t *)
* @param source cast=(cairo_pattern_t *)
*/
@@ -9806,7 +10118,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_source(cr, source);
-@@ -1221,8 +1221,8 @@
+@@ -1221,8 +1221,8 @@ public static final void cairo_set_source(int /*long*/ cr, int /*long*/ source)
}
}
/** @param cr cast=(cairo_t *) */
@@ -9817,7 +10129,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_source_rgb(cr, red, green, blue);
-@@ -1231,8 +1231,8 @@
+@@ -1231,8 +1231,8 @@ public static final void cairo_set_source_rgb(int /*long*/ cr, double red, doubl
}
}
/** @param cr cast=(cairo_t *) */
@@ -9828,7 +10140,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_source_rgba(cr, red, green, blue, alpha);
-@@ -1244,8 +1244,8 @@
+@@ -1244,8 +1244,8 @@ public static final void cairo_set_source_rgba(int /*long*/ cr, double red, doub
* @param cr cast=(cairo_t *)
* @param surface cast=(cairo_surface_t *)
*/
@@ -9839,7 +10151,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_source_surface(cr, surface, x, y);
-@@ -1254,8 +1254,8 @@
+@@ -1254,8 +1254,8 @@ public static final void cairo_set_source_surface(int /*long*/ cr, int /*long*/
}
}
/** @param cr cast=(cairo_t *) */
@@ -9850,7 +10162,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_set_tolerance(cr, tolerance);
-@@ -1267,8 +1267,8 @@
+@@ -1267,8 +1267,8 @@ public static final void cairo_set_tolerance(int /*long*/ cr, double tolerance)
* @param cr cast=(cairo_t *)
* @param glyphs cast=(cairo_glyph_t *)
*/
@@ -9861,7 +10173,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_show_glyphs(cr, glyphs, num_glyphs);
-@@ -1277,8 +1277,8 @@
+@@ -1277,8 +1277,8 @@ public static final void cairo_show_glyphs(int /*long*/ cr, int /*long*/ glyphs,
}
}
/** @param cr cast=(cairo_t *) */
@@ -9872,7 +10184,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_show_page(cr);
-@@ -1290,8 +1290,8 @@
+@@ -1290,8 +1290,8 @@ public static final void cairo_show_page(int /*long*/ cr) {
* @param cr cast=(cairo_t *)
* @param utf8 cast=(const char *)
*/
@@ -9883,7 +10195,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_show_text(cr, utf8);
-@@ -1300,8 +1300,8 @@
+@@ -1300,8 +1300,8 @@ public static final void cairo_show_text(int /*long*/ cr, byte[] utf8) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9894,7 +10206,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_status(cr);
-@@ -1309,8 +1309,8 @@
+@@ -1309,8 +1309,8 @@ public static final int cairo_status(int /*long*/ cr) {
lock.unlock();
}
}
@@ -9905,7 +10217,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_status_to_string(status);
-@@ -1319,8 +1319,8 @@
+@@ -1319,8 +1319,8 @@ public static final int /*long*/ cairo_status_to_string(int status) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9916,7 +10228,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_stroke(cr);
-@@ -1329,8 +1329,8 @@
+@@ -1329,8 +1329,8 @@ public static final void cairo_stroke(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -9927,7 +10239,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_stroke_extents(cr, x1, y1, x2, y2);
-@@ -1339,8 +1339,8 @@
+@@ -1339,8 +1339,8 @@ public static final void cairo_stroke_extents(int /*long*/ cr, double[] x1, doub
}
}
/** @param cr cast=(cairo_t *) */
@@ -9938,7 +10250,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_stroke_preserve(cr);
-@@ -1349,8 +1349,8 @@
+@@ -1349,8 +1349,8 @@ public static final void cairo_stroke_preserve(int /*long*/ cr) {
}
}
/** @param other cast=(cairo_surface_t *) */
@@ -9949,7 +10261,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_surface_create_similar(other, format, width, height);
-@@ -1359,8 +1359,8 @@
+@@ -1359,8 +1359,8 @@ public static final int /*long*/ cairo_surface_create_similar(int /*long*/ other
}
}
/** @param surface cast=(cairo_surface_t *) */
@@ -9960,7 +10272,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_surface_destroy(surface);
-@@ -1369,8 +1369,8 @@
+@@ -1369,8 +1369,8 @@ public static final void cairo_surface_destroy(int /*long*/ surface) {
}
}
/** @param surface cast=(cairo_surface_t *) */
@@ -9971,7 +10283,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_surface_finish(surface);
-@@ -1382,8 +1382,8 @@
+@@ -1382,8 +1382,8 @@ public static final void cairo_surface_finish(int /*long*/ surface) {
* @method flags=dynamic
* @param surface cast=(cairo_surface_t *)
*/
@@ -9982,7 +10294,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_surface_get_type(surface);
-@@ -1395,8 +1395,8 @@
+@@ -1395,8 +1395,8 @@ public static final int cairo_surface_get_type(int /*long*/ surface) {
* @param surface cast=(cairo_surface_t *)
* @param key cast=(cairo_user_data_key_t *)
*/
@@ -9993,7 +10305,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_surface_get_user_data(surface, key);
-@@ -1405,8 +1405,8 @@
+@@ -1405,8 +1405,8 @@ public static final int /*long*/ cairo_surface_get_user_data(int /*long*/ surfac
}
}
/** @param surface cast=(cairo_surface_t *) */
@@ -10004,7 +10316,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_surface_reference(surface);
-@@ -1415,8 +1415,8 @@
+@@ -1415,8 +1415,8 @@ public static final void cairo_surface_reference(int /*long*/ surface) {
}
}
/** @param surface cast=(cairo_surface_t *) */
@@ -10015,7 +10327,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_surface_set_device_offset(surface, x_offset, y_offset);
-@@ -1425,8 +1425,8 @@
+@@ -1425,8 +1425,8 @@ public static final void cairo_surface_set_device_offset(int /*long*/ surface, d
}
}
/** @method flags=dynamic */
@@ -10026,7 +10338,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_surface_set_fallback_resolution(surface, x_pixels_per_inch, y_pixels_per_inch);
-@@ -1440,8 +1440,8 @@
+@@ -1440,8 +1440,8 @@ public static final void cairo_surface_set_fallback_resolution(int /*long*/ surf
* @param user_data cast=(void *)
* @param destroy cast=(cairo_destroy_func_t)
*/
@@ -10037,7 +10349,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_surface_set_user_data(surface, key, user_data, destroy);
-@@ -1454,8 +1454,8 @@
+@@ -1454,8 +1454,8 @@ public static final int cairo_surface_set_user_data(int /*long*/ surface, int /*
* @param utf8 cast=(const char *)
* @param extents cast=(cairo_text_extents_t *)
*/
@@ -10048,7 +10360,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_text_extents(cr, utf8, extents);
-@@ -1467,8 +1467,8 @@
+@@ -1467,8 +1467,8 @@ public static final void cairo_text_extents(int /*long*/ cr, byte[] utf8, cairo_
* @param cr cast=(cairo_t *)
* @param utf8 cast=(const char *)
*/
@@ -10059,7 +10371,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_text_path(cr, utf8);
-@@ -1480,8 +1480,8 @@
+@@ -1480,8 +1480,8 @@ public static final void cairo_text_path(int /*long*/ cr, byte[] utf8) {
* @param cr cast=(cairo_t *)
* @param matrix cast=(cairo_matrix_t *)
*/
@@ -10070,7 +10382,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_transform(cr, matrix);
-@@ -1490,8 +1490,8 @@
+@@ -1490,8 +1490,8 @@ public static final void cairo_transform(int /*long*/ cr, double[] matrix) {
}
}
/** @param cr cast=(cairo_t *) */
@@ -10081,7 +10393,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_translate(cr, tx, ty);
-@@ -1500,8 +1500,8 @@
+@@ -1500,8 +1500,8 @@ public static final void cairo_translate(int /*long*/ cr, double tx, double ty)
}
}
/** @param cr cast=(cairo_t *) */
@@ -10092,7 +10404,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_user_to_device(cr, x, y);
-@@ -1510,8 +1510,8 @@
+@@ -1510,8 +1510,8 @@ public static final void cairo_user_to_device(int /*long*/ cr, double[] x, doubl
}
}
/** @param cr cast=(cairo_t *) */
@@ -10103,7 +10415,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_user_to_device_distance(cr, dx, dy);
-@@ -1525,8 +1525,8 @@
+@@ -1525,8 +1525,8 @@ public static final native int cairo_version();
* @param drawable cast=(Drawable)
* @param visual cast=(Visual *)
*/
@@ -10114,7 +10426,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_xlib_surface_create(dpy, drawable, visual, width, height);
-@@ -1539,8 +1539,8 @@
+@@ -1539,8 +1539,8 @@ public static final int /*long*/ cairo_xlib_surface_create(int /*long*/ dpy, int
* @param pixmap cast=(Pixmap)
* @param screen cast=(Screen *)
*/
@@ -10125,7 +10437,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _cairo_xlib_surface_create_for_bitmap(dpy, pixmap, screen, width, height);
-@@ -1549,8 +1549,8 @@
+@@ -1549,8 +1549,8 @@ public static final int /*long*/ cairo_xlib_surface_create_for_bitmap(int /*long
}
}
/** @param surface cast=(cairo_surface_t *) */
@@ -10136,7 +10448,7 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_cairo_xlib_surface_set_size(surface, width, height);
-@@ -1563,18 +1563,18 @@
+@@ -1563,18 +1563,18 @@ public static final void cairo_xlib_surface_set_size(int /*long*/ surface, int w
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
@@ -10158,10 +10470,11 @@ diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/i
+public static final native void memmove(double[] dest, long /*int*/ src, long /*int*/ size);
}
-diff -urN x86/org/eclipse/swt/internal/cairo/cairo_path_t.java x86_64/org/eclipse/swt/internal/cairo/cairo_path_t.java
---- x86/org/eclipse/swt/internal/cairo/cairo_path_t.java 2009-05-29 17:30:14.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/cairo/cairo_path_t.java 2009-09-17 08:48:22.000000000 -0400
-@@ -24,7 +24,7 @@
+diff --git a/org/eclipse/swt/internal/cairo/cairo_path_t.java b/org/eclipse/swt/internal/cairo/cairo_path_t.java
+index db690aa..2b02301 100644
+--- a/org/eclipse/swt/internal/cairo/cairo_path_t.java
++++ b/org/eclipse/swt/internal/cairo/cairo_path_t.java
+@@ -24,7 +24,7 @@ package org.eclipse.swt.internal.cairo;
public class cairo_path_t {
public int status;
/** @field cast=(cairo_path_data_t *) */
@@ -10170,49 +10483,11 @@ diff -urN x86/org/eclipse/swt/internal/cairo/cairo_path_t.java x86_64/org/eclips
public int num_data;
public static final int sizeof = Cairo.cairo_path_t_sizeof();
}
-diff -urN x86/org/eclipse/swt/internal/Callback.java x86_64/org/eclipse/swt/internal/Callback.java
---- x86/org/eclipse/swt/internal/Callback.java 2007-05-31 18:04:10.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/Callback.java 2009-09-17 08:48:24.000000000 -0400
-@@ -28,7 +28,7 @@
- Object object;
- String method, signature;
- int argCount;
-- int /*long*/ address, errorResult;
-+ long /*int*/ address, errorResult;
- boolean isStatic, isArrayBased;
-
- static final String PTR_SIGNATURE = C.PTR_SIZEOF == 4 ? "I" : "J"; //$NON-NLS-1$ //$NON-NLS-2$
-@@ -88,7 +88,7 @@
- * @param isArrayBased <code>true</code> if the arguments should be passed in an array and false otherwise
- * @param errorResult the return value if the java code throws an exception
- */
--public Callback (Object object, String method, int argCount, boolean isArrayBased, int /*long*/ errorResult) {
-+public Callback (Object object, String method, int argCount, boolean isArrayBased, long /*int*/ errorResult) {
-
- /* Set the callback fields */
- this.object = object;
-@@ -131,7 +131,7 @@
- * @param isArrayBased whether the callback's method is array based
- * @param errorResult the callback's error result
- */
--static native synchronized int /*long*/ bind (Callback callback, Object object, String method, String signature, int argCount, boolean isStatic, boolean isArrayBased, int /*long*/ errorResult);
-+static native synchronized long /*int*/ bind (Callback callback, Object object, String method, String signature, int argCount, boolean isStatic, boolean isArrayBased, long /*int*/ errorResult);
-
- /**
- * Releases the native level resources associated with the callback,
-@@ -152,7 +152,7 @@
- *
- * @return the callback address
- */
--public int /*long*/ getAddress () {
-+public long /*int*/ getAddress () {
- return address;
- }
-
-diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/internal/cde/CDE.java
---- x86/org/eclipse/swt/internal/cde/CDE.java 2009-05-29 17:30:26.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/cde/CDE.java 2009-09-17 08:48:24.000000000 -0400
-@@ -33,8 +33,8 @@
+diff --git a/org/eclipse/swt/internal/cde/CDE.java b/org/eclipse/swt/internal/cde/CDE.java
+index f2ea5b5..f1fda5c 100644
+--- a/org/eclipse/swt/internal/cde/CDE.java
++++ b/org/eclipse/swt/internal/cde/CDE.java
+@@ -33,8 +33,8 @@ public class CDE extends Platform {
* @param appName cast=(char *)
* @param appClass cast=(char *)
*/
@@ -10223,7 +10498,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
return _DtAppInitialize(appContext, display, topWiget, appName, appClass);
-@@ -51,8 +51,8 @@
+@@ -51,8 +51,8 @@ public static final void DtDbLoad() {
lock.unlock();
}
}
@@ -10234,7 +10509,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
return _DtDtsDataTypeNames();
-@@ -61,8 +61,8 @@
+@@ -61,8 +61,8 @@ public static final int /*long*/ DtDtsDataTypeNames() {
}
}
/** @param fileName cast=(char *) */
@@ -10245,7 +10520,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
return _DtDtsFileToDataType(fileName);
-@@ -85,8 +85,8 @@
+@@ -85,8 +85,8 @@ public static final boolean DtDtsDataTypeIsAction(byte[] dataType) {
* @param attrName cast=(char *)
* @param optName cast=(char *)
*/
@@ -10256,7 +10531,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
return _DtDtsDataTypeToAttributeValue(dataType, attrName, optName);
-@@ -95,8 +95,8 @@
+@@ -95,8 +95,8 @@ public static final int /*long*/ DtDtsDataTypeToAttributeValue(byte[] dataType,
}
}
/** @param dataType cast=(char *) */
@@ -10267,7 +10542,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
_DtDtsFreeDataType(dataType);
-@@ -105,8 +105,8 @@
+@@ -105,8 +105,8 @@ public static final void DtDtsFreeDataType(int /*long*/ dataType) {
}
}
/** @param dataTypeList cast=(char **) */
@@ -10278,7 +10553,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
_DtDtsFreeDataTypeNames(dataTypeList);
-@@ -115,8 +115,8 @@
+@@ -115,8 +115,8 @@ public static final void DtDtsFreeDataTypeNames(int /*long*/ dataTypeList) {
}
}
/** @param attrValue cast=(char *) */
@@ -10289,7 +10564,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
_DtDtsFreeAttributeValue(attrValue);
-@@ -133,8 +133,8 @@
+@@ -133,8 +133,8 @@ public static final void DtDtsFreeAttributeValue(int /*long*/ attrValue) {
* @param callback cast=(DtActionCallbackProc)
* @param clientData cast=(XtPointer)
*/
@@ -10300,7 +10575,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
return _DtActionInvoke(topWidget, action, args, argCount, termOpts, execHost, contextDir, useIndicator, callback, clientData);
-@@ -143,8 +143,8 @@
+@@ -143,8 +143,8 @@ public static final long DtActionInvoke(int /*long*/ topWidget, byte[] action, D
}
}
/** @method flags=const */
@@ -10311,7 +10586,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
return _topLevelShellWidgetClass();
-@@ -159,8 +159,8 @@
+@@ -159,8 +159,8 @@ public static final int /*long*/ topLevelShellWidgetClass() {
* @param display cast=(Display *)
* @param argList cast=(ArgList)
*/
@@ -10322,7 +10597,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
return _XtAppCreateShell(appName, appClass, widgetClass, display, argList, argCount);
-@@ -168,8 +168,8 @@
+@@ -168,8 +168,8 @@ public static final int /*long*/ XtAppCreateShell(byte[] appName, byte[] appClas
lock.unlock();
}
}
@@ -10333,7 +10608,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
return _XtCreateApplicationContext();
-@@ -187,8 +187,8 @@
+@@ -187,8 +187,8 @@ public static final int /*long*/ XtCreateApplicationContext() {
* @param argc cast=(int *)
* @param argv cast=(String *)
*/
@@ -10344,7 +10619,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
_XtDisplayInitialize(appContext, display, appName, appClass, options, num_options, argc, argv);
-@@ -197,8 +197,8 @@
+@@ -197,8 +197,8 @@ public static final void XtDisplayInitialize(int /*long*/ appContext, int /*long
}
}
/** @param widget cast=(Widget) */
@@ -10355,7 +10630,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
_XtRealizeWidget(widget);
-@@ -207,8 +207,8 @@
+@@ -207,8 +207,8 @@ public static final void XtRealizeWidget(int /*long*/ widget) {
}
}
/** @param widget cast=(Widget) */
@@ -10366,7 +10641,7 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
_XtResizeWidget(widget, width, height, borderWidth);
-@@ -217,8 +217,8 @@
+@@ -217,8 +217,8 @@ public static final void XtResizeWidget(int /*long*/ widget, int width, int heig
}
}
/** @param widget cast=(Widget) */
@@ -10377,10 +10652,11 @@ diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/inter
lock.lock();
try {
_XtSetMappedWhenManaged(widget, flag);
-diff -urN x86/org/eclipse/swt/internal/cde/DtActionArg.java x86_64/org/eclipse/swt/internal/cde/DtActionArg.java
---- x86/org/eclipse/swt/internal/cde/DtActionArg.java 2009-05-29 17:30:26.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/cde/DtActionArg.java 2009-09-17 08:48:24.000000000 -0400
-@@ -14,6 +14,6 @@
+diff --git a/org/eclipse/swt/internal/cde/DtActionArg.java b/org/eclipse/swt/internal/cde/DtActionArg.java
+index a9e3698..552d57c 100644
+--- a/org/eclipse/swt/internal/cde/DtActionArg.java
++++ b/org/eclipse/swt/internal/cde/DtActionArg.java
+@@ -14,6 +14,6 @@ package org.eclipse.swt.internal.cde;
public class DtActionArg {
public int argClass;
/** @field accessor=u.file.name,cast=(char *) */
@@ -10388,183 +10664,11 @@ diff -urN x86/org/eclipse/swt/internal/cde/DtActionArg.java x86_64/org/eclipse/s
+ public long /*int*/ name;
public static final int sizeof = CDE.DtActionArg_sizeof();
}
-diff -urN x86/org/eclipse/swt/internal/C.java x86_64/org/eclipse/swt/internal/C.java
---- x86/org/eclipse/swt/internal/C.java 2009-05-29 17:30:14.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/C.java 2009-09-17 08:48:24.000000000 -0400
-@@ -24,118 +24,118 @@
- public static final int PTR_SIZEOF = PTR_sizeof ();
-
- /** @param ptr cast=(void *) */
--public static final native void free (int /*long*/ ptr);
-+public static final native void free (long /*int*/ ptr);
- /** @param env cast=(const char *) */
--public static final native int /*long*/ getenv (byte[] env);
--public static final native int /*long*/ malloc (int /*long*/ size);
-+public static final native long /*int*/ getenv (byte[] env);
-+public static final native long /*int*/ malloc (long /*int*/ size);
- /**
- * @param dest cast=(void *)
- * @param src cast=(const void *),flags=no_out critical
- * @param size cast=(size_t)
- */
--public static final native void memmove (int /*long*/ dest, byte[] src, int /*long*/ size);
-+public static final native void memmove (long /*int*/ dest, byte[] src, long /*int*/ size);
- /**
- * @param dest cast=(void *)
- * @param src cast=(const void *),flags=no_out critical
- * @param size cast=(size_t)
- */
--public static final native void memmove (int /*long*/ dest, char[] src, int /*long*/ size);
-+public static final native void memmove (long /*int*/ dest, char[] src, long /*int*/ size);
- /**
- * @param dest cast=(void *)
- * @param src cast=(const void *),flags=no_out critical
- * @param size cast=(size_t)
- */
--public static final native void memmove (int /*long*/ dest, double[] src, int /*long*/ size);
-+public static final native void memmove (long /*int*/ dest, double[] src, long /*int*/ size);
- /**
- * @param dest cast=(void *)
- * @param src cast=(const void *),flags=no_out critical
- * @param size cast=(size_t)
- */
--public static final native void memmove (int /*long*/ dest, float[] src, int /*long*/ size);
-+public static final native void memmove (long /*int*/ dest, float[] src, long /*int*/ size);
- /**
- * @param dest cast=(void *)
- * @param src cast=(const void *),flags=no_out critical
- * @param size cast=(size_t)
- */
--public static final native void memmove (int /*long*/ dest, int[] src, int /*long*/ size);
-+public static final native void memmove (long /*int*/ dest, int[] src, long /*int*/ size);
- /**
- * @param dest cast=(void *)
- * @param src cast=(const void *),flags=no_out critical
- * @param size cast=(size_t)
- */
--public static final native void memmove (int /*long*/ dest, long[] src, int /*long*/ size);
-+public static final native void memmove (long /*int*/ dest, long[] src, long /*int*/ size);
- /**
- * @param dest cast=(void *)
- * @param src cast=(const void *),flags=no_out critical
- * @param size cast=(size_t)
- */
--public static final native void memmove (int /*long*/ dest, short[] src, int /*long*/ size);
-+public static final native void memmove (long /*int*/ dest, short[] src, long /*int*/ size);
- /**
- * @param dest cast=(void *),flags=no_in critical
- * @param src cast=(const void *),flags=no_out critical
- * @param size cast=(size_t)
- */
--public static final native void memmove (byte[] dest, char[] src, int /*long*/ size);
-+public static final native void memmove (byte[] dest, char[] src, long /*int*/ size);
- /**
- * @param dest cast=(void *),flags=no_in critical
- * @param src cast=(const void *)
- * @param size cast=(size_t)
- */
--public static final native void memmove (byte[] dest, int /*long*/ src, int /*long*/ size);
-+public static final native void memmove (byte[] dest, long /*int*/ src, long /*int*/ size);
- /**
- * @param dest cast=(void *)
- * @param src cast=(const void *)
- * @param size cast=(size_t)
- */
--public static final native void memmove (int /*long*/ dest, int /*long*/ src, int /*long*/ size);
-+public static final native void memmove (long /*int*/ dest, long /*int*/ src, long /*int*/ size);
- /**
- * @param dest cast=(void *),flags=no_in critical
- * @param src cast=(const void *)
- * @param size cast=(size_t)
- */
--public static final native void memmove (char[] dest, int /*long*/ src, int /*long*/ size);
-+public static final native void memmove (char[] dest, long /*int*/ src, long /*int*/ size);
- /**
- * @param dest cast=(void *),flags=no_in critical
- * @param src cast=(const void *)
- * @param size cast=(size_t)
- */
--public static final native void memmove (double[] dest, int /*long*/ src, int /*long*/ size);
-+public static final native void memmove (double[] dest, long /*int*/ src, long /*int*/ size);
- /**
- * @param dest cast=(void *),flags=no_in critical
- * @param src cast=(const void *)
- * @param size cast=(size_t)
- */
--public static final native void memmove (float[] dest, int /*long*/ src, int /*long*/ size);
-+public static final native void memmove (float[] dest, long /*int*/ src, long /*int*/ size);
- /**
- * @param dest cast=(void *),flags=no_in critical
- * @param src cast=(const void *)
- * @param size cast=(size_t)
- */
--public static final native void memmove (int[] dest, byte[] src, int /*long*/ size);
-+public static final native void memmove (int[] dest, byte[] src, long /*int*/ size);
- /**
- * @param dest cast=(void *),flags=no_in critical
- * @param src cast=(const void *)
- * @param size cast=(size_t)
- */
--public static final native void memmove (short[] dest, int /*long*/ src, int /*long*/ size);
-+public static final native void memmove (short[] dest, long /*int*/ src, long /*int*/ size);
- /**
- * @param dest cast=(void *),flags=no_in critical
- * @param src cast=(const void *)
- * @param size cast=(size_t)
- */
--public static final native void memmove (int[] dest, int /*long*/ src, int /*long*/ size);
-+public static final native void memmove (int[] dest, long /*int*/ src, long /*int*/ size);
- /**
- * @param dest cast=(void *),flags=no_in critical
- * @param src cast=(const void *)
- * @param size cast=(size_t)
- */
--public static final native void memmove (long[] dest, int /*long*/ src, int /*long*/ size);
-+public static final native void memmove (long[] dest, long /*int*/ src, long /*int*/ size);
- /**
- * @param buffer cast=(void *),flags=critical
- * @param num cast=(size_t)
- */
--public static final native int /*long*/ memset (int /*long*/ buffer, int c, int /*long*/ num);
-+public static final native long /*int*/ memset (long /*int*/ buffer, int c, long /*int*/ num);
- public static final native int PTR_sizeof ();
- /** @param s cast=(char *) */
--public static final native int strlen (int /*long*/ s);
-+public static final native int strlen (long /*int*/ s);
- }
-diff -urN x86/org/eclipse/swt/internal/Converter.java x86_64/org/eclipse/swt/internal/Converter.java
---- x86/org/eclipse/swt/internal/Converter.java 2009-05-29 17:30:22.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/Converter.java 2009-09-17 08:48:24.000000000 -0400
-@@ -37,8 +37,8 @@
- }
-
- public static char [] mbcsToWcs (String codePage, byte [] buffer) {
-- int /*long*/ [] items_written = new int /*long*/ [1];
-- int /*long*/ ptr = OS.g_utf8_to_utf16 (buffer, buffer.length, null, items_written, null);
-+ long /*int*/ [] items_written = new long /*int*/ [1];
-+ long /*int*/ ptr = OS.g_utf8_to_utf16 (buffer, buffer.length, null, items_written, null);
- if (ptr == 0) return EmptyCharArray;
- int length = (int)/*64*/items_written [0];
- char [] chars = new char [length];
-@@ -55,12 +55,12 @@
- }
-
- public static byte [] wcsToMbcs (String codePage, char [] buffer, boolean terminate) {
-- int /*long*/ [] items_read = new int /*long*/ [1], items_written = new int /*long*/ [1];
-+ long /*int*/ [] items_read = new long /*int*/ [1], items_written = new long /*int*/ [1];
- /*
- * Note that g_utf16_to_utf8() stops converting
- * when it finds the first NULL.
- */
-- int /*long*/ ptr = OS.g_utf16_to_utf8 (buffer, buffer.length, items_read, items_written, null);
-+ long /*int*/ ptr = OS.g_utf16_to_utf8 (buffer, buffer.length, items_read, items_written, null);
- if (ptr == 0) return terminate ? NullByteArray : EmptyByteArray;
- int written = (int)/*64*/items_written [0];
- byte [] bytes = new byte [written + (terminate ? 1 : 0)];
-diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/internal/gnome/GNOME.java
---- x86/org/eclipse/swt/internal/gnome/GNOME.java 2009-05-29 17:30:16.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gnome/GNOME.java 2009-09-17 08:48:24.000000000 -0400
-@@ -36,8 +36,8 @@
+diff --git a/org/eclipse/swt/internal/gnome/GNOME.java b/org/eclipse/swt/internal/gnome/GNOME.java
+index 9802b71..b42086c 100644
+--- a/org/eclipse/swt/internal/gnome/GNOME.java
++++ b/org/eclipse/swt/internal/gnome/GNOME.java
+@@ -36,8 +36,8 @@ public static final native int GnomeVFSMimeApplication_sizeof();
/** Natives */
/** @param mem cast=(gpointer) */
@@ -10575,7 +10679,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_g_free(mem);
-@@ -49,8 +49,8 @@
+@@ -49,8 +49,8 @@ public static final void g_free(int /*long*/ mem) {
* @param list cast=(GList *)
* @param data cast=(gpointer)
*/
@@ -10586,7 +10690,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _g_list_append(list, data);
-@@ -59,8 +59,8 @@
+@@ -59,8 +59,8 @@ public static final int /*long*/ g_list_append(int /*long*/ list, int /*long*/ d
}
}
/** @param list cast=(GList *) */
@@ -10597,7 +10701,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_g_list_free(list);
-@@ -68,8 +68,8 @@
+@@ -68,8 +68,8 @@ public static final void g_list_free(int /*long*/ list) {
lock.unlock();
}
}
@@ -10608,7 +10712,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _g_list_next(list);
-@@ -78,8 +78,8 @@
+@@ -78,8 +78,8 @@ public static final int /*long*/ g_list_next(int /*long*/ list) {
}
}
/** @param object cast=(gpointer) */
@@ -10619,7 +10723,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_g_object_unref(object);
-@@ -97,8 +97,8 @@
+@@ -97,8 +97,8 @@ public static final void g_object_unref(int /*long*/ object) {
* @param flags cast=(GnomeIconLookupFlags)
* @param result cast=(GnomeIconLookupResultFlags *)
*/
@@ -10630,7 +10734,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_icon_lookup(icon_theme, thumbnail_factory, file_uri, custom_icon, file_info, mime_type, flags, result);
-@@ -111,8 +111,8 @@
+@@ -111,8 +111,8 @@ public static final int /*long*/ gnome_icon_lookup(int /*long*/ icon_theme, int
* @param icon_name cast=(const char *)
* @param icon_data cast=(const GnomeIconData **)
*/
@@ -10641,7 +10745,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_icon_theme_lookup_icon(theme, icon_name, size, icon_data, base_size);
-@@ -120,8 +120,8 @@
+@@ -120,8 +120,8 @@ public static final int /*long*/ gnome_icon_theme_lookup_icon(int /*long*/ theme
lock.unlock();
}
}
@@ -10652,7 +10756,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_icon_theme_new();
-@@ -129,8 +129,8 @@
+@@ -129,8 +129,8 @@ public static final int /*long*/ gnome_icon_theme_new() {
lock.unlock();
}
}
@@ -10663,7 +10767,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_vfs_get_registered_mime_types();
-@@ -148,8 +148,8 @@
+@@ -148,8 +148,8 @@ public static final boolean gnome_vfs_init() {
}
}
/** @param uri cast=(const char *) */
@@ -10674,7 +10778,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_vfs_make_uri_from_input(uri);
-@@ -161,8 +161,8 @@
+@@ -161,8 +161,8 @@ public static final int /*long*/ gnome_vfs_make_uri_from_input(byte[] uri) {
* @method flags=dynamic
* @param uri cast=(const char *)
*/
@@ -10685,7 +10789,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_vfs_make_uri_from_input_with_dirs(uri, dirs);
-@@ -171,8 +171,8 @@
+@@ -171,8 +171,8 @@ public static final int /*long*/ gnome_vfs_make_uri_from_input_with_dirs(byte[]
}
}
/** @param application cast=(GnomeVFSMimeApplication *) */
@@ -10696,7 +10800,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_gnome_vfs_mime_application_free(application);
-@@ -185,8 +185,8 @@
+@@ -185,8 +185,8 @@ public static final void gnome_vfs_mime_application_free(int /*long*/ applicatio
* @param application cast=(GnomeVFSMimeApplication *)
* @param uris cast=(GList *)
*/
@@ -10707,7 +10811,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_vfs_mime_application_launch(application, uris);
-@@ -195,8 +195,8 @@
+@@ -195,8 +195,8 @@ public static final int gnome_vfs_mime_application_launch(int /*long*/ applicati
}
}
/** @param list cast=(GList *) */
@@ -10718,7 +10822,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_gnome_vfs_mime_extensions_list_free(list);
-@@ -205,8 +205,8 @@
+@@ -205,8 +205,8 @@ public static final void gnome_vfs_mime_extensions_list_free(int /*long*/ list)
}
}
/** @param mimeType cast=(const char *) */
@@ -10729,7 +10833,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_vfs_mime_get_default_application(mimeType);
-@@ -215,8 +215,8 @@
+@@ -215,8 +215,8 @@ public static final int /*long*/ gnome_vfs_mime_get_default_application(byte[] m
}
}
/** @param mime_type cast=(const char *) */
@@ -10740,7 +10844,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_vfs_mime_get_extensions_list(mime_type);
-@@ -225,8 +225,8 @@
+@@ -225,8 +225,8 @@ public static final int /*long*/ gnome_vfs_mime_get_extensions_list(int /*long*/
}
}
/** @param list cast=(GList *) */
@@ -10751,7 +10855,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
_gnome_vfs_mime_registered_mime_type_list_free(list);
-@@ -235,8 +235,8 @@
+@@ -235,8 +235,8 @@ public static final void gnome_vfs_mime_registered_mime_type_list_free(int /*lon
}
}
/** @param file cast=(const char *) */
@@ -10762,7 +10866,7 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_vfs_mime_type_from_name(file);
-@@ -248,8 +248,8 @@
+@@ -248,8 +248,8 @@ public static final int /*long*/ gnome_vfs_mime_type_from_name(byte[] file) {
* @method flags=dynamic
* @param url cast=(const char *)
*/
@@ -10773,17 +10877,18 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/i
lock.lock();
try {
return _gnome_vfs_url_show(url);
-@@ -262,5 +262,5 @@
+@@ -262,5 +262,5 @@ public static final int gnome_vfs_url_show(int /*long*/ url) {
* @param src cast=(const void *)
* @param count cast=(size_t)
*/
-public static final native void memmove (GnomeVFSMimeApplication dest, int /*long*/ src, int /*long*/ count);
+public static final native void memmove (GnomeVFSMimeApplication dest, long /*int*/ src, long /*int*/ count);
}
-diff -urN x86/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java x86_64/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java
---- x86/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java 2009-05-29 17:30:16.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,17 +17,17 @@
+diff --git a/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java b/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java
+index 53ab852..7a9c698 100644
+--- a/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java
++++ b/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java
+@@ -17,17 +17,17 @@ package org.eclipse.swt.internal.gnome;
public class GnomeVFSMimeApplication {
/** @field cast=(char *) */
@@ -10805,10 +10910,105 @@ diff -urN x86/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java x86_64
/** @field cast=(gboolean) */
public boolean requires_terminal;
public static final int sizeof = GNOME.GnomeVFSMimeApplication_sizeof();
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkDragContext.java x86_64/org/eclipse/swt/internal/gtk/GdkDragContext.java
---- x86/org/eclipse/swt/internal/gtk/GdkDragContext.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkDragContext.java 2009-09-17 08:48:24.000000000 -0400
-@@ -21,11 +21,11 @@
+diff --git a/org/eclipse/swt/internal/gtk/GInterfaceInfo.java b/org/eclipse/swt/internal/gtk/GInterfaceInfo.java
+index 6e5b746..3d55333 100644
+--- a/org/eclipse/swt/internal/gtk/GInterfaceInfo.java
++++ b/org/eclipse/swt/internal/gtk/GInterfaceInfo.java
+@@ -17,10 +17,10 @@ package org.eclipse.swt.internal.gtk;
+
+ public class GInterfaceInfo {
+ /** @field cast=(GInterfaceInitFunc) */
+- public int /*long*/ interface_init;
++ public long /*int*/ interface_init;
+ /** @field cast=(GInterfaceFinalizeFunc) */
+- public int /*long*/ interface_finalize;
++ public long /*int*/ interface_finalize;
+ /** @field cast=(gpointer) */
+- public int /*long*/ interface_data;
++ public long /*int*/ interface_data;
+ public static final int sizeof = OS.GInterfaceInfo_sizeof();
+ }
+diff --git a/org/eclipse/swt/internal/gtk/GObjectClass.java b/org/eclipse/swt/internal/gtk/GObjectClass.java
+index 649eba2..84a3f06 100644
+--- a/org/eclipse/swt/internal/gtk/GObjectClass.java
++++ b/org/eclipse/swt/internal/gtk/GObjectClass.java
+@@ -17,17 +17,17 @@ package org.eclipse.swt.internal.gtk;
+
+ public class GObjectClass {
+ /** @field cast=(GObject *(*)()) */
+- public int /*long*/ constructor;
++ public long /*int*/ constructor;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ set_property;
++ public long /*int*/ set_property;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ get_property;
++ public long /*int*/ get_property;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ dispose;
++ public long /*int*/ dispose;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ finalize;
++ public long /*int*/ finalize;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ dispatch_properties_changed;
++ public long /*int*/ dispatch_properties_changed;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ notify;
++ public long /*int*/ notify;
+ }
+diff --git a/org/eclipse/swt/internal/gtk/GTypeInfo.java b/org/eclipse/swt/internal/gtk/GTypeInfo.java
+index 645454e..4dbd0a7 100644
+--- a/org/eclipse/swt/internal/gtk/GTypeInfo.java
++++ b/org/eclipse/swt/internal/gtk/GTypeInfo.java
+@@ -19,22 +19,22 @@ public class GTypeInfo {
+ /** @field cast=(guint16) */
+ public short class_size;
+ /** @field cast=(GBaseInitFunc) */
+- public int /*long*/ base_init;
++ public long /*int*/ base_init;
+ /** @field cast=(GBaseFinalizeFunc) */
+- public int /*long*/ base_finalize;
++ public long /*int*/ base_finalize;
+ /** @field cast=(GClassInitFunc) */
+- public int /*long*/ class_init;
++ public long /*int*/ class_init;
+ /** @field cast=(GClassFinalizeFunc) */
+- public int /*long*/ class_finalize;
++ public long /*int*/ class_finalize;
+ /** @field cast=(gconstpointer) */
+- public int /*long*/ class_data;
++ public long /*int*/ class_data;
+ /** @field cast=(guint16) */
+ public short instance_size;
+ /** @field cast=(guint16) */
+ public short n_preallocs;
+ /** @field cast=(GInstanceInitFunc) */
+- public int /*long*/ instance_init;
++ public long /*int*/ instance_init;
+ /** @field cast=(GTypeValueTable *) */
+- public int /*long*/ value_table;
++ public long /*int*/ value_table;
+ public static final int sizeof = OS.GTypeInfo_sizeof();
+ }
+diff --git a/org/eclipse/swt/internal/gtk/GTypeQuery.java b/org/eclipse/swt/internal/gtk/GTypeQuery.java
+index 56d24af..c0f5c6d 100644
+--- a/org/eclipse/swt/internal/gtk/GTypeQuery.java
++++ b/org/eclipse/swt/internal/gtk/GTypeQuery.java
+@@ -19,7 +19,7 @@ public class GTypeQuery {
+ /** @field cast=(GType) */
+ public int type;
+ /** @field cast=(const gchar *) */
+- public int /*long*/ type_name;
++ public long /*int*/ type_name;
+ /** @field cast=(guint) */
+ public int class_size;
+ /** @field cast=(guint) */
+diff --git a/org/eclipse/swt/internal/gtk/GdkDragContext.java b/org/eclipse/swt/internal/gtk/GdkDragContext.java
+index 912bd5f..3305c56 100644
+--- a/org/eclipse/swt/internal/gtk/GdkDragContext.java
++++ b/org/eclipse/swt/internal/gtk/GdkDragContext.java
+@@ -21,11 +21,11 @@ public class GdkDragContext {
/** @field cast=(gboolean) */
public boolean is_source;
/** @field cast=(GdkWindow *) */
@@ -10823,10 +11023,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkDragContext.java x86_64/org/eclips
/** @field cast=(GdkDragAction) */
public int actions;
/** @field cast=(GdkDragAction) */
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventAny.java x86_64/org/eclipse/swt/internal/gtk/GdkEventAny.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventAny.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventAny.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,7 +17,7 @@
+diff --git a/org/eclipse/swt/internal/gtk/GdkEventAny.java b/org/eclipse/swt/internal/gtk/GdkEventAny.java
+index 5519285..f88641c 100644
+--- a/org/eclipse/swt/internal/gtk/GdkEventAny.java
++++ b/org/eclipse/swt/internal/gtk/GdkEventAny.java
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventAny extends GdkEvent {
/** @field cast=(GdkWindow *) */
@@ -10835,10 +11036,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventAny.java x86_64/org/eclipse/s
/** @field cast=(gint8) */
public byte send_event;
public static final int sizeof = OS.GdkEventAny_sizeof();
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventButton.java x86_64/org/eclipse/swt/internal/gtk/GdkEventButton.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventButton.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventButton.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,7 +17,7 @@
+diff --git a/org/eclipse/swt/internal/gtk/GdkEventButton.java b/org/eclipse/swt/internal/gtk/GdkEventButton.java
+index 68a2789..132126e 100644
+--- a/org/eclipse/swt/internal/gtk/GdkEventButton.java
++++ b/org/eclipse/swt/internal/gtk/GdkEventButton.java
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventButton extends GdkEvent {
/** @field cast=(GdkWindow *) */
@@ -10847,7 +11049,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventButton.java x86_64/org/eclips
/** @field cast=(gint8) */
public byte send_event;
/** @field cast=(guint32) */
-@@ -27,13 +27,13 @@
+@@ -27,13 +27,13 @@ public class GdkEventButton extends GdkEvent {
/** @field cast=(gdouble) */
public double y;
/** @field cast=(gdouble *) */
@@ -10863,10 +11065,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventButton.java x86_64/org/eclips
/** @field cast=(gdouble) */
public double x_root;
/** @field cast=(gdouble) */
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventCrossing.java x86_64/org/eclipse/swt/internal/gtk/GdkEventCrossing.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventCrossing.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventCrossing.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,11 +17,11 @@
+diff --git a/org/eclipse/swt/internal/gtk/GdkEventCrossing.java b/org/eclipse/swt/internal/gtk/GdkEventCrossing.java
+index 0c1b40e..7cc3f4e 100644
+--- a/org/eclipse/swt/internal/gtk/GdkEventCrossing.java
++++ b/org/eclipse/swt/internal/gtk/GdkEventCrossing.java
+@@ -17,11 +17,11 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventCrossing extends GdkEvent {
/** @field cast=(GdkWindow *) */
@@ -10880,10 +11083,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventCrossing.java x86_64/org/ecli
public int time;
public double x;
public double y;
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventExpose.java x86_64/org/eclipse/swt/internal/gtk/GdkEventExpose.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventExpose.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventExpose.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,7 +17,7 @@
+diff --git a/org/eclipse/swt/internal/gtk/GdkEventExpose.java b/org/eclipse/swt/internal/gtk/GdkEventExpose.java
+index df0afac..d54b41d 100644
+--- a/org/eclipse/swt/internal/gtk/GdkEventExpose.java
++++ b/org/eclipse/swt/internal/gtk/GdkEventExpose.java
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventExpose extends GdkEvent {
/** @field cast=(GdkWindow *) */
@@ -10892,7 +11096,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventExpose.java x86_64/org/eclips
/** @field cast=(gint8) */
public byte send_event;
/** @field accessor=area.x */
-@@ -29,7 +29,7 @@
+@@ -29,7 +29,7 @@ public class GdkEventExpose extends GdkEvent {
/** @field accessor=area.height */
public int area_height;
/** @field cast=(GdkRegion *) */
@@ -10901,10 +11105,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventExpose.java x86_64/org/eclips
/** @field cast=(gint) */
public int count;
public static final int sizeof = OS.GdkEventExpose_sizeof();
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventFocus.java x86_64/org/eclipse/swt/internal/gtk/GdkEventFocus.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventFocus.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventFocus.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,7 +17,7 @@
+diff --git a/org/eclipse/swt/internal/gtk/GdkEventFocus.java b/org/eclipse/swt/internal/gtk/GdkEventFocus.java
+index 83d66a9..a8f9bdb 100644
+--- a/org/eclipse/swt/internal/gtk/GdkEventFocus.java
++++ b/org/eclipse/swt/internal/gtk/GdkEventFocus.java
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventFocus extends GdkEvent {
/** @field cast=(GdkWindow *) */
@@ -10913,10 +11118,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventFocus.java x86_64/org/eclipse
/** @field cast=(gint8) */
public byte send_event;
/** @field cast=(gint16) */
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventKey.java x86_64/org/eclipse/swt/internal/gtk/GdkEventKey.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventKey.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventKey.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,7 +17,7 @@
+diff --git a/org/eclipse/swt/internal/gtk/GdkEventKey.java b/org/eclipse/swt/internal/gtk/GdkEventKey.java
+index 423dc2e..108699a 100644
+--- a/org/eclipse/swt/internal/gtk/GdkEventKey.java
++++ b/org/eclipse/swt/internal/gtk/GdkEventKey.java
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventKey extends GdkEvent {
/** @field cast=(GdkWindow *) */
@@ -10925,7 +11131,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventKey.java x86_64/org/eclipse/s
/** @field cast=(gint8) */
public byte send_event;
/** @field cast=(guint32) */
-@@ -29,7 +29,7 @@
+@@ -29,7 +29,7 @@ public class GdkEventKey extends GdkEvent {
/** @field cast=(gint) */
public int length;
/** @field cast=(gchar *) */
@@ -10934,10 +11140,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventKey.java x86_64/org/eclipse/s
/** @field cast=(guint16) */
public short hardware_keycode;
/** @field cast=(guint8) */
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventMotion.java x86_64/org/eclipse/swt/internal/gtk/GdkEventMotion.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventMotion.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventMotion.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,7 +17,7 @@
+diff --git a/org/eclipse/swt/internal/gtk/GdkEventMotion.java b/org/eclipse/swt/internal/gtk/GdkEventMotion.java
+index c85069f..651e66d 100644
+--- a/org/eclipse/swt/internal/gtk/GdkEventMotion.java
++++ b/org/eclipse/swt/internal/gtk/GdkEventMotion.java
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventMotion extends GdkEvent {
/** @field cast=(GdkWindow *) */
@@ -10946,7 +11153,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventMotion.java x86_64/org/eclips
/** @field cast=(gint8) */
public byte send_event;
/** @field cast=(guint32) */
-@@ -27,13 +27,13 @@
+@@ -27,13 +27,13 @@ public class GdkEventMotion extends GdkEvent {
/** @field cast=(gdouble) */
public double y;
/** @field cast=(gdouble *) */
@@ -10962,10 +11169,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventMotion.java x86_64/org/eclips
/** @field cast=(gdouble) */
public double x_root;
/** @field cast=(gdouble) */
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventScroll.java x86_64/org/eclipse/swt/internal/gtk/GdkEventScroll.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventScroll.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventScroll.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,7 +17,7 @@
+diff --git a/org/eclipse/swt/internal/gtk/GdkEventScroll.java b/org/eclipse/swt/internal/gtk/GdkEventScroll.java
+index f364cd6..ca84ca0 100644
+--- a/org/eclipse/swt/internal/gtk/GdkEventScroll.java
++++ b/org/eclipse/swt/internal/gtk/GdkEventScroll.java
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventScroll extends GdkEvent {
/** @field cast=(GdkWindow *) */
@@ -10974,7 +11182,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventScroll.java x86_64/org/eclips
/** @field cast=(gint8) */
public byte send_event;
/** @field cast=(guint32) */
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,7 @@ public class GdkEventScroll extends GdkEvent {
/** @field cast=(GdkScrollDirection) */
public int direction;
/** @field cast=(GdkDevice *) */
@@ -10983,10 +11191,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventScroll.java x86_64/org/eclips
/** @field cast=(gdouble) */
public double x_root;
/** @field cast=(gdouble) */
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventVisibility.java x86_64/org/eclipse/swt/internal/gtk/GdkEventVisibility.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventVisibility.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventVisibility.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,7 +17,7 @@
+diff --git a/org/eclipse/swt/internal/gtk/GdkEventVisibility.java b/org/eclipse/swt/internal/gtk/GdkEventVisibility.java
+index 3613c17..f5650ac 100644
+--- a/org/eclipse/swt/internal/gtk/GdkEventVisibility.java
++++ b/org/eclipse/swt/internal/gtk/GdkEventVisibility.java
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventVisibility extends GdkEvent {
/** @field cast=(GdkWindow *) */
@@ -10995,10 +11204,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventVisibility.java x86_64/org/ec
/** @field cast=(gint8) */
public byte send_event;
/** @field cast=(GdkVisibilityState) */
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventWindowState.java x86_64/org/eclipse/swt/internal/gtk/GdkEventWindowState.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventWindowState.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventWindowState.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,7 +17,7 @@
+diff --git a/org/eclipse/swt/internal/gtk/GdkEventWindowState.java b/org/eclipse/swt/internal/gtk/GdkEventWindowState.java
+index 1a5dfdf..8159249 100644
+--- a/org/eclipse/swt/internal/gtk/GdkEventWindowState.java
++++ b/org/eclipse/swt/internal/gtk/GdkEventWindowState.java
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventWindowState extends GdkEvent {
/** @field cast=(GdkWindow *) */
@@ -11007,10 +11217,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventWindowState.java x86_64/org/e
public byte send_event;
public int changed_mask;
public int new_window_state;
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkGCValues.java x86_64/org/eclipse/swt/internal/gtk/GdkGCValues.java
---- x86/org/eclipse/swt/internal/gtk/GdkGCValues.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkGCValues.java 2009-09-17 08:48:24.000000000 -0400
-@@ -33,17 +33,17 @@
+diff --git a/org/eclipse/swt/internal/gtk/GdkGCValues.java b/org/eclipse/swt/internal/gtk/GdkGCValues.java
+index b05fc32..0bde74d 100644
+--- a/org/eclipse/swt/internal/gtk/GdkGCValues.java
++++ b/org/eclipse/swt/internal/gtk/GdkGCValues.java
+@@ -33,17 +33,17 @@ public class GdkGCValues {
/** @field accessor=background.blue,cast=(guint16) */
public short background_blue;
/** @field cast=(GdkFont *) */
@@ -11033,10 +11244,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkGCValues.java x86_64/org/eclipse/s
/** @field cast=(GdkSubwindowMode) */
public int subwindow_mode;
/** @field cast=(gint) */
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkImage.java x86_64/org/eclipse/swt/internal/gtk/GdkImage.java
---- x86/org/eclipse/swt/internal/gtk/GdkImage.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkImage.java 2009-09-17 08:48:24.000000000 -0400
-@@ -19,7 +19,7 @@
+diff --git a/org/eclipse/swt/internal/gtk/GdkImage.java b/org/eclipse/swt/internal/gtk/GdkImage.java
+index e0dcf54..a994825 100644
+--- a/org/eclipse/swt/internal/gtk/GdkImage.java
++++ b/org/eclipse/swt/internal/gtk/GdkImage.java
+@@ -19,7 +19,7 @@ public class GdkImage {
/** @field cast=(GdkImageType) */
public int type;
/** @field cast=(GdkVisual *) */
@@ -11045,7 +11257,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkImage.java x86_64/org/eclipse/swt/
/** @field cast=(GdkByteOrder) */
public int byte_order;
/** @field cast=(gint) */
-@@ -35,9 +35,9 @@
+@@ -35,9 +35,9 @@ public class GdkImage {
/** @field cast=(guint16) */
public short bits_per_pixel;
/** @field cast=(gpointer) */
@@ -11058,10 +11270,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkImage.java x86_64/org/eclipse/swt/
- public int /*long*/ windowing_data;
+ public long /*int*/ windowing_data;
}
-diff -urN x86/org/eclipse/swt/internal/gtk/GdkWindowAttr.java x86_64/org/eclipse/swt/internal/gtk/GdkWindowAttr.java
---- x86/org/eclipse/swt/internal/gtk/GdkWindowAttr.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkWindowAttr.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,23 +17,23 @@
+diff --git a/org/eclipse/swt/internal/gtk/GdkWindowAttr.java b/org/eclipse/swt/internal/gtk/GdkWindowAttr.java
+index 33e9930..3c871ac 100644
+--- a/org/eclipse/swt/internal/gtk/GdkWindowAttr.java
++++ b/org/eclipse/swt/internal/gtk/GdkWindowAttr.java
+@@ -17,23 +17,23 @@ package org.eclipse.swt.internal.gtk;
public class GdkWindowAttr {
/** @field cast=(gchar *) */
@@ -11091,55 +11304,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GdkWindowAttr.java x86_64/org/eclipse
public boolean override_redirect;
public static final int sizeof = OS.GdkWindowAttr_sizeof();
}
-diff -urN x86/org/eclipse/swt/internal/gtk/GInterfaceInfo.java x86_64/org/eclipse/swt/internal/gtk/GInterfaceInfo.java
---- x86/org/eclipse/swt/internal/gtk/GInterfaceInfo.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GInterfaceInfo.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,10 +17,10 @@
-
- public class GInterfaceInfo {
- /** @field cast=(GInterfaceInitFunc) */
-- public int /*long*/ interface_init;
-+ public long /*int*/ interface_init;
- /** @field cast=(GInterfaceFinalizeFunc) */
-- public int /*long*/ interface_finalize;
-+ public long /*int*/ interface_finalize;
- /** @field cast=(gpointer) */
-- public int /*long*/ interface_data;
-+ public long /*int*/ interface_data;
- public static final int sizeof = OS.GInterfaceInfo_sizeof();
- }
-diff -urN x86/org/eclipse/swt/internal/gtk/GObjectClass.java x86_64/org/eclipse/swt/internal/gtk/GObjectClass.java
---- x86/org/eclipse/swt/internal/gtk/GObjectClass.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GObjectClass.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,17 +17,17 @@
-
- public class GObjectClass {
- /** @field cast=(GObject *(*)()) */
-- public int /*long*/ constructor;
-+ public long /*int*/ constructor;
- /** @field cast=(void (*)()) */
-- public int /*long*/ set_property;
-+ public long /*int*/ set_property;
- /** @field cast=(void (*)()) */
-- public int /*long*/ get_property;
-+ public long /*int*/ get_property;
- /** @field cast=(void (*)()) */
-- public int /*long*/ dispose;
-+ public long /*int*/ dispose;
- /** @field cast=(void (*)()) */
-- public int /*long*/ finalize;
-+ public long /*int*/ finalize;
- /** @field cast=(void (*)()) */
-- public int /*long*/ dispatch_properties_changed;
-+ public long /*int*/ dispatch_properties_changed;
- /** @field cast=(void (*)()) */
-- public int /*long*/ notify;
-+ public long /*int*/ notify;
- }
-diff -urN x86/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java x86_64/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java
---- x86/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,7 +17,7 @@
+diff --git a/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java b/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java
+index d82483b..f830828 100644
+--- a/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java
++++ b/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GtkCellRendererClass {
/** @field cast=(void(*)()) */
@@ -11149,10 +11318,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java x86_64/org/
- public int /*long*/ get_size;
+ public long /*int*/ get_size;
}
-diff -urN x86/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java x86_64/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java
---- x86/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,11 +17,11 @@
+diff --git a/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java b/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java
+index b94ccfa..a9af375 100644
+--- a/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java
++++ b/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java
+@@ -17,11 +17,11 @@ package org.eclipse.swt.internal.gtk;
public class GtkColorSelectionDialog {
/** @field cast=(GtkWidget *) */
@@ -11168,10 +11338,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java x86_64/o
- public int /*long*/ help_button;
+ public long /*int*/ help_button;
}
-diff -urN x86/org/eclipse/swt/internal/gtk/GtkCombo.java x86_64/org/eclipse/swt/internal/gtk/GtkCombo.java
---- x86/org/eclipse/swt/internal/gtk/GtkCombo.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkCombo.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,7 +17,7 @@
+diff --git a/org/eclipse/swt/internal/gtk/GtkCombo.java b/org/eclipse/swt/internal/gtk/GtkCombo.java
+index d9e4a58..76b0388 100644
+--- a/org/eclipse/swt/internal/gtk/GtkCombo.java
++++ b/org/eclipse/swt/internal/gtk/GtkCombo.java
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GtkCombo {
/** @field cast=(GtkWidget *) */
@@ -11181,10 +11352,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GtkCombo.java x86_64/org/eclipse/swt/
- public int /*long*/ list;
+ public long /*int*/ list;
}
-diff -urN x86/org/eclipse/swt/internal/gtk/GtkFileSelection.java x86_64/org/eclipse/swt/internal/gtk/GtkFileSelection.java
---- x86/org/eclipse/swt/internal/gtk/GtkFileSelection.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkFileSelection.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,43 +17,43 @@
+diff --git a/org/eclipse/swt/internal/gtk/GtkFileSelection.java b/org/eclipse/swt/internal/gtk/GtkFileSelection.java
+index 8e0d862..7f805ab 100644
+--- a/org/eclipse/swt/internal/gtk/GtkFileSelection.java
++++ b/org/eclipse/swt/internal/gtk/GtkFileSelection.java
+@@ -17,43 +17,43 @@ package org.eclipse.swt.internal.gtk;
public class GtkFileSelection {
/** @field cast=(GtkWidget *) */
@@ -11248,20 +11420,22 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GtkFileSelection.java x86_64/org/ecli
- public int /*long*/ action_area;
+ public long /*int*/ action_area;
}
-diff -urN x86/org/eclipse/swt/internal/gtk/GtkFixed.java x86_64/org/eclipse/swt/internal/gtk/GtkFixed.java
---- x86/org/eclipse/swt/internal/gtk/GtkFixed.java 2009-05-29 17:30:10.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkFixed.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,5 +17,5 @@
+diff --git a/org/eclipse/swt/internal/gtk/GtkFixed.java b/org/eclipse/swt/internal/gtk/GtkFixed.java
+index 93b1af7..9ca6e7a 100644
+--- a/org/eclipse/swt/internal/gtk/GtkFixed.java
++++ b/org/eclipse/swt/internal/gtk/GtkFixed.java
+@@ -17,5 +17,5 @@ package org.eclipse.swt.internal.gtk;
public class GtkFixed {
/** @field cast=(GList *) */
- public int /*long*/ children;
+ public long /*int*/ children;
}
-diff -urN x86/org/eclipse/swt/internal/gtk/GtkSelectionData.java x86_64/org/eclipse/swt/internal/gtk/GtkSelectionData.java
---- x86/org/eclipse/swt/internal/gtk/GtkSelectionData.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkSelectionData.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,15 +17,15 @@
+diff --git a/org/eclipse/swt/internal/gtk/GtkSelectionData.java b/org/eclipse/swt/internal/gtk/GtkSelectionData.java
+index 6c413af..6cc4fcc 100644
+--- a/org/eclipse/swt/internal/gtk/GtkSelectionData.java
++++ b/org/eclipse/swt/internal/gtk/GtkSelectionData.java
+@@ -17,15 +17,15 @@ package org.eclipse.swt.internal.gtk;
public class GtkSelectionData {
/** @field cast=(GdkAtom) */
@@ -11281,10 +11455,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GtkSelectionData.java x86_64/org/ecli
/** @field cast=(gint) */
public int length;
public static final int sizeof = OS.GtkSelectionData_sizeof();
-diff -urN x86/org/eclipse/swt/internal/gtk/GtkTargetEntry.java x86_64/org/eclipse/swt/internal/gtk/GtkTargetEntry.java
---- x86/org/eclipse/swt/internal/gtk/GtkTargetEntry.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkTargetEntry.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,7 +17,7 @@
+diff --git a/org/eclipse/swt/internal/gtk/GtkTargetEntry.java b/org/eclipse/swt/internal/gtk/GtkTargetEntry.java
+index cf31774..cfc4dff 100644
+--- a/org/eclipse/swt/internal/gtk/GtkTargetEntry.java
++++ b/org/eclipse/swt/internal/gtk/GtkTargetEntry.java
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GtkTargetEntry {
/** @field cast=(gchar *) */
@@ -11293,10 +11468,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GtkTargetEntry.java x86_64/org/eclips
/** @field cast=(guint) */
public int flags;
/** @field cast=(guint) */
-diff -urN x86/org/eclipse/swt/internal/gtk/GtkTargetPair.java x86_64/org/eclipse/swt/internal/gtk/GtkTargetPair.java
---- x86/org/eclipse/swt/internal/gtk/GtkTargetPair.java 2009-05-29 17:30:10.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkTargetPair.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,7 +17,7 @@
+diff --git a/org/eclipse/swt/internal/gtk/GtkTargetPair.java b/org/eclipse/swt/internal/gtk/GtkTargetPair.java
+index c98fb12..beef1cf 100644
+--- a/org/eclipse/swt/internal/gtk/GtkTargetPair.java
++++ b/org/eclipse/swt/internal/gtk/GtkTargetPair.java
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GtkTargetPair {
/** @field cast=(GdkAtom) */
@@ -11305,10 +11481,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GtkTargetPair.java x86_64/org/eclipse
/** @field cast=(guint) */
public int flags;
/** @field cast=(guint) */
-diff -urN x86/org/eclipse/swt/internal/gtk/GtkWidgetClass.java x86_64/org/eclipse/swt/internal/gtk/GtkWidgetClass.java
---- x86/org/eclipse/swt/internal/gtk/GtkWidgetClass.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkWidgetClass.java 2009-09-17 08:48:24.000000000 -0400
-@@ -19,127 +19,127 @@
+diff --git a/org/eclipse/swt/internal/gtk/GtkWidgetClass.java b/org/eclipse/swt/internal/gtk/GtkWidgetClass.java
+index 691a60f..4de85dc 100644
+--- a/org/eclipse/swt/internal/gtk/GtkWidgetClass.java
++++ b/org/eclipse/swt/internal/gtk/GtkWidgetClass.java
+@@ -19,127 +19,127 @@ public class GtkWidgetClass extends GObjectClass {
public int activate_signal;
public int set_scroll_adjustments_signal;
/** @field cast=(void(*)()) */
@@ -11498,55 +11675,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/GtkWidgetClass.java x86_64/org/eclips
- public int /*long*/ screen_changed;
+ public long /*int*/ screen_changed;
}
-diff -urN x86/org/eclipse/swt/internal/gtk/GTypeInfo.java x86_64/org/eclipse/swt/internal/gtk/GTypeInfo.java
---- x86/org/eclipse/swt/internal/gtk/GTypeInfo.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GTypeInfo.java 2009-09-17 08:48:24.000000000 -0400
-@@ -19,22 +19,22 @@
- /** @field cast=(guint16) */
- public short class_size;
- /** @field cast=(GBaseInitFunc) */
-- public int /*long*/ base_init;
-+ public long /*int*/ base_init;
- /** @field cast=(GBaseFinalizeFunc) */
-- public int /*long*/ base_finalize;
-+ public long /*int*/ base_finalize;
- /** @field cast=(GClassInitFunc) */
-- public int /*long*/ class_init;
-+ public long /*int*/ class_init;
- /** @field cast=(GClassFinalizeFunc) */
-- public int /*long*/ class_finalize;
-+ public long /*int*/ class_finalize;
- /** @field cast=(gconstpointer) */
-- public int /*long*/ class_data;
-+ public long /*int*/ class_data;
- /** @field cast=(guint16) */
- public short instance_size;
- /** @field cast=(guint16) */
- public short n_preallocs;
- /** @field cast=(GInstanceInitFunc) */
-- public int /*long*/ instance_init;
-+ public long /*int*/ instance_init;
- /** @field cast=(GTypeValueTable *) */
-- public int /*long*/ value_table;
-+ public long /*int*/ value_table;
- public static final int sizeof = OS.GTypeInfo_sizeof();
- }
-diff -urN x86/org/eclipse/swt/internal/gtk/GTypeQuery.java x86_64/org/eclipse/swt/internal/gtk/GTypeQuery.java
---- x86/org/eclipse/swt/internal/gtk/GTypeQuery.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GTypeQuery.java 2009-09-17 08:48:24.000000000 -0400
-@@ -19,7 +19,7 @@
- /** @field cast=(GType) */
- public int type;
- /** @field cast=(const gchar *) */
-- public int /*long*/ type_name;
-+ public long /*int*/ type_name;
- /** @field cast=(guint) */
- public int class_size;
- /** @field cast=(guint) */
-diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/internal/gtk/OS.java
---- x86/org/eclipse/swt/internal/gtk/OS.java 2009-08-20 15:16:38.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/OS.java 2009-09-17 08:48:24.000000000 -0400
-@@ -591,77 +591,77 @@
+diff --git a/org/eclipse/swt/internal/gtk/OS.java b/org/eclipse/swt/internal/gtk/OS.java
+index 29323e0..e3fd136 100644
+--- a/org/eclipse/swt/internal/gtk/OS.java
++++ b/org/eclipse/swt/internal/gtk/OS.java
+@@ -591,77 +591,77 @@ public static final native int XExposeEvent_sizeof();
public static final native int XFocusChangeEvent_sizeof();
public static final native int XVisibilityEvent_sizeof();
public static final native int XWindowChanges_sizeof();
@@ -11652,7 +11785,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
/** X11 Native methods and constants */
public static final int Above = 0;
-@@ -679,7 +679,7 @@
+@@ -679,7 +679,7 @@ public static final int FocusOut = 10;
public static final int GraphicsExpose = 13;
public static final int NoExpose = 14;
public static final int ExposureMask = 1 << 15;
@@ -11661,7 +11794,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
public static final int NotifyNormal = 0;
public static final int NotifyGrab = 1;
public static final int NotifyHint = 1;
-@@ -695,8 +695,8 @@
+@@ -695,8 +695,8 @@ public static final int VisibilityChangeMask = 1 << 16;
public static final int VisibilityFullyObscured = 2;
public static final int VisibilityNotify = 15;
public static final int SYSTEM_TRAY_REQUEST_DOCK = 0;
@@ -11672,7 +11805,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _Call(proc, arg1, arg2);
-@@ -704,8 +704,8 @@
+@@ -704,8 +704,8 @@ public static final int Call(int /*long*/ proc, int /*long*/ arg1, int /*long*/
lock.unlock();
}
}
@@ -11683,7 +11816,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _call(function, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -716,8 +716,8 @@
+@@ -716,8 +716,8 @@ public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0,
/** @method flags=no_gen */
public static final native boolean GDK_WINDOWING_X11();
/** @param pixmap cast=(GdkPixmap *) */
@@ -11694,7 +11827,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GDK_PIXMAP_XID(pixmap);
-@@ -730,8 +730,8 @@
+@@ -730,8 +730,8 @@ public static final int /*long*/ GDK_PIXMAP_XID(int /*long*/ pixmap) {
* @param event_mask cast=(long)
* @param event_return cast=(XEvent *)
*/
@@ -11705,7 +11838,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XCheckMaskEvent(display, event_mask, event_return);
-@@ -745,8 +745,8 @@
+@@ -745,8 +745,8 @@ public static final boolean XCheckMaskEvent(int /*long*/ display, int /*long*/ e
* @param event_mask cast=(long)
* @param event_return cast=(XEvent *)
*/
@@ -11716,7 +11849,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XCheckWindowEvent(display, window, event_mask, event_return);
-@@ -760,8 +760,8 @@
+@@ -760,8 +760,8 @@ public static final boolean XCheckWindowEvent(int /*long*/ display, int /*long*/
* @param predicate cast=(Bool (*)())
* @param arg cast=(XPointer)
*/
@@ -11727,7 +11860,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XCheckIfEvent(display, event_return, predicate, arg);
-@@ -770,8 +770,8 @@
+@@ -770,8 +770,8 @@ public static final boolean XCheckIfEvent(int /*long*/ display, int /*long*/ eve
}
}
/** @param display cast=(Display *) */
@@ -11738,7 +11871,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XDefaultScreen(display);
-@@ -780,8 +780,8 @@
+@@ -780,8 +780,8 @@ public static final int XDefaultScreen(int /*long*/ display) {
}
}
/** @param display cast=(Display *) */
@@ -11749,7 +11882,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XDefaultRootWindow(display);
-@@ -790,8 +790,8 @@
+@@ -790,8 +790,8 @@ public static final int /*long*/ XDefaultRootWindow(int /*long*/ display) {
}
}
/** @param display cast=(Display *) */
@@ -11760,7 +11893,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_XFlush(display);
-@@ -800,8 +800,8 @@
+@@ -800,8 +800,8 @@ public static final void XFlush(int /*long*/ display) {
}
}
/** @param address cast=(void *) */
@@ -11771,7 +11904,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_XFree(address);
-@@ -813,8 +813,8 @@
+@@ -813,8 +813,8 @@ public static final void XFree(int /*long*/ address) {
* @param display cast=(Display *)
* @param selection cast=(Atom)
*/
@@ -11782,7 +11915,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XGetSelectionOwner(display, selection);
-@@ -827,8 +827,8 @@
+@@ -827,8 +827,8 @@ public static final int /*long*/ XGetSelectionOwner(int /*long*/ display, int /*
* @param name cast=(char *)
* @param ifExists cast=(Bool)
*/
@@ -11793,7 +11926,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XInternAtom(display, name, ifExists);
-@@ -847,8 +847,8 @@
+@@ -847,8 +847,8 @@ public static final int /*long*/ XInternAtom(int /*long*/ display, byte[] name,
* @param win_y_return cast=(int *)
* @param mask_return cast=(unsigned int *)
*/
@@ -11804,7 +11937,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XQueryPointer(display, w, root_return, child_return, root_x_return, root_y_return, win_x_return, win_y_return, mask_return);
-@@ -864,8 +864,8 @@
+@@ -864,8 +864,8 @@ public static final int XQueryPointer(int /*long*/ display, int /*long*/ w, int
* @param children_return cast=(Window **)
* @param nchildren_return cast=(unsigned int *)
*/
@@ -11815,7 +11948,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XQueryTree(display, w, root_return, parent_return, children_return, nchildren_return);
-@@ -877,8 +877,8 @@
+@@ -877,8 +877,8 @@ public static final int XQueryTree(int /*long*/ display, int /*long*/ w, int /*l
* @param display cast=(Display *)
* @param keysym cast=(KeySym)
*/
@@ -11826,7 +11959,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XKeysymToKeycode(display, keysym);
-@@ -891,8 +891,8 @@
+@@ -891,8 +891,8 @@ public static final int XKeysymToKeycode(int /*long*/ display, int /*long*/ keys
* @param window cast=(Window)
* @param num_prop_return cast=(int *)
*/
@@ -11837,7 +11970,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XListProperties(display, window, num_prop_return);
-@@ -905,8 +905,8 @@
+@@ -905,8 +905,8 @@ public static final int /*long*/ XListProperties(int /*long*/ display, int /*lon
* @param window cast=(Window)
* @param values flags=no_out
*/
@@ -11848,7 +11981,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XReconfigureWMWindow(display, window, screen, valueMask, values);
-@@ -919,8 +919,8 @@
+@@ -919,8 +919,8 @@ public static final int XReconfigureWMWindow(int /*long*/ display, int /*long*/
* @param w cast=(Window)
* @param event_send cast=(XEvent *)
*/
@@ -11859,7 +11992,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XSendEvent(display, w, propogate, event_mask, event_send);
-@@ -929,8 +929,8 @@
+@@ -929,8 +929,8 @@ public static final int XSendEvent(int /*long*/ display, int /*long*/ w, boolean
}
}
/** @param handler cast=(XIOErrorHandler) */
@@ -11870,7 +12003,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XSetIOErrorHandler(handler);
-@@ -939,8 +939,8 @@
+@@ -939,8 +939,8 @@ public static final int /*long*/ XSetIOErrorHandler(int /*long*/ handler) {
}
}
/** @param handler cast=(XErrorHandler) */
@@ -11881,7 +12014,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XSetErrorHandler(handler);
-@@ -952,8 +952,8 @@
+@@ -952,8 +952,8 @@ public static final int /*long*/ XSetErrorHandler(int /*long*/ handler) {
* @param display cast=(Display *)
* @param window cast=(Window)
*/
@@ -11892,7 +12025,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XSetInputFocus(display, window, revert, time);
-@@ -966,8 +966,8 @@
+@@ -966,8 +966,8 @@ public static final int XSetInputFocus(int /*long*/ display, int /*long*/ window
* @param w cast=(Window)
* @param prop_window cast=(Window)
*/
@@ -11903,7 +12036,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XSetTransientForHint(display, w, prop_window);
-@@ -976,8 +976,8 @@
+@@ -976,8 +976,8 @@ public static final int XSetTransientForHint(int /*long*/ display, int /*long*/
}
}
/** @param display cast=(Display *) */
@@ -11914,7 +12047,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XSynchronize(display, onoff);
-@@ -990,8 +990,8 @@
+@@ -990,8 +990,8 @@ public static final int /*long*/ XSynchronize(int /*long*/ display, boolean onof
* @param is_press cast=(Bool)
* @param delay cast=(unsigned long)
*/
@@ -11925,7 +12058,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_XTestFakeButtonEvent(display, button, is_press, delay);
-@@ -1004,8 +1004,8 @@
+@@ -1004,8 +1004,8 @@ public static final void XTestFakeButtonEvent(int /*long*/ display, int button,
* @param is_press cast=(Bool)
* @param delay cast=(unsigned long)
*/
@@ -11936,7 +12069,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_XTestFakeKeyEvent(display, keycode, is_press, delay);
-@@ -1017,8 +1017,8 @@
+@@ -1017,8 +1017,8 @@ public static final void XTestFakeKeyEvent(int /*long*/ display, int keycode, bo
* @param display cast=(Display *)
* @param delay cast=(unsigned long)
*/
@@ -11947,7 +12080,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_XTestFakeMotionEvent(display, screen_number, x, y, delay);
-@@ -1031,8 +1031,8 @@
+@@ -1031,8 +1031,8 @@ public static final void XTestFakeMotionEvent(int /*long*/ display, int screen_n
* @param sourceWindow cast=(Window)
* @param destWindow cast=(Window)
*/
@@ -11958,7 +12091,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XWarpPointer(display, sourceWindow, destWindow, sourceX, sourceY, sourceWidth, sourceHeight, destX, destY);
-@@ -1041,8 +1041,8 @@
+@@ -1041,8 +1041,8 @@ public static final int XWarpPointer(int /*long*/ display, int /*long*/ sourceWi
}
}
/** @param atom cast=(GdkAtom) */
@@ -11969,7 +12102,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_x11_atom_to_xatom(atom);
-@@ -1051,8 +1051,8 @@
+@@ -1051,8 +1051,8 @@ public static final int /*long*/ gdk_x11_atom_to_xatom(int /*long*/ atom) {
}
}
/** @param colormap cast=(GdkColormap *) */
@@ -11980,7 +12113,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_x11_colormap_get_xcolormap(colormap);
-@@ -1061,8 +1061,8 @@
+@@ -1061,8 +1061,8 @@ public static final int /*long*/ gdk_x11_colormap_get_xcolormap(int /*long*/ col
}
}
/** @param drawable cast=(GdkDrawable *) */
@@ -11991,7 +12124,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_x11_drawable_get_xdisplay(drawable);
-@@ -1071,8 +1071,8 @@
+@@ -1071,8 +1071,8 @@ public static final int /*long*/ gdk_x11_drawable_get_xdisplay(int /*long*/ draw
}
}
/** @param drawable cast=(GdkDrawable *) */
@@ -12002,7 +12135,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_x11_drawable_get_xid(drawable);
-@@ -1085,8 +1085,8 @@
+@@ -1085,8 +1085,8 @@ public static final int /*long*/ gdk_x11_drawable_get_xid(int /*long*/ drawable)
* @param screen cast=(GdkScreen *)
* @param xvisualid cast=(VisualID)
*/
@@ -12013,7 +12146,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_x11_screen_lookup_visual(screen, xvisualid);
-@@ -1098,8 +1098,8 @@
+@@ -1098,8 +1098,8 @@ public static final int /*long*/ gdk_x11_screen_lookup_visual(int /*long*/ scree
* @method flags=dynamic
* @param screen cast=(GdkScreen *)
*/
@@ -12024,7 +12157,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_x11_screen_get_window_manager_name(screen);
-@@ -1108,8 +1108,8 @@
+@@ -1108,8 +1108,8 @@ public static final int /*long*/ gdk_x11_screen_get_window_manager_name(int /*lo
}
}
/** @param visual cast=(GdkVisual *) */
@@ -12035,7 +12168,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_x11_visual_get_xvisual(visual);
-@@ -1117,8 +1117,8 @@
+@@ -1117,8 +1117,8 @@ public static final int /*long*/ gdk_x11_visual_get_xvisual(int /*long*/ visual)
lock.unlock();
}
}
@@ -12046,7 +12179,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixmap_foreign_new(anid);
-@@ -1126,8 +1126,8 @@
+@@ -1126,8 +1126,8 @@ public static final int /*long*/ gdk_pixmap_foreign_new(int /*long*/ anid) {
lock.unlock();
}
}
@@ -12057,7 +12190,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_window_lookup(xid);
-@@ -1140,8 +1140,8 @@
+@@ -1140,8 +1140,8 @@ public static final int /*long*/ gdk_window_lookup(int /*long*/ xid) {
* @param function cast=(GdkFilterFunc)
* @param data cast=(gpointer)
*/
@@ -12068,7 +12201,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_add_filter(window, function, data);
-@@ -1154,8 +1154,8 @@
+@@ -1154,8 +1154,8 @@ public static final void gdk_window_add_filter(int /*long*/ window, int /*long*/
* @param function cast=(GdkFilterFunc)
* @param data cast=(gpointer)
*/
@@ -12079,7 +12212,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_remove_filter(window, function, data);
-@@ -1168,61 +1168,61 @@
+@@ -1168,61 +1168,61 @@ public static final void gdk_window_remove_filter(int /*long*/ window, int /*lon
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
@@ -12151,7 +12284,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
/** X render natives and constants */
public static final int PictStandardARGB32 = 0;
-@@ -1235,8 +1235,8 @@
+@@ -1235,8 +1235,8 @@ public static final int PictOpOver = 3;
public static final native int XRenderPictureAttributes_sizeof();
/** @method flags=dynamic */
@@ -12162,7 +12295,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XRenderQueryExtension(display, event_basep, error_basep);
-@@ -1245,8 +1245,8 @@
+@@ -1245,8 +1245,8 @@ public static final boolean XRenderQueryExtension(int /*long*/ display, int[] ev
}
}
/** @method flags=dynamic */
@@ -12173,7 +12306,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XRenderQueryVersion(display, major_versionp, minor_versionp);
-@@ -1258,8 +1258,8 @@
+@@ -1258,8 +1258,8 @@ public static final int XRenderQueryVersion(int /*long*/ display, int[] major_ve
* @method flags=dynamic
* @param attributes flags=no_out
*/
@@ -12184,7 +12317,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XRenderCreatePicture(display, drawable, format, valuemask, attributes);
-@@ -1268,8 +1268,8 @@
+@@ -1268,8 +1268,8 @@ public static final int /*long*/ XRenderCreatePicture(int /*long*/ display, int
}
}
/** @method flags=dynamic */
@@ -12195,7 +12328,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_XRenderSetPictureClipRectangles(display, picture, xOrigin, yOrigin, rects, count);
-@@ -1278,8 +1278,8 @@
+@@ -1278,8 +1278,8 @@ public static final void XRenderSetPictureClipRectangles(int /*long*/ display, i
}
}
/** @method flags=dynamic */
@@ -12206,7 +12339,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_XRenderSetPictureTransform(display, picture, transform);
-@@ -1288,8 +1288,8 @@
+@@ -1288,8 +1288,8 @@ public static final void XRenderSetPictureTransform(int /*long*/ display, int /*
}
}
/** @method flags=dynamic */
@@ -12217,7 +12350,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_XRenderFreePicture(display, picture);
-@@ -1298,8 +1298,8 @@
+@@ -1298,8 +1298,8 @@ public static final void XRenderFreePicture(int /*long*/ display, int /*long*/ p
}
}
/** @method flags=dynamic */
@@ -12228,7 +12361,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_XRenderComposite(display, op, src, mask, dst, src_x, src_y, mask_x, mask_y, dst_x, dst_y, width, height);
-@@ -1308,8 +1308,8 @@
+@@ -1308,8 +1308,8 @@ public static final void XRenderComposite(int /*long*/ display, int op, int /*lo
}
}
/** @method flags=dynamic */
@@ -12239,7 +12372,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XRenderFindStandardFormat(display, format);
-@@ -1318,8 +1318,8 @@
+@@ -1318,8 +1318,8 @@ public static final int /*long*/ XRenderFindStandardFormat(int /*long*/ display,
}
}
/** @method flags=dynamic */
@@ -12250,7 +12383,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XRenderFindVisualFormat(display, visual);
-@@ -1329,10 +1329,10 @@
+@@ -1329,10 +1329,10 @@ public static final int /*long*/ XRenderFindVisualFormat(int /*long*/ display, i
}
/** Natives */
@@ -12265,7 +12398,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GDK_DISPLAY();
-@@ -1340,8 +1340,8 @@
+@@ -1340,8 +1340,8 @@ public static final int /*long*/ GDK_DISPLAY() {
lock.unlock();
}
}
@@ -12276,7 +12409,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GDK_ROOT_PARENT();
-@@ -1350,8 +1350,8 @@
+@@ -1350,8 +1350,8 @@ public static final int /*long*/ GDK_ROOT_PARENT() {
}
}
/** @method flags=const */
@@ -12287,7 +12420,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GDK_TYPE_COLOR();
-@@ -1360,8 +1360,8 @@
+@@ -1360,8 +1360,8 @@ public static final int /*long*/ GDK_TYPE_COLOR() {
}
}
/** @method flags=const */
@@ -12298,7 +12431,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GDK_TYPE_PIXBUF();
-@@ -1369,8 +1369,8 @@
+@@ -1369,8 +1369,8 @@ public static final int /*long*/ GDK_TYPE_PIXBUF() {
lock.unlock();
}
}
@@ -12309,7 +12442,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_IS_BUTTON(obj);
-@@ -1378,8 +1378,8 @@
+@@ -1378,8 +1378,8 @@ public static final boolean GTK_IS_BUTTON(int /*long*/ obj) {
lock.unlock();
}
}
@@ -12320,7 +12453,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_IS_WINDOW(obj);
-@@ -1387,8 +1387,8 @@
+@@ -1387,8 +1387,8 @@ public static final boolean GTK_IS_WINDOW(int /*long*/ obj) {
lock.unlock();
}
}
@@ -12331,7 +12464,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_IS_CELL_RENDERER_PIXBUF(obj);
-@@ -1396,8 +1396,8 @@
+@@ -1396,8 +1396,8 @@ public static final boolean GTK_IS_CELL_RENDERER_PIXBUF(int /*long*/ obj) {
lock.unlock();
}
}
@@ -12342,7 +12475,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_IS_CELL_RENDERER_TEXT(obj);
-@@ -1405,8 +1405,8 @@
+@@ -1405,8 +1405,8 @@ public static final boolean GTK_IS_CELL_RENDERER_TEXT(int /*long*/ obj) {
lock.unlock();
}
}
@@ -12353,7 +12486,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_IS_CELL_RENDERER_TOGGLE(obj);
-@@ -1414,8 +1414,8 @@
+@@ -1414,8 +1414,8 @@ public static final boolean GTK_IS_CELL_RENDERER_TOGGLE(int /*long*/ obj) {
lock.unlock();
}
}
@@ -12364,7 +12497,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_IS_CONTAINER(obj);
-@@ -1423,8 +1423,8 @@
+@@ -1423,8 +1423,8 @@ public static final boolean GTK_IS_CONTAINER(int /*long*/ obj) {
lock.unlock();
}
}
@@ -12375,7 +12508,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_IS_IMAGE_MENU_ITEM(obj);
-@@ -1432,8 +1432,8 @@
+@@ -1432,8 +1432,8 @@ public static final boolean GTK_IS_IMAGE_MENU_ITEM(int /*long*/ obj) {
lock.unlock();
}
}
@@ -12386,7 +12519,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_IS_MENU_ITEM(obj);
-@@ -1441,8 +1441,8 @@
+@@ -1441,8 +1441,8 @@ public static final boolean GTK_IS_MENU_ITEM(int /*long*/ obj) {
lock.unlock();
}
}
@@ -12397,7 +12530,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_IS_PLUG(obj);
-@@ -1450,8 +1450,8 @@
+@@ -1450,8 +1450,8 @@ public static final boolean GTK_IS_PLUG(int /*long*/ obj) {
lock.unlock();
}
}
@@ -12408,7 +12541,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_IS_SOCKET(obj);
-@@ -1460,8 +1460,8 @@
+@@ -1460,8 +1460,8 @@ public static final boolean GTK_IS_SOCKET(int /*long*/ obj) {
}
}
/** @method flags=const */
@@ -12419,7 +12552,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_STOCK_CANCEL();
-@@ -1470,8 +1470,8 @@
+@@ -1470,8 +1470,8 @@ public static final int /*long*/ GTK_STOCK_CANCEL() {
}
}
/** @method flags=const */
@@ -12430,7 +12563,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_STOCK_OK();
-@@ -1480,8 +1480,8 @@
+@@ -1480,8 +1480,8 @@ public static final int /*long*/ GTK_STOCK_OK() {
}
}
/** @method flags=const */
@@ -12441,7 +12574,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_TYPE_CELL_RENDERER_TEXT();
-@@ -1490,8 +1490,8 @@
+@@ -1490,8 +1490,8 @@ public static final int /*long*/ GTK_TYPE_CELL_RENDERER_TEXT() {
}
}
/** @method flags=const */
@@ -12452,7 +12585,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_TYPE_CELL_RENDERER_PIXBUF();
-@@ -1500,8 +1500,8 @@
+@@ -1500,8 +1500,8 @@ public static final int /*long*/ GTK_TYPE_CELL_RENDERER_PIXBUF() {
}
}
/** @method flags=const */
@@ -12463,7 +12596,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_TYPE_CELL_RENDERER_TOGGLE();
-@@ -1510,8 +1510,8 @@
+@@ -1510,8 +1510,8 @@ public static final int /*long*/ GTK_TYPE_CELL_RENDERER_TOGGLE() {
}
}
/** @method flags=const */
@@ -12474,7 +12607,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_TYPE_FIXED();
-@@ -1520,8 +1520,8 @@
+@@ -1520,8 +1520,8 @@ public static final int /*long*/ GTK_TYPE_FIXED() {
}
}
/** @method flags=const */
@@ -12485,7 +12618,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_TYPE_MENU();
-@@ -1530,8 +1530,8 @@
+@@ -1530,8 +1530,8 @@ public static final int /*long*/ GTK_TYPE_MENU() {
}
}
/** @method flags=const */
@@ -12496,7 +12629,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_TYPE_WIDGET();
-@@ -1539,8 +1539,8 @@
+@@ -1539,8 +1539,8 @@ public static final int /*long*/ GTK_TYPE_WIDGET() {
lock.unlock();
}
}
@@ -12507,7 +12640,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_WIDGET_FLAGS(wid);
-@@ -1548,8 +1548,8 @@
+@@ -1548,8 +1548,8 @@ public static final int GTK_WIDGET_FLAGS(int /*long*/ wid) {
lock.unlock();
}
}
@@ -12518,7 +12651,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_WIDGET_STATE(wid);
-@@ -1557,8 +1557,8 @@
+@@ -1557,8 +1557,8 @@ public static final int GTK_WIDGET_STATE(int /*long*/ wid) {
lock.unlock();
}
}
@@ -12529,7 +12662,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_WIDGET_HAS_DEFAULT(wid);
-@@ -1566,8 +1566,8 @@
+@@ -1566,8 +1566,8 @@ public static final boolean GTK_WIDGET_HAS_DEFAULT(int /*long*/ wid) {
lock.unlock();
}
}
@@ -12540,7 +12673,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_WIDGET_HAS_FOCUS(wid);
-@@ -1575,8 +1575,8 @@
+@@ -1575,8 +1575,8 @@ public static final boolean GTK_WIDGET_HAS_FOCUS(int /*long*/ wid) {
lock.unlock();
}
}
@@ -12551,7 +12684,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_WIDGET_IS_SENSITIVE(wid);
-@@ -1584,8 +1584,8 @@
+@@ -1584,8 +1584,8 @@ public static final boolean GTK_WIDGET_IS_SENSITIVE(int /*long*/ wid) {
lock.unlock();
}
}
@@ -12562,7 +12695,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_WIDGET_MAPPED(wid);
-@@ -1593,8 +1593,8 @@
+@@ -1593,8 +1593,8 @@ public static final boolean GTK_WIDGET_MAPPED(int /*long*/ wid) {
lock.unlock();
}
}
@@ -12573,7 +12706,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_WIDGET_SENSITIVE(wid);
-@@ -1602,8 +1602,8 @@
+@@ -1602,8 +1602,8 @@ public static final boolean GTK_WIDGET_SENSITIVE(int /*long*/ wid) {
lock.unlock();
}
}
@@ -12584,7 +12717,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_GTK_WIDGET_SET_FLAGS(wid, flag);
-@@ -1611,8 +1611,8 @@
+@@ -1611,8 +1611,8 @@ public static final void GTK_WIDGET_SET_FLAGS(int /*long*/ wid, int flag) {
lock.unlock();
}
}
@@ -12595,7 +12728,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_GTK_WIDGET_UNSET_FLAGS(wid, flag);
-@@ -1620,8 +1620,8 @@
+@@ -1620,8 +1620,8 @@ public static final void GTK_WIDGET_UNSET_FLAGS(int /*long*/ wid, int flag) {
lock.unlock();
}
}
@@ -12606,7 +12739,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _GTK_WIDGET_VISIBLE(wid);
-@@ -1629,8 +1629,8 @@
+@@ -1629,8 +1629,8 @@ public static final boolean GTK_WIDGET_VISIBLE(int /*long*/ wid) {
lock.unlock();
}
}
@@ -12617,7 +12750,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _G_OBJECT_CLASS(klass);
-@@ -1638,8 +1638,8 @@
+@@ -1638,8 +1638,8 @@ public static final int /*long*/ G_OBJECT_CLASS (int /*long*/ klass) {
lock.unlock();
}
}
@@ -12628,7 +12761,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _G_OBJECT_GET_CLASS(object);
-@@ -1647,8 +1647,8 @@
+@@ -1647,8 +1647,8 @@ public static final int /*long*/ G_OBJECT_GET_CLASS (int /*long*/ object) {
lock.unlock();
}
}
@@ -12639,7 +12772,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _G_OBJECT_TYPE_NAME(object);
-@@ -1657,8 +1657,8 @@
+@@ -1657,8 +1657,8 @@ public static final int /*long*/ G_OBJECT_TYPE_NAME (int /*long*/ object) {
}
}
/** @method flags=const */
@@ -12650,7 +12783,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _G_TYPE_BOOLEAN();
-@@ -1667,8 +1667,8 @@
+@@ -1667,8 +1667,8 @@ public static final int /*long*/ G_TYPE_BOOLEAN() {
}
}
/** @method flags=const */
@@ -12661,7 +12794,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _G_TYPE_INT();
-@@ -1676,8 +1676,8 @@
+@@ -1676,8 +1676,8 @@ public static final int /*long*/ G_TYPE_INT() {
lock.unlock();
}
}
@@ -12672,7 +12805,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _G_OBJECT_TYPE(instance);
-@@ -1686,8 +1686,8 @@
+@@ -1686,8 +1686,8 @@ public static final int /*long*/ G_OBJECT_TYPE (int /*long*/ instance) {
}
}
/** @method flags=const */
@@ -12683,7 +12816,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _G_TYPE_STRING();
-@@ -1705,8 +1705,8 @@
+@@ -1705,8 +1705,8 @@ public static final int PANGO_PIXELS(int dimension) {
}
}
/** @method flags=const */
@@ -12694,7 +12827,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _PANGO_TYPE_FONT_DESCRIPTION();
-@@ -1715,8 +1715,8 @@
+@@ -1715,8 +1715,8 @@ public static final int /*long*/ PANGO_TYPE_FONT_DESCRIPTION() {
}
}
/** @method flags=const */
@@ -12705,7 +12838,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _PANGO_TYPE_LAYOUT();
-@@ -1725,8 +1725,8 @@
+@@ -1725,8 +1725,8 @@ public static final int /*long*/ PANGO_TYPE_LAYOUT() {
}
}
/** @param handle cast=(void *) */
@@ -12716,7 +12849,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _dlclose(handle);
-@@ -1735,8 +1735,8 @@
+@@ -1735,8 +1735,8 @@ public static final int dlclose(int /*long*/ handle) {
}
}
/** @param filename cast=(const char *) */
@@ -12727,7 +12860,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _dlopen(filename, flag);
-@@ -1748,8 +1748,8 @@
+@@ -1748,8 +1748,8 @@ public static final int /*long*/ dlopen(byte[] filename, int flag) {
* @param handle cast=(void *)
* @param symbol cast=(const char *)
*/
@@ -12738,7 +12871,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _dlsym(handle, symbol);
-@@ -1764,8 +1764,8 @@
+@@ -1764,8 +1764,8 @@ public static final int /*long*/ dlsym(int /*long*/ handle, byte[] symbol) {
* @param hook_data cast=(gpointer)
* @param data_destroy cast=(GDestroyNotify)
*/
@@ -12749,7 +12882,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_signal_add_emission_hook(signal_id, detail, hook_func, hook_data, data_destroy);
-@@ -1777,8 +1777,8 @@
+@@ -1777,8 +1777,8 @@ public static final int /*long*/ g_signal_add_emission_hook(int signal_id, int d
* @param signal_id cast=(guint)
* @param hook_id cast=(gulong)
*/
@@ -12760,7 +12893,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_signal_remove_emission_hook (signal_id, hook_id);
-@@ -1791,8 +1791,8 @@
+@@ -1791,8 +1791,8 @@ public static final void g_signal_remove_emission_hook(int signal_id, int /*long
* @param user_data cast=(gpointer)
* @param destroy_data cast=(GClosureNotify)
*/
@@ -12771,7 +12904,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_cclosure_new(callback_func, user_data, destroy_data);
-@@ -1801,8 +1801,8 @@
+@@ -1801,8 +1801,8 @@ public static final int /*long*/ g_cclosure_new(int /*long*/ callback_func, int
}
}
/** @param closure cast=(GClosure *) */
@@ -12782,7 +12915,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_closure_ref(closure);
-@@ -1811,8 +1811,8 @@
+@@ -1811,8 +1811,8 @@ public static final int /*long*/ g_closure_ref(int /*long*/ closure) {
}
}
/** @param closure cast=(GClosure *) */
@@ -12793,7 +12926,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_closure_unref(closure);
-@@ -1821,8 +1821,8 @@
+@@ -1821,8 +1821,8 @@ public static final void g_closure_unref(int /*long*/ closure) {
}
}
/** @param context cast=(GMainContext *) */
@@ -12804,7 +12937,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_main_context_acquire(context);
-@@ -1834,8 +1834,8 @@
+@@ -1834,8 +1834,8 @@ public static final boolean g_main_context_acquire(int /*long*/ context) {
* @param context cast=(GMainContext *)
* @param fds cast=(GPollFD *)
*/
@@ -12815,7 +12948,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_main_context_check(context, max_priority, fds, n_fds);
-@@ -1843,8 +1843,8 @@
+@@ -1843,8 +1843,8 @@ public static final int g_main_context_check(int /*long*/ context, int max_prior
lock.unlock();
}
}
@@ -12826,7 +12959,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_main_context_default();
-@@ -1853,8 +1853,8 @@
+@@ -1853,8 +1853,8 @@ public static final int /*long*/ g_main_context_default() {
}
}
/** @param context cast=(GMainContext *) */
@@ -12837,7 +12970,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_main_context_iteration(context, may_block);
-@@ -1863,8 +1863,8 @@
+@@ -1863,8 +1863,8 @@ public static final boolean g_main_context_iteration(int /*long*/ context, boole
}
}
/** @param context cast=(GMainContext *) */
@@ -12848,7 +12981,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_main_context_pending(context);
-@@ -1873,8 +1873,8 @@
+@@ -1873,8 +1873,8 @@ public static final boolean g_main_context_pending(int /*long*/ context) {
}
}
/** @param context cast=(GMainContext *) */
@@ -12859,7 +12992,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_main_context_get_poll_func(context);
-@@ -1883,8 +1883,8 @@
+@@ -1883,8 +1883,8 @@ public static final int /*long*/ g_main_context_get_poll_func(int /*long*/ conte
}
}
/** @param context cast=(GMainContext *) */
@@ -12870,7 +13003,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_main_context_prepare(context, priority);
-@@ -1896,8 +1896,8 @@
+@@ -1896,8 +1896,8 @@ public static final boolean g_main_context_prepare(int /*long*/ context, int[] p
* @param context cast=(GMainContext *)
* @param fds cast=(GPollFD *)
*/
@@ -12881,7 +13014,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_main_context_query(context, max_priority, timeout_, fds, n_fds);
-@@ -1906,8 +1906,8 @@
+@@ -1906,8 +1906,8 @@ public static final int g_main_context_query(int /*long*/ context, int max_prior
}
}
/** @param context cast=(GMainContext *) */
@@ -12892,7 +13025,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_main_context_release(context);
-@@ -1916,7 +1916,7 @@
+@@ -1916,7 +1916,7 @@ public static final void g_main_context_release(int /*long*/ context) {
}
}
/** @param context cast=(GMainContext *) */
@@ -12901,7 +13034,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
/**
* @param opsysstring cast=(const gchar *)
* @param len cast=(gssize)
-@@ -1924,8 +1924,8 @@
+@@ -1924,8 +1924,8 @@ public static final native void g_main_context_wakeup(int /*long*/ context);
* @param bytes_written cast=(gsize *)
* @param error cast=(GError **)
*/
@@ -12912,7 +13045,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_filename_to_utf8(opsysstring, len, bytes_read, bytes_written, error);
-@@ -1938,8 +1938,8 @@
+@@ -1938,8 +1938,8 @@ public static final int /*long*/ g_filename_to_utf8(int /*long*/ opsysstring, in
* @param hostname cast=(const char *)
* @param error cast=(GError **)
*/
@@ -12923,7 +13056,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_filename_to_uri(filename, hostname, error);
-@@ -1954,8 +1954,8 @@
+@@ -1954,8 +1954,8 @@ public static final int /*long*/ g_filename_to_uri(int /*long*/ filename, int /*
* @param bytes_written cast=(gsize *)
* @param error cast=(GError **)
*/
@@ -12934,7 +13067,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_filename_from_utf8(opsysstring, len, bytes_read, bytes_written, error);
-@@ -1968,8 +1968,8 @@
+@@ -1968,8 +1968,8 @@ public static final int /*long*/ g_filename_from_utf8(int /*long*/ opsysstring,
* @param hostname cast=(char **)
* @param error cast=(GError **)
*/
@@ -12945,7 +13078,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_filename_from_uri(uri, hostname, error);
-@@ -1978,8 +1978,8 @@
+@@ -1978,8 +1978,8 @@ public static final int /*long*/ g_filename_from_uri(int /*long*/ uri, int /*lon
}
}
/** @param mem cast=(gpointer) */
@@ -12956,7 +13089,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_free(mem);
-@@ -1991,8 +1991,8 @@
+@@ -1991,8 +1991,8 @@ public static final void g_free(int /*long*/ mem) {
* @param function cast=(GSourceFunc)
* @param data cast=(gpointer)
*/
@@ -12967,7 +13100,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_idle_add(function, data);
-@@ -2004,8 +2004,8 @@
+@@ -2004,8 +2004,8 @@ public static final int g_idle_add(int /*long*/ function, int /*long*/ data) {
* @param list cast=(GList *)
* @param data cast=(gpointer)
*/
@@ -12978,7 +13111,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_list_append(list, data);
-@@ -2014,8 +2014,8 @@
+@@ -2014,8 +2014,8 @@ public static final int /*long*/ g_list_append(int /*long*/ list, int /*long*/ d
}
}
/** @param list cast=(GList *) */
@@ -12989,7 +13122,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_list_data(list);
-@@ -2024,8 +2024,8 @@
+@@ -2024,8 +2024,8 @@ public static final int /*long*/ g_list_data(int /*long*/ list) {
}
}
/** @param list cast=(GList *) */
@@ -13000,7 +13133,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_list_free(list);
-@@ -2034,8 +2034,8 @@
+@@ -2034,8 +2034,8 @@ public static final void g_list_free(int /*long*/ list) {
}
}
/** @param list cast=(GList *) */
@@ -13011,7 +13144,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_list_free_1(list);
-@@ -2044,8 +2044,8 @@
+@@ -2044,8 +2044,8 @@ public static final void g_list_free_1(int /*long*/ list) {
}
}
/** @param list cast=(GList *) */
@@ -13022,7 +13155,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_list_length(list);
-@@ -2057,8 +2057,8 @@
+@@ -2057,8 +2057,8 @@ public static final int g_list_length(int /*long*/ list) {
* @param list cast=(GList *)
* @param llist cast=(GList *)
*/
@@ -13033,7 +13166,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_list_set_next(list, llist);
-@@ -2066,8 +2066,8 @@
+@@ -2066,8 +2066,8 @@ public static final void g_list_set_next(int /*long*/ list, int /*long*/ llist)
lock.unlock();
}
}
@@ -13044,7 +13177,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_list_next(list);
-@@ -2079,8 +2079,8 @@
+@@ -2079,8 +2079,8 @@ public static final int /*long*/ g_list_next(int /*long*/ list) {
* @param list cast=(GList *)
* @param n cast=(guint)
*/
@@ -13055,7 +13188,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_list_nth(list, n);
-@@ -2092,8 +2092,8 @@
+@@ -2092,8 +2092,8 @@ public static final int /*long*/ g_list_nth(int /*long*/ list, int n) {
* @param list cast=(GList *)
* @param n cast=(guint)
*/
@@ -13066,7 +13199,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_list_nth_data(list, n);
-@@ -2105,8 +2105,8 @@
+@@ -2105,8 +2105,8 @@ public static final int /*long*/ g_list_nth_data(int /*long*/ list, int n) {
* @param list cast=(GList *)
* @param data cast=(gpointer)
*/
@@ -13077,7 +13210,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_list_prepend(list, data);
-@@ -2118,8 +2118,8 @@
+@@ -2118,8 +2118,8 @@ public static final int /*long*/ g_list_prepend(int /*long*/ list, int /*long*/
* @param list cast=(GList *)
* @param llist cast=(GList *)
*/
@@ -13088,7 +13221,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_list_set_previous(list, llist);
-@@ -2127,8 +2127,8 @@
+@@ -2127,8 +2127,8 @@ public static final void g_list_set_previous(int /*long*/ list, int /*long*/ lli
lock.unlock();
}
}
@@ -13099,7 +13232,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_list_previous(list);
-@@ -2140,8 +2140,8 @@
+@@ -2140,8 +2140,8 @@ public static final int /*long*/ g_list_previous(int /*long*/ list) {
* @param list cast=(GList *)
* @param link cast=(GList *)
*/
@@ -13110,7 +13243,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_list_remove_link(list, link);
-@@ -2150,8 +2150,8 @@
+@@ -2150,8 +2150,8 @@ public static final int /*long*/ g_list_remove_link(int /*long*/ list, int /*lon
}
}
/** @param list cast=(GList *) */
@@ -13121,7 +13254,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_list_reverse(list);
-@@ -2166,8 +2166,8 @@
+@@ -2166,8 +2166,8 @@ public static final int /*long*/ g_list_reverse(int /*long*/ list) {
* @param bytes_written cast=(gsize *)
* @param error cast=(GError **)
*/
@@ -13132,7 +13265,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_locale_from_utf8(utf8string, len, bytes_read, bytes_written, error);
-@@ -2182,8 +2182,8 @@
+@@ -2182,8 +2182,8 @@ public static final int /*long*/ g_locale_from_utf8(int /*long*/ utf8string, int
* @param bytes_written cast=(gsize *)
* @param error cast=(GError **)
*/
@@ -13143,7 +13276,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_locale_to_utf8(opsysstring, len, bytes_read, bytes_written, error);
-@@ -2197,8 +2197,8 @@
+@@ -2197,8 +2197,8 @@ public static final int /*long*/ g_locale_to_utf8(int /*long*/ opsysstring, int
* @param message cast=(gchar *)
* @param unused_data cast=(gpointer)
*/
@@ -13154,7 +13287,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_log_default_handler(log_domain, log_levels, message, unused_data);
-@@ -2225,8 +2225,8 @@
+@@ -2225,8 +2225,8 @@ public static final void g_log_remove_handler(byte[] log_domain, int handler_id)
* @param log_func cast=(GLogFunc)
* @param user_data cast=(gpointer)
*/
@@ -13165,7 +13298,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_log_set_handler(log_domain, log_levels, log_func, user_data);
-@@ -2235,8 +2235,8 @@
+@@ -2235,8 +2235,8 @@ public static final int g_log_set_handler(byte[] log_domain, int log_levels, int
}
}
/** @param size cast=(gulong) */
@@ -13176,7 +13309,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_malloc(size);
-@@ -2249,8 +2249,8 @@
+@@ -2249,8 +2249,8 @@ public static final int /*long*/ g_malloc(int /*long*/ size) {
* @param first_property_name cast=(const gchar *),flags=no_out
* @param terminator cast=(const gchar *),flags=sentinel
*/
@@ -13187,7 +13320,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_object_get(object, first_property_name, value, terminator);
-@@ -2262,8 +2262,8 @@
+@@ -2262,8 +2262,8 @@ public static final void g_object_get(int /*long*/ object, byte[] first_property
* @param object cast=(GObject *)
* @param quark cast=(GQuark)
*/
@@ -13198,7 +13331,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_object_get_qdata(object, quark);
-@@ -2275,8 +2275,8 @@
+@@ -2275,8 +2275,8 @@ public static final int /*long*/ g_object_get_qdata(int /*long*/ object, int qua
* @param type cast=(GType)
* @param first_property_name cast=(const gchar *)
*/
@@ -13209,7 +13342,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_object_new(type, first_property_name);
-@@ -2288,8 +2288,8 @@
+@@ -2288,8 +2288,8 @@ public static final int /*long*/ g_object_new (int /*long*/ type, int /*long*/ f
* @param object cast=(GObject *)
* @param property_name cast=(const gchar *)
*/
@@ -13220,7 +13353,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_object_notify(object, property_name);
-@@ -2298,8 +2298,8 @@
+@@ -2298,8 +2298,8 @@ public static final void g_object_notify (int /*long*/ object, byte[] property_n
}
}
/** @param object cast=(gpointer) */
@@ -13231,7 +13364,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_object_ref(object);
-@@ -2312,8 +2312,8 @@
+@@ -2312,8 +2312,8 @@ public static final int /*long*/ g_object_ref(int /*long*/ object) {
* @param first_property_name cast=(const gchar *),flags=no_out
* @param terminator cast=(const gchar *),flags=sentinel
*/
@@ -13242,7 +13375,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2326,8 +2326,8 @@
+@@ -2326,8 +2326,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
* @param first_property_name cast=(const gchar *)
* @param terminator cast=(const gchar *),flags=sentinel
*/
@@ -13253,7 +13386,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2340,8 +2340,8 @@
+@@ -2340,8 +2340,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
* @param first_property_name cast=(const gchar *),flags=no_out
* @param terminator cast=(const gchar *),flags=sentinel
*/
@@ -13264,7 +13397,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2354,8 +2354,8 @@
+@@ -2354,8 +2354,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
* @param first_property_name cast=(const gchar *),flags=no_out
* @param terminator cast=(const gchar *),flags=sentinel
*/
@@ -13275,7 +13408,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2368,8 +2368,8 @@
+@@ -2368,8 +2368,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
* @param first_property_name cast=(const gchar *),flags=no_out
* @param terminator cast=(const gchar *),flags=sentinel
*/
@@ -13286,7 +13419,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2382,8 +2382,8 @@
+@@ -2382,8 +2382,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
* @param quark cast=(GQuark)
* @param data cast=(gpointer)
*/
@@ -13297,7 +13430,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_object_set_qdata(object, quark, data);
-@@ -2392,8 +2392,8 @@
+@@ -2392,8 +2392,8 @@ public static final void g_object_set_qdata(int /*long*/ object, int quark, int
}
}
/** @param object cast=(gpointer) */
@@ -13308,7 +13441,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_object_unref(object);
-@@ -2427,8 +2427,8 @@
+@@ -2427,8 +2427,8 @@ public static final void g_set_prgname(byte[] prgname) {
* @param proc cast=(GCallback)
* @param data cast=(gpointer)
*/
@@ -13319,7 +13452,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_signal_connect(instance, detailed_signal, proc, data);
-@@ -2442,8 +2442,8 @@
+@@ -2442,8 +2442,8 @@ public static final int g_signal_connect(int /*long*/ instance, byte[] detailed_
* @param closure cast=(GClosure *)
* @param after cast=(gboolean)
*/
@@ -13330,7 +13463,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_signal_connect_closure(instance, detailed_signal, closure, after);
-@@ -2458,8 +2458,8 @@
+@@ -2458,8 +2458,8 @@ public static final int g_signal_connect_closure(int /*long*/ instance, byte[] d
* @param closure cast=(GClosure *)
* @param after cast=(gboolean)
*/
@@ -13341,7 +13474,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_signal_connect_closure_by_id(instance, signal_id, detail, closure, after);
-@@ -2473,8 +2473,8 @@
+@@ -2473,8 +2473,8 @@ public static final int g_signal_connect_closure_by_id(int /*long*/ instance, in
* @param proc cast=(GCallback)
* @param data cast=(gpointer)
*/
@@ -13352,7 +13485,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_signal_connect_after(instance, detailed_signal, proc, data);
-@@ -2486,8 +2486,8 @@
+@@ -2486,8 +2486,8 @@ public static final int g_signal_connect_after(int /*long*/ instance, byte[] det
* @param instance cast=(gpointer)
* @param detailed_signal cast=(const gchar *),flags=no_out
*/
@@ -13363,7 +13496,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal);
-@@ -2499,8 +2499,8 @@
+@@ -2499,8 +2499,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
* @param instance cast=(gpointer)
* @param detailed_signal cast=(const gchar *),flags=no_out
*/
@@ -13374,7 +13507,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data);
-@@ -2512,8 +2512,8 @@
+@@ -2512,8 +2512,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
* @param instance cast=(gpointer)
* @param detailed_signal cast=(const gchar *),flags=no_out
*/
@@ -13385,7 +13518,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data1, data2);
-@@ -2525,8 +2525,8 @@
+@@ -2525,8 +2525,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
* @param instance cast=(gpointer)
* @param detailed_signal cast=(const gchar *),flags=no_out
*/
@@ -13396,7 +13529,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data);
-@@ -2538,8 +2538,8 @@
+@@ -2538,8 +2538,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
* @param instance cast=(gpointer)
* @param handler_id cast=(gulong)
*/
@@ -13407,7 +13540,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_signal_handler_disconnect(instance, handler_id);
-@@ -2556,8 +2556,8 @@
+@@ -2556,8 +2556,8 @@ public static final void g_signal_handler_disconnect(int /*long*/ instance, int
* @param func cast=(gpointer)
* @param data cast=(gpointer)
*/
@@ -13418,7 +13551,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_signal_handlers_block_matched(instance, mask, signal_id, detail, closure, func, data);
-@@ -2574,8 +2574,8 @@
+@@ -2574,8 +2574,8 @@ public static final int g_signal_handlers_block_matched(int /*long*/ instance, i
* @param func cast=(gpointer)
* @param data cast=(gpointer)
*/
@@ -13429,7 +13562,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_signal_handlers_disconnect_matched(instance, mask, signal_id, detail, closure, func, data);
-@@ -2592,8 +2592,8 @@
+@@ -2592,8 +2592,8 @@ public static final int g_signal_handlers_disconnect_matched(int /*long*/ instan
* @param func cast=(gpointer)
* @param data cast=(gpointer)
*/
@@ -13440,7 +13573,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_signal_handlers_unblock_matched(instance, mask, signal_id, detail, closure, func, data);
-@@ -2602,8 +2602,8 @@
+@@ -2602,8 +2602,8 @@ public static final int g_signal_handlers_unblock_matched(int /*long*/ instance,
}
}
/** @param name cast=(const gchar *),flags=no_out */
@@ -13451,7 +13584,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_signal_lookup(name, itype);
-@@ -2615,8 +2615,8 @@
+@@ -2615,8 +2615,8 @@ public static final int g_signal_lookup (byte[] name, int /*long*/ itype) {
* @param instance cast=(gpointer)
* @param detailed_signal cast=(const gchar *),flags=no_out
*/
@@ -13462,7 +13595,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_signal_stop_emission_by_name(instance, detailed_signal);
-@@ -2625,8 +2625,8 @@
+@@ -2625,8 +2625,8 @@ public static final void g_signal_stop_emission_by_name(int /*long*/ instance, b
}
}
/** @param tag cast=(guint) */
@@ -13473,7 +13606,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_source_remove(tag);
-@@ -2635,8 +2635,8 @@
+@@ -2635,8 +2635,8 @@ public static final boolean /*long*/ g_source_remove (int /*long*/ tag) {
}
}
/** @param list cast=(GSList *) */
@@ -13484,7 +13617,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_slist_data(list);
-@@ -2645,8 +2645,8 @@
+@@ -2645,8 +2645,8 @@ public static final int /*long*/ g_slist_data (int /*long*/ list) {
}
}
/** @param list cast=(GSList *) */
@@ -13495,7 +13628,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_slist_free(list);
-@@ -2655,8 +2655,8 @@
+@@ -2655,8 +2655,8 @@ public static final void g_slist_free (int /*long*/ list) {
}
}
/** @param list cast=(GSList *) */
@@ -13506,7 +13639,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_slist_next(list);
-@@ -2665,8 +2665,8 @@
+@@ -2665,8 +2665,8 @@ public static final int /*long*/ g_slist_next (int /*long*/ list) {
}
}
/** @param list cast=(GSList *) */
@@ -13517,7 +13650,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_slist_length(list);
-@@ -2675,8 +2675,8 @@
+@@ -2675,8 +2675,8 @@ public static final int g_slist_length (int /*long*/ list) {
}
}
/** @param string_array cast=(gchar **) */
@@ -13528,7 +13661,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_strfreev(string_array);
-@@ -2688,8 +2688,8 @@
+@@ -2688,8 +2688,8 @@ public static final void g_strfreev(int /*long*/ string_array) {
* @param str cast=(const gchar *)
* @param endptr cast=(gchar **)
*/
@@ -13539,7 +13672,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_strtod(str, endptr);
-@@ -2702,8 +2702,8 @@
+@@ -2702,8 +2702,8 @@ public static final double g_strtod(int /*long*/ str, int /*long*/[] endptr) {
* @param interface_type cast=(GType)
* @param info cast=(const GInterfaceInfo *)
*/
@@ -13550,7 +13683,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_type_add_interface_static(instance_type, interface_type, info);
-@@ -2712,8 +2712,8 @@
+@@ -2712,8 +2712,8 @@ public static final void g_type_add_interface_static (int /*long*/ instance_type
}
}
/** @param g_class cast=(GType) */
@@ -13561,7 +13694,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_type_class_peek(g_class);
-@@ -2722,8 +2722,8 @@
+@@ -2722,8 +2722,8 @@ public static final int /*long*/ g_type_class_peek (int /*long*/ g_class) {
}
}
/** @param g_class cast=(gpointer) */
@@ -13572,7 +13705,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_type_class_peek_parent(g_class);
-@@ -2732,8 +2732,8 @@
+@@ -2732,8 +2732,8 @@ public static final int /*long*/ g_type_class_peek_parent (int /*long*/ g_class)
}
}
/** @param g_class cast=(GType) */
@@ -13583,7 +13716,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_type_class_ref(g_class);
-@@ -2742,8 +2742,8 @@
+@@ -2742,8 +2742,8 @@ public static final int /*long*/ g_type_class_ref (int /*long*/ g_class) {
}
}
/** @param g_class cast=(gpointer) */
@@ -13594,7 +13727,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_type_class_unref(g_class);
-@@ -2752,8 +2752,8 @@
+@@ -2752,8 +2752,8 @@ public static final void g_type_class_unref (int /*long*/ g_class) {
}
}
/** @param name cast=(const gchar *) */
@@ -13605,7 +13738,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_type_from_name(name);
-@@ -2762,8 +2762,8 @@
+@@ -2762,8 +2762,8 @@ public static final int /*long*/ g_type_from_name (byte[] name) {
}
}
/** @param iface cast=(gpointer) */
@@ -13616,7 +13749,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_type_interface_peek_parent(iface);
-@@ -2775,8 +2775,8 @@
+@@ -2775,8 +2775,8 @@ public static final int /*long*/ g_type_interface_peek_parent (int /*long*/ ifac
* @param type cast=(GType)
* @param is_a_type cast=(GType)
*/
@@ -13627,7 +13760,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_type_is_a(type, is_a_type);
-@@ -2785,8 +2785,8 @@
+@@ -2785,8 +2785,8 @@ public static final boolean g_type_is_a (int /*long*/ type, int /*long*/ is_a_ty
}
}
/** @param handle cast=(GType) */
@@ -13638,7 +13771,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_type_name(handle);
-@@ -2795,8 +2795,8 @@
+@@ -2795,8 +2795,8 @@ public static final int /*long*/ g_type_name (int /*long*/ handle) {
}
}
/** @param type cast=(GType) */
@@ -13649,7 +13782,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_type_parent(type);
-@@ -2808,8 +2808,8 @@
+@@ -2808,8 +2808,8 @@ public static final int /*long*/ g_type_parent (int /*long*/ type) {
* @param type cast=(GType)
* @param query cast=(GTypeQuery *)
*/
@@ -13660,7 +13793,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_type_query(type, query);
-@@ -2823,8 +2823,8 @@
+@@ -2823,8 +2823,8 @@ public static final void g_type_query (int /*long*/ type, int /*long*/ query) {
* @param info cast=(const GTypeInfo *)
* @param flags cast=(GTypeFlags)
*/
@@ -13671,7 +13804,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_type_register_static(parent_type, type_name, info, flags);
-@@ -2833,8 +2833,8 @@
+@@ -2833,8 +2833,8 @@ public static final int /*long*/ g_type_register_static (int /*long*/ parent_typ
}
}
/** @param vtable cast=(GThreadFunctions *) */
@@ -13682,7 +13815,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_g_thread_init(vtable);
-@@ -2858,8 +2858,8 @@
+@@ -2858,8 +2858,8 @@ public static final boolean g_thread_supported() {
* @param items_written cast=(glong *),flags=critical
* @param error cast=(GError **),flags=critical
*/
@@ -13693,7 +13826,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_utf16_to_utf8(str, len, items_read, items_written, error);
-@@ -2868,8 +2868,8 @@
+@@ -2868,8 +2868,8 @@ public static final int /*long*/ g_utf16_to_utf8(char[] str, int /*long*/ len, i
}
}
/** @param str cast=(const gchar *) */
@@ -13704,7 +13837,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_utf8_offset_to_pointer(str, offset);
-@@ -2881,8 +2881,8 @@
+@@ -2881,8 +2881,8 @@ public static final int /*long*/ g_utf8_offset_to_pointer(int /*long*/ str, int
* @param str cast=(const gchar *)
* @param pos cast=(const gchar *)
*/
@@ -13715,7 +13848,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_utf8_pointer_to_offset(str, pos);
-@@ -2891,8 +2891,8 @@
+@@ -2891,8 +2891,8 @@ public static final int /*long*/ g_utf8_pointer_to_offset(int /*long*/ str, int
}
}
/** @param str cast=(const gchar *) */
@@ -13726,7 +13859,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_utf8_strlen(str, max);
-@@ -2907,8 +2907,8 @@
+@@ -2907,8 +2907,8 @@ public static final int /*long*/ g_utf8_strlen(int /*long*/ str, int /*long*/ ma
* @param items_written cast=(glong *),flags=critical
* @param error cast=(GError **),flags=critical
*/
@@ -13737,7 +13870,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_utf8_to_utf16(str, len, items_read, items_written, error);
-@@ -2923,8 +2923,8 @@
+@@ -2923,8 +2923,8 @@ public static final int /*long*/ g_utf8_to_utf16(byte[] str, int /*long*/ len, i
* @param items_written cast=(glong *),flags=critical
* @param error cast=(GError **),flags=critical
*/
@@ -13748,7 +13881,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_utf8_to_utf16(str, len, items_read, items_written, error);
-@@ -2933,8 +2933,8 @@
+@@ -2933,8 +2933,8 @@ public static final int /*long*/ g_utf8_to_utf16(int /*long*/ str, int /*long*/
}
}
/** @param value cast=(const GValue *) */
@@ -13759,7 +13892,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _g_value_peek_pointer(value);
-@@ -2943,8 +2943,8 @@
+@@ -2943,8 +2943,8 @@ public static final int /*long*/ g_value_peek_pointer (int /*long*/ value) {
}
}
/** @param atom_name cast=(const gchar *),flags=no_out critical */
@@ -13770,7 +13903,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_atom_intern(atom_name, only_if_exists);
-@@ -2953,8 +2953,8 @@
+@@ -2953,8 +2953,8 @@ public static final int /*long*/ gdk_atom_intern(byte[] atom_name, boolean only_
}
}
/** @param atom cast=(GdkAtom) */
@@ -13781,7 +13914,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_atom_name(atom);
-@@ -2977,8 +2977,8 @@
+@@ -2977,8 +2977,8 @@ public static final void gdk_beep() {
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -13792,7 +13925,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_bitmap_create_from_data(window, data, width, height);
-@@ -2987,8 +2987,8 @@
+@@ -2987,8 +2987,8 @@ public static final int /*long*/ gdk_bitmap_create_from_data(int /*long*/ window
}
}
/** @method flags=dynamic */
@@ -13803,7 +13936,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_cairo_create(drawable);
-@@ -2997,8 +2997,8 @@
+@@ -2997,8 +2997,8 @@ public static final int /*long*/ gdk_cairo_create(int /*long*/ drawable) {
}
}
/** @method flags=dynamic */
@@ -13814,7 +13947,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_cairo_region(cairo, region);
-@@ -3007,8 +3007,8 @@
+@@ -3007,8 +3007,8 @@ public static final void gdk_cairo_region(int /*long*/ cairo, int /*long*/ regio
}
}
/** @method flags=dynamic */
@@ -13825,7 +13958,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_cairo_set_source_color(cairo, color);
-@@ -3020,8 +3020,8 @@
+@@ -3020,8 +3020,8 @@ public static final void gdk_cairo_set_source_color(int /*long*/ cairo, GdkColor
* @param colormap cast=(GdkColormap *)
* @param color cast=(GdkColor *),flags=no_in
*/
@@ -13836,7 +13969,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_color_white(colormap, color);
-@@ -3035,8 +3035,8 @@
+@@ -3035,8 +3035,8 @@ public static final boolean gdk_color_white(int /*long*/ colormap, GdkColor colo
* @param writeable cast=(gboolean)
* @param best_match cast=(gboolean)
*/
@@ -13847,7 +13980,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_colormap_alloc_color(colormap, color, writeable, best_match);
-@@ -3049,8 +3049,8 @@
+@@ -3049,8 +3049,8 @@ public static final boolean gdk_colormap_alloc_color(int /*long*/ colormap, GdkC
* @param colors cast=(GdkColor *),flags=no_out
* @param ncolors cast=(gint)
*/
@@ -13858,7 +13991,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_colormap_free_colors(colormap, colors, ncolors);
-@@ -3058,8 +3058,8 @@
+@@ -3058,8 +3058,8 @@ public static final void gdk_colormap_free_colors(int /*long*/ colormap, GdkColo
lock.unlock();
}
}
@@ -13869,7 +14002,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_colormap_get_system();
-@@ -3072,8 +3072,8 @@
+@@ -3072,8 +3072,8 @@ public static final int /*long*/ gdk_colormap_get_system() {
* @param pixel cast=(gulong)
* @param result cast=(GdkColor *)
*/
@@ -13880,7 +14013,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_colormap_query_color(colormap, pixel, result);
-@@ -3082,8 +3082,8 @@
+@@ -3082,8 +3082,8 @@ public static final void gdk_colormap_query_color(int /*long*/ colormap, int /*l
}
}
/** @param cursor cast=(GdkCursor *) */
@@ -13891,7 +14024,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_cursor_destroy(cursor);
-@@ -3092,8 +3092,8 @@
+@@ -3092,8 +3092,8 @@ public static final void gdk_cursor_destroy(int /*long*/ cursor) {
}
}
/** @param cursor_type cast=(GdkCursorType) */
@@ -13902,7 +14035,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_cursor_new(cursor_type);
-@@ -3109,8 +3109,8 @@
+@@ -3109,8 +3109,8 @@ public static final int /*long*/ gdk_cursor_new(int /*long*/ cursor_type) {
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -13913,7 +14046,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_cursor_new_from_pixmap(source, mask, fg, bg, x, y);
-@@ -3119,8 +3119,8 @@
+@@ -3119,8 +3119,8 @@ public static final int /*long*/ gdk_cursor_new_from_pixmap(int /*long*/ source,
}
}
/** @method flags=dynamic */
@@ -13924,7 +14057,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_cursor_new_from_pixbuf(display, pixbuf, x, y);
-@@ -3129,8 +3129,8 @@
+@@ -3129,8 +3129,8 @@ public static final int /*long*/ gdk_cursor_new_from_pixbuf(int /*long*/ display
}
}
/** @method flags=dynamic */
@@ -13935,7 +14068,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_display_get_default();
-@@ -3139,8 +3139,8 @@
+@@ -3139,8 +3139,8 @@ public static final int /*long*/ gdk_display_get_default() {
}
}
/** @method flags=dynamic */
@@ -13946,7 +14079,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_display_supports_cursor_color(display);
-@@ -3153,8 +3153,8 @@
+@@ -3153,8 +3153,8 @@ public static final boolean gdk_display_supports_cursor_color(int /*long*/ displ
* @param action cast=(GdkDragAction)
* @param time cast=(guint32)
*/
@@ -13957,7 +14090,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_drag_status(context, action, time);
-@@ -3173,8 +3173,8 @@
+@@ -3173,8 +3173,8 @@ public static final void gdk_drag_status(int /*long*/ context, int action, int t
* @param angle1 cast=(gint)
* @param angle2 cast=(gint)
*/
@@ -13968,7 +14101,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_draw_arc(drawable, gc, filled, x, y, width, height, angle1, angle2);
-@@ -3193,8 +3193,8 @@
+@@ -3193,8 +3193,8 @@ public static final void gdk_draw_arc(int /*long*/ drawable, int /*long*/ gc, in
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -13979,7 +14112,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_draw_drawable(drawable, gc, src, xsrc, ysrc, xdest, ydest, width, height);
-@@ -3207,8 +3207,8 @@
+@@ -3207,8 +3207,8 @@ public static final void gdk_draw_drawable(int /*long*/ drawable, int /*long*/ g
* @param gc cast=(GdkGC *)
* @param image cast=(GdkImage *)
*/
@@ -13990,7 +14123,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_draw_image(drawable, gc, image, xsrc, ysrc, xdest, ydest, width, height);
-@@ -3223,8 +3223,8 @@
+@@ -3223,8 +3223,8 @@ public static final void gdk_draw_image(int /*long*/ drawable, int /*long*/ gc,
* @param y cast=(gint)
* @param layout cast=(PangoLayout *)
*/
@@ -14001,7 +14134,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_draw_layout(drawable, gc, x, y, layout);
-@@ -3241,8 +3241,8 @@
+@@ -3241,8 +3241,8 @@ public static final void gdk_draw_layout(int /*long*/ drawable, int /*long*/ gc,
* @param foreground flags=no_out
* @param background flags=no_out
*/
@@ -14012,7 +14145,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_draw_layout_with_colors(drawable, gc, x, y, layout, foreground, background);
-@@ -3258,8 +3258,8 @@
+@@ -3258,8 +3258,8 @@ public static final void gdk_draw_layout_with_colors(int /*long*/ drawable, int
* @param x2 cast=(gint)
* @param y2 cast=(gint)
*/
@@ -14023,7 +14156,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_draw_line(drawable, gc, x1, y1, x2, y2);
-@@ -3273,8 +3273,8 @@
+@@ -3273,8 +3273,8 @@ public static final void gdk_draw_line(int /*long*/ drawable, int /*long*/ gc, i
* @param points cast=(GdkPoint *),flags=no_out critical
* @param npoints cast=(gint)
*/
@@ -14034,7 +14167,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_draw_lines(drawable, gc, points, npoints);
-@@ -3297,8 +3297,8 @@
+@@ -3297,8 +3297,8 @@ public static final void gdk_draw_lines(int /*long*/ drawable, int /*long*/ gc,
* @param x_dither cast=(gint)
* @param y_dither cast=(gint)
*/
@@ -14045,7 +14178,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_draw_pixbuf(drawable, gc, pixbuf, xsrc, ysrc, xdest, ydest, width, height, dither, x_dither, y_dither);
-@@ -3310,8 +3310,8 @@
+@@ -3310,8 +3310,8 @@ public static final void gdk_draw_pixbuf(int /*long*/ drawable, int /*long*/ gc,
* @param drawable cast=(GdkDrawable *)
* @param gc cast=(GdkGC *)
*/
@@ -14056,7 +14189,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_draw_point(drawable, gc, x, y);
-@@ -3326,8 +3326,8 @@
+@@ -3326,8 +3326,8 @@ public static final void gdk_draw_point(int /*long*/ drawable, int /*long*/ gc,
* @param points cast=(GdkPoint *),flags=no_out critical
* @param npoints cast=(gint)
*/
@@ -14067,7 +14200,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_draw_polygon(drawable, gc, filled, points, npoints);
-@@ -3344,8 +3344,8 @@
+@@ -3344,8 +3344,8 @@ public static final void gdk_draw_polygon(int /*long*/ drawable, int /*long*/ gc
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -14078,7 +14211,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_draw_rectangle(drawable, gc, filled, x, y, width, height);
-@@ -3354,8 +3354,8 @@
+@@ -3354,8 +3354,8 @@ public static final void gdk_draw_rectangle(int /*long*/ drawable, int /*long*/
}
}
/** @param drawable cast=(GdkDrawable *) */
@@ -14089,7 +14222,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_drawable_get_depth(drawable);
-@@ -3371,8 +3371,8 @@
+@@ -3371,8 +3371,8 @@ public static final int gdk_drawable_get_depth(int /*long*/ drawable) {
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -14100,7 +14233,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_drawable_get_image(drawable, x, y, width, height);
-@@ -3385,8 +3385,8 @@
+@@ -3385,8 +3385,8 @@ public static final int /*long*/ gdk_drawable_get_image(int /*long*/ drawable, i
* @param width cast=(gint *),flags=no_in critical
* @param height cast=(gint *),flags=no_in critical
*/
@@ -14111,7 +14244,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_drawable_get_size(drawable, width, height);
-@@ -3395,8 +3395,8 @@
+@@ -3395,8 +3395,8 @@ public static final void gdk_drawable_get_size(int /*long*/ drawable, int[] widt
}
}
/** @param drawable cast=(GdkDrawable *) */
@@ -14122,7 +14255,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_drawable_get_visible_region(drawable);
-@@ -3405,8 +3405,8 @@
+@@ -3405,8 +3405,8 @@ public static final int /*long*/ gdk_drawable_get_visible_region(int /*long*/ dr
}
}
/** @param event cast=(GdkEvent *) */
@@ -14133,7 +14266,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_event_copy(event);
-@@ -3415,8 +3415,8 @@
+@@ -3415,8 +3415,8 @@ public static final int /*long*/ gdk_event_copy(int /*long*/ event) {
}
}
/** @param event cast=(GdkEvent *) */
@@ -14144,7 +14277,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_event_free(event);
-@@ -3424,8 +3424,8 @@
+@@ -3424,8 +3424,8 @@ public static final void gdk_event_free(int /*long*/ event) {
lock.unlock();
}
}
@@ -14155,7 +14288,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_event_get();
-@@ -3438,8 +3438,8 @@
+@@ -3438,8 +3438,8 @@ public static final int /*long*/ gdk_event_get() {
* @param px cast=(gdouble *)
* @param py cast=(gdouble *)
*/
@@ -14166,7 +14299,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_event_get_root_coords(event, px, py);
-@@ -3452,8 +3452,8 @@
+@@ -3452,8 +3452,8 @@ public static final boolean gdk_event_get_root_coords(int /*long*/ event, double
* @param px cast=(gdouble *)
* @param py cast=(gdouble *)
*/
@@ -14177,7 +14310,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_event_get_coords(event, px, py);
-@@ -3462,8 +3462,8 @@
+@@ -3462,8 +3462,8 @@ public static final boolean gdk_event_get_coords(int /*long*/ event, double[] px
}
}
/** @param window cast=(GdkWindow *) */
@@ -14188,7 +14321,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_event_get_graphics_expose(window);
-@@ -3475,8 +3475,8 @@
+@@ -3475,8 +3475,8 @@ public static final int /*long*/ gdk_event_get_graphics_expose(int /*long*/ wind
* @param event cast=(GdkEvent *)
* @param pmod cast=(GdkModifierType *)
*/
@@ -14199,7 +14332,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_event_get_state(event, pmod);
-@@ -3485,8 +3485,8 @@
+@@ -3485,8 +3485,8 @@ public static final boolean gdk_event_get_state(int /*long*/ event, int[] pmod)
}
}
/** @param event cast=(GdkEvent *) */
@@ -14210,7 +14343,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_event_get_time(event);
-@@ -3499,8 +3499,8 @@
+@@ -3499,8 +3499,8 @@ public static final int gdk_event_get_time(int /*long*/ event) {
* @param data cast=(gpointer)
* @param notify cast=(GDestroyNotify)
*/
@@ -14221,7 +14354,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_event_handler_set(func, data, notify);
-@@ -3508,8 +3508,8 @@
+@@ -3508,8 +3508,8 @@ public static final void gdk_event_handler_set(int /*long*/ func, int /*long*/ d
lock.unlock();
}
}
@@ -14232,7 +14365,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_event_new(type);
-@@ -3517,8 +3517,8 @@
+@@ -3517,8 +3517,8 @@ public static final int /*long*/ gdk_event_new(int type) {
lock.unlock();
}
}
@@ -14243,7 +14376,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_event_peek();
-@@ -3527,8 +3527,8 @@
+@@ -3527,8 +3527,8 @@ public static final int /*long*/ gdk_event_peek() {
}
}
/** @param event cast=(GdkEvent *) */
@@ -14254,7 +14387,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_event_put(event);
-@@ -3564,8 +3564,8 @@
+@@ -3564,8 +3564,8 @@ public static final void gdk_flush() {
}
}
/** @param list cast=(gchar **) */
@@ -14265,7 +14398,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_free_text_list(list);
-@@ -3577,8 +3577,8 @@
+@@ -3577,8 +3577,8 @@ public static final void gdk_free_text_list(int /*long*/ list) {
* @param gc cast=(GdkGC *)
* @param values cast=(GdkGCValues *),flags=no_in
*/
@@ -14276,7 +14409,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_get_values(gc, values);
-@@ -3587,8 +3587,8 @@
+@@ -3587,8 +3587,8 @@ public static final void gdk_gc_get_values(int /*long*/ gc, GdkGCValues values)
}
}
/** @param window cast=(GdkDrawable *) */
@@ -14287,7 +14420,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_gc_new(window);
-@@ -3600,8 +3600,8 @@
+@@ -3600,8 +3600,8 @@ public static final int /*long*/ gdk_gc_new(int /*long*/ window) {
* @param gc cast=(GdkGC *)
* @param color cast=(GdkColor *),flags=no_out
*/
@@ -14298,7 +14431,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_background(gc, color);
-@@ -3613,8 +3613,8 @@
+@@ -3613,8 +3613,8 @@ public static final void gdk_gc_set_background(int /*long*/ gc, GdkColor color)
* @param gc cast=(GdkGC *)
* @param mask cast=(GdkBitmap *)
*/
@@ -14309,7 +14442,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_clip_mask(gc, mask);
-@@ -3627,8 +3627,8 @@
+@@ -3627,8 +3627,8 @@ public static final void gdk_gc_set_clip_mask(int /*long*/ gc, int /*long*/ mask
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -14320,7 +14453,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_clip_origin(gc, x, y);
-@@ -3640,8 +3640,8 @@
+@@ -3640,8 +3640,8 @@ public static final void gdk_gc_set_clip_origin(int /*long*/ gc, int x, int y) {
* @param gc cast=(GdkGC *)
* @param rectangle cast=(GdkRectangle *),flags=no_out
*/
@@ -14331,7 +14464,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_clip_rectangle(gc, rectangle);
-@@ -3653,8 +3653,8 @@
+@@ -3653,8 +3653,8 @@ public static final void gdk_gc_set_clip_rectangle(int /*long*/ gc, GdkRectangle
* @param gc cast=(GdkGC *)
* @param region cast=(GdkRegion *)
*/
@@ -14342,7 +14475,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_clip_region(gc, region);
-@@ -3668,8 +3668,8 @@
+@@ -3668,8 +3668,8 @@ public static final void gdk_gc_set_clip_region(int /*long*/ gc, int /*long*/ re
* @param dash_list cast=(gint8 *),flags=no_out critical
* @param n cast=(gint)
*/
@@ -14353,7 +14486,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_dashes(gc, dash_offset, dash_list, n);
-@@ -3681,8 +3681,8 @@
+@@ -3681,8 +3681,8 @@ public static final void gdk_gc_set_dashes(int /*long*/ gc, int dash_offset, byt
* @param gc cast=(GdkGC *)
* @param exposures cast=(gboolean)
*/
@@ -14364,7 +14497,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_exposures(gc, exposures);
-@@ -3694,8 +3694,8 @@
+@@ -3694,8 +3694,8 @@ public static final void gdk_gc_set_exposures(int /*long*/ gc, boolean exposures
* @param gc cast=(GdkGC *)
* @param fill cast=(GdkFill)
*/
@@ -14375,7 +14508,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_fill(gc, fill);
-@@ -3707,8 +3707,8 @@
+@@ -3707,8 +3707,8 @@ public static final void gdk_gc_set_fill(int /*long*/ gc, int fill) {
* @param gc cast=(GdkGC *)
* @param color cast=(GdkColor *),flags=no_out
*/
@@ -14386,7 +14519,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_foreground(gc, color);
-@@ -3720,8 +3720,8 @@
+@@ -3720,8 +3720,8 @@ public static final void gdk_gc_set_foreground(int /*long*/ gc, GdkColor color)
* @param gc cast=(GdkGC *)
* @param function cast=(GdkFunction)
*/
@@ -14397,7 +14530,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_function(gc, function);
-@@ -3736,8 +3736,8 @@
+@@ -3736,8 +3736,8 @@ public static final void gdk_gc_set_function(int /*long*/ gc, int /*long*/ funct
* @param cap_style cast=(GdkCapStyle)
* @param join_style cast=(GdkJoinStyle)
*/
@@ -14408,7 +14541,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_line_attributes(gc, line_width, line_style, cap_style, join_style);
-@@ -3749,8 +3749,8 @@
+@@ -3749,8 +3749,8 @@ public static final void gdk_gc_set_line_attributes(int /*long*/ gc, int line_wi
* @param gc cast=(GdkGC *)
* @param stipple cast=(GdkPixmap *)
*/
@@ -14419,7 +14552,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_stipple(gc, stipple);
-@@ -3762,8 +3762,8 @@
+@@ -3762,8 +3762,8 @@ public static final void gdk_gc_set_stipple(int /*long*/ gc, int /*long*/ stippl
* @param gc cast=(GdkGC *)
* @param mode cast=(GdkSubwindowMode)
*/
@@ -14430,7 +14563,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_subwindow(gc, mode);
-@@ -3775,8 +3775,8 @@
+@@ -3775,8 +3775,8 @@ public static final void gdk_gc_set_subwindow(int /*long*/ gc, int /*long*/ mode
* @param gc cast=(GdkGC *)
* @param tile cast=(GdkPixmap *)
*/
@@ -14441,7 +14574,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_tile(gc, tile);
-@@ -3785,8 +3785,8 @@
+@@ -3785,8 +3785,8 @@ public static final void gdk_gc_set_tile(int /*long*/ gc, int /*long*/ tile) {
}
}
/** @param gc cast=(GdkGC *) */
@@ -14452,7 +14585,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_ts_origin(gc, x, y);
-@@ -3799,8 +3799,8 @@
+@@ -3799,8 +3799,8 @@ public static final void gdk_gc_set_ts_origin(int /*long*/ gc, int x, int y) {
* @param values cast=(GdkGCValues *),flags=no_out
* @param values_mask cast=(GdkGCValuesMask)
*/
@@ -14463,7 +14596,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_gc_set_values(gc, values, values_mask);
-@@ -3817,8 +3817,8 @@
+@@ -3817,8 +3817,8 @@ public static final void gdk_keyboard_ungrab(int time) {
lock.unlock();
}
}
@@ -14474,7 +14607,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_keymap_get_default();
-@@ -3834,8 +3834,8 @@
+@@ -3834,8 +3834,8 @@ public static final int /*long*/ gdk_keymap_get_default() {
* @param level cast=(gint*)
* @param consumed_modifiers cast=(GdkModifierType *)
*/
@@ -14485,7 +14618,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_keymap_translate_keyboard_state(keymap, hardware_keycode, state, group, keyval, effective_group, level, consumed_modifiers);
-@@ -3861,8 +3861,8 @@
+@@ -3861,8 +3861,8 @@ public static final int gdk_keyval_to_unicode(int keyval) {
lock.unlock();
}
}
@@ -14496,7 +14629,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pango_context_get();
-@@ -3874,8 +3874,8 @@
+@@ -3874,8 +3874,8 @@ public static final int /*long*/ gdk_pango_context_get() {
* @param context cast=(PangoContext *)
* @param colormap cast=(GdkColormap *)
*/
@@ -14507,7 +14640,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_pango_context_set_colormap(context, colormap);
-@@ -3884,8 +3884,8 @@
+@@ -3884,8 +3884,8 @@ public static final void gdk_pango_context_set_colormap(int /*long*/ context, in
}
}
/** @param layout cast=(PangoLayout *) */
@@ -14518,7 +14651,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pango_layout_get_clip_region(layout, x_origin, y_origin, index_ranges, n_ranges);
-@@ -3897,8 +3897,8 @@
+@@ -3897,8 +3897,8 @@ public static final int /*long*/ gdk_pango_layout_get_clip_region(int /*long*/ l
* @param src_pixbuf cast=(GdkPixbuf *)
* @param dest_pixbuf cast=(GdkPixbuf *)
*/
@@ -14529,7 +14662,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_pixbuf_copy_area(src_pixbuf, src_x, src_y, width, height, dest_pixbuf, dest_x, dest_y);
-@@ -3911,8 +3911,8 @@
+@@ -3911,8 +3911,8 @@ public static final void gdk_pixbuf_copy_area(int /*long*/ src_pixbuf, int src_x
* @param src cast=(GdkDrawable *)
* @param cmap cast=(GdkColormap *)
*/
@@ -14540,7 +14673,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_get_from_drawable(dest, src, cmap, src_x, src_y, dest_x, dest_y, width, height);
-@@ -3921,8 +3921,8 @@
+@@ -3921,8 +3921,8 @@ public static final int /*long*/ gdk_pixbuf_get_from_drawable(int /*long*/ dest,
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -14551,7 +14684,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_get_has_alpha(pixbuf);
-@@ -3931,8 +3931,8 @@
+@@ -3931,8 +3931,8 @@ public static final boolean gdk_pixbuf_get_has_alpha(int /*long*/ pixbuf) {
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -14562,7 +14695,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_get_height(pixbuf);
-@@ -3941,8 +3941,8 @@
+@@ -3941,8 +3941,8 @@ public static final int gdk_pixbuf_get_height(int /*long*/ pixbuf) {
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -14573,7 +14706,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_get_pixels(pixbuf);
-@@ -3951,8 +3951,8 @@
+@@ -3951,8 +3951,8 @@ public static final int /*long*/ gdk_pixbuf_get_pixels(int /*long*/ pixbuf) {
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -14584,7 +14717,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_get_rowstride(pixbuf);
-@@ -3961,8 +3961,8 @@
+@@ -3961,8 +3961,8 @@ public static final int gdk_pixbuf_get_rowstride(int /*long*/ pixbuf) {
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -14595,7 +14728,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_get_width(pixbuf);
-@@ -3970,8 +3970,8 @@
+@@ -3970,8 +3970,8 @@ public static final int gdk_pixbuf_get_width(int /*long*/ pixbuf) {
lock.unlock();
}
}
@@ -14606,7 +14739,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_loader_new();
-@@ -3983,8 +3983,8 @@
+@@ -3983,8 +3983,8 @@ public static final int /*long*/ gdk_pixbuf_loader_new() {
* @param loader cast=(GdkPixbufLoader *)
* @param error cast=(GError **)
*/
@@ -14617,7 +14750,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_loader_close(loader, error);
-@@ -3993,8 +3993,8 @@
+@@ -3993,8 +3993,8 @@ public static final boolean gdk_pixbuf_loader_close(int /*long*/ loader, int /*l
}
}
/** @param loader cast=(GdkPixbufLoader *) */
@@ -14628,7 +14761,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_loader_get_pixbuf(loader);
-@@ -4008,8 +4008,8 @@
+@@ -4008,8 +4008,8 @@ public static final int /*long*/ gdk_pixbuf_loader_get_pixbuf(int /*long*/ loade
* @param count cast=(gsize)
* @param error cast=(GError **)
*/
@@ -14639,7 +14772,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_loader_write(loader, buffer, count, error);
-@@ -4021,8 +4021,8 @@
+@@ -4021,8 +4021,8 @@ public static final boolean gdk_pixbuf_loader_write(int /*long*/ loader, int /*l
* @param colorspace cast=(GdkColorspace)
* @param has_alpha cast=(gboolean)
*/
@@ -14650,7 +14783,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_new(colorspace, has_alpha, bits_per_sample, width, height);
-@@ -4034,8 +4034,8 @@
+@@ -4034,8 +4034,8 @@ public static final int /*long*/ gdk_pixbuf_new(int colorspace, boolean has_alph
* @param filename cast=(const char *)
* @param error cast=(GError**)
*/
@@ -14661,7 +14794,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_new_from_file(filename, error);
-@@ -4049,8 +4049,8 @@
+@@ -4049,8 +4049,8 @@ public static final int /*long*/ gdk_pixbuf_new_from_file(byte[] filename, int /
* @param gc cast=(GdkGC *)
* @param dither cast=(GdkRgbDither)
*/
@@ -14672,7 +14805,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_pixbuf_render_to_drawable(pixbuf, drawable, gc, src_x, src_y, dest_x, dest_y, width, height, dither, x_dither, y_dither);
-@@ -4064,8 +4064,8 @@
+@@ -4064,8 +4064,8 @@ public static final void gdk_pixbuf_render_to_drawable(int /*long*/ pixbuf, int
* @param alpha_mode cast=(GdkPixbufAlphaMode)
* @param dither cast=(GdkRgbDither)
*/
@@ -14683,7 +14816,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_pixbuf_render_to_drawable_alpha(pixbuf, drawable, src_x, src_y, dest_x, dest_y, width, height, alpha_mode, alpha_threshold, dither, x_dither, y_dither);
-@@ -4078,8 +4078,8 @@
+@@ -4078,8 +4078,8 @@ public static final void gdk_pixbuf_render_to_drawable_alpha(int /*long*/ pixbuf
* @param pixmap_return cast=(GdkDrawable **)
* @param mask_return cast=(GdkBitmap **)
*/
@@ -14694,7 +14827,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap_return, mask_return, alpha_threshold);
-@@ -4097,8 +4097,8 @@
+@@ -4097,8 +4097,8 @@ public static final void gdk_pixbuf_render_pixmap_and_mask(int /*long*/ pixbuf,
* @param option_values=(char **)
* @param error cast=(GError **)
*/
@@ -14705,7 +14838,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_save_to_bufferv(pixbuf, buffer, buffer_size, type, option_keys, option_values, error);
-@@ -4114,8 +4114,8 @@
+@@ -4114,8 +4114,8 @@ public static final boolean gdk_pixbuf_save_to_bufferv(int /*long*/ pixbuf, int
* @param scale_x cast=(double)
* @param scale_y cast=(double)
*/
@@ -14716,7 +14849,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_pixbuf_scale(src, dest, dest_x, dest_y, dest_width, dest_height, offset_x, offset_y, scale_x, scale_y, interp_type);
-@@ -4127,8 +4127,8 @@
+@@ -4127,8 +4127,8 @@ public static final void gdk_pixbuf_scale(int /*long*/ src, int /*long*/ dest, i
* @param src cast=(const GdkPixbuf *)
* @param interp_type cast=(GdkInterpType)
*/
@@ -14727,7 +14860,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixbuf_scale_simple(src, dest_width, dest_height, interp_type);
-@@ -4142,8 +4142,8 @@
+@@ -4142,8 +4142,8 @@ public static final int /*long*/ gdk_pixbuf_scale_simple(int /*long*/ src, int d
* @param height cast=(gint)
* @param depth cast=(gint)
*/
@@ -14738,7 +14871,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pixmap_new(window, width, height, depth);
-@@ -4159,8 +4159,8 @@
+@@ -4159,8 +4159,8 @@ public static final int /*long*/ gdk_pixmap_new(int /*long*/ window, int width,
* @param cursor cast=(GdkCursor *)
* @param time cast=(guint32)
*/
@@ -14749,7 +14882,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_pointer_grab(window, owner_events, event_mask, confine_to, cursor, time);
-@@ -4196,8 +4196,8 @@
+@@ -4196,8 +4196,8 @@ public static final void gdk_pointer_ungrab(int time) {
* @param actual_length cast=(gint *)
* @param data cast=(guchar **)
*/
@@ -14760,7 +14893,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_property_get(window, property, type, offset, length, pdelete, actual_property_type, actual_format, actual_length, data);
-@@ -4206,8 +4206,8 @@
+@@ -4206,8 +4206,8 @@ public static final boolean gdk_property_get(int /*long*/ window, int /*long*/ p
}
}
/** @param region cast=(GdkRegion *) */
@@ -14771,7 +14904,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_region_destroy(region);
-@@ -4216,8 +4216,8 @@
+@@ -4216,8 +4216,8 @@ public static final void gdk_region_destroy(int /*long*/ region) {
}
}
/** @param region cast=(GdkRegion *) */
@@ -14782,7 +14915,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_region_empty(region);
-@@ -4229,8 +4229,8 @@
+@@ -4229,8 +4229,8 @@ public static final boolean gdk_region_empty(int /*long*/ region) {
* @param region cast=(GdkRegion *)
* @param rectangle cast=(GdkRectangle *),flags=no_in
*/
@@ -14793,7 +14926,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_region_get_clipbox(region, rectangle);
-@@ -4243,8 +4243,8 @@
+@@ -4243,8 +4243,8 @@ public static final void gdk_region_get_clipbox(int /*long*/ region, GdkRectangl
* @param rectangles cast=(GdkRectangle **)
* @param n_rectangles cast=(gint *)
*/
@@ -14804,7 +14937,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_region_get_rectangles(region, rectangles, n_rectangles);
-@@ -4256,8 +4256,8 @@
+@@ -4256,8 +4256,8 @@ public static final void gdk_region_get_rectangles(int /*long*/ region, int /*lo
* @param source1 cast=(GdkRegion *)
* @param source2 cast=(GdkRegion *)
*/
@@ -14815,7 +14948,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_region_intersect(source1, source2);
-@@ -4265,8 +4265,8 @@
+@@ -4265,8 +4265,8 @@ public static final void gdk_region_intersect(int /*long*/ source1, int /*long*/
lock.unlock();
}
}
@@ -14826,7 +14959,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_region_new();
-@@ -4279,8 +4279,8 @@
+@@ -4279,8 +4279,8 @@ public static final int /*long*/ gdk_region_new() {
* @param dx cast=(gint)
* @param dy cast=(gint)
*/
@@ -14837,7 +14970,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_region_offset(region, dx, dy);
-@@ -4293,8 +4293,8 @@
+@@ -4293,8 +4293,8 @@ public static final void gdk_region_offset(int /*long*/ region, int dx, int dy)
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -14848,7 +14981,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_region_point_in(region, x, y);
-@@ -4306,8 +4306,8 @@
+@@ -4306,8 +4306,8 @@ public static final boolean gdk_region_point_in(int /*long*/ region, int x, int
* @param points cast=(GdkPoint *)
* @param fill_rule cast=(GdkFillRule)
*/
@@ -14859,7 +14992,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_region_polygon(points, npoints, fill_rule);
-@@ -4316,8 +4316,8 @@
+@@ -4316,8 +4316,8 @@ public static final int /*long*/ gdk_region_polygon(int[] points, int npoints, i
}
}
/** @param rectangle flags=no_out */
@@ -14870,7 +15003,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_region_rectangle(rectangle);
-@@ -4329,8 +4329,8 @@
+@@ -4329,8 +4329,8 @@ public static final int /*long*/ gdk_region_rectangle(GdkRectangle rectangle) {
* @param region cast=(GdkRegion *)
* @param rect cast=(GdkRectangle *),flags=no_out
*/
@@ -14881,7 +15014,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_region_rect_in(region, rect);
-@@ -4342,8 +4342,8 @@
+@@ -4342,8 +4342,8 @@ public static final int /*long*/ gdk_region_rect_in(int /*long*/ region, GdkRect
* @param source1 cast=(GdkRegion *)
* @param source2 cast=(GdkRegion *)
*/
@@ -14892,7 +15025,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_region_subtract(source1, source2);
-@@ -4355,8 +4355,8 @@
+@@ -4355,8 +4355,8 @@ public static final void gdk_region_subtract(int /*long*/ source1, int /*long*/
* @param source1 cast=(GdkRegion *)
* @param source2 cast=(GdkRegion *)
*/
@@ -14903,7 +15036,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_region_union(source1, source2);
-@@ -4368,8 +4368,8 @@
+@@ -4368,8 +4368,8 @@ public static final void gdk_region_union(int /*long*/ source1, int /*long*/ sou
* @param region cast=(GdkRegion *)
* @param rect cast=(GdkRectangle *),flags=no_out
*/
@@ -14914,7 +15047,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_region_union_with_rect(region, rect);
-@@ -4387,8 +4387,8 @@
+@@ -4387,8 +4387,8 @@ public static final void gdk_rgb_init() {
}
}
/** @method flags=dynamic */
@@ -14925,7 +15058,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_screen_get_default();
-@@ -4402,8 +4402,8 @@
+@@ -4402,8 +4402,8 @@ public static final int /*long*/ gdk_screen_get_default() {
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -14936,7 +15069,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_screen_get_monitor_at_point (screen, x, y);
-@@ -4416,8 +4416,8 @@
+@@ -4416,8 +4416,8 @@ public static final int gdk_screen_get_monitor_at_point (int /*long*/ screen, in
* @param screen cast=(GdkScreen *)
* @param window cast=(GdkWindow *)
*/
@@ -14947,7 +15080,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_screen_get_monitor_at_window(screen, window);
-@@ -4430,8 +4430,8 @@
+@@ -4430,8 +4430,8 @@ public static final int gdk_screen_get_monitor_at_window(int /*long*/ screen, in
* @param screen cast=(GdkScreen *)
* @param dest flags=no_in
*/
@@ -14958,7 +15091,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_screen_get_monitor_geometry(screen, monitor_num, dest);
-@@ -4443,8 +4443,8 @@
+@@ -4443,8 +4443,8 @@ public static final void gdk_screen_get_monitor_geometry (int /*long*/ screen, i
* @method flags=dynamic
* @param screen cast=(GdkScreen *)
*/
@@ -14969,7 +15102,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_screen_get_n_monitors(screen);
-@@ -4456,8 +4456,8 @@
+@@ -4456,8 +4456,8 @@ public static final int gdk_screen_get_n_monitors(int /*long*/ screen) {
* @method flags=dynamic
* @param screen cast=(GdkScreen *)
*/
@@ -14980,7 +15113,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_screen_get_number(screen);
-@@ -4509,8 +4509,8 @@
+@@ -4509,8 +4509,8 @@ public static final void gdk_set_program_class(byte[] program_class) {
* @param ctext cast=(guchar **)
* @param length cast=(gint *)
*/
@@ -14991,7 +15124,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_utf8_to_compound_text(str, encoding, format, ctext, length);
-@@ -4519,8 +4519,8 @@
+@@ -4519,8 +4519,8 @@ public static final boolean gdk_utf8_to_compound_text(byte[] str, int /*long*/[]
}
}
/** @param str cast=(const gchar *) */
@@ -15002,7 +15135,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_utf8_to_string_target(str);
-@@ -4533,8 +4533,8 @@
+@@ -4533,8 +4533,8 @@ public static final int /*long*/ gdk_utf8_to_string_target(byte[] str) {
* @param text cast=(guchar *)
* @param list cast=(gchar ***)
*/
@@ -15013,7 +15146,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_text_property_to_utf8_list(encoding, format, text, length, list);
-@@ -4546,8 +4546,8 @@
+@@ -4546,8 +4546,8 @@ public static final int gdk_text_property_to_utf8_list (int /*long*/ encoding,
* @method flags=dynamic
* @param display cast=(GdkDisplay*)
*/
@@ -15024,7 +15157,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tooltip_trigger_tooltip_query (display);
-@@ -4565,8 +4565,8 @@
+@@ -4565,8 +4565,8 @@ public static final int gdk_unicode_to_keyval(int wc) {
lock.unlock();
}
}
@@ -15035,7 +15168,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_visual_get_system();
-@@ -4578,8 +4578,8 @@
+@@ -4578,8 +4578,8 @@ public static final int /*long*/ gdk_visual_get_system() {
* @param win_x cast=(gint *)
* @param win_y cast=(gint *)
*/
@@ -15046,7 +15179,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_window_at_pointer(win_x, win_y);
-@@ -4591,8 +4591,8 @@
+@@ -4591,8 +4591,8 @@ public static final int /*long*/ gdk_window_at_pointer(int[] win_x, int[] win_y)
* @param window cast=(GdkWindow *)
* @param rectangle cast=(GdkRectangle *),flags=no_out
*/
@@ -15057,7 +15190,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_begin_paint_rect(window, rectangle);
-@@ -4601,8 +4601,8 @@
+@@ -4601,8 +4601,8 @@ public static final void gdk_window_begin_paint_rect(int /*long*/ window, GdkRec
}
}
/** @param window cast=(GdkWindow *) */
@@ -15068,7 +15201,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_clear_area(window, x, y, width, height);
-@@ -4611,8 +4611,8 @@
+@@ -4611,8 +4611,8 @@ public static final void gdk_window_clear_area(int /*long*/ window, int x, int y
}
}
/** @param window cast=(GdkWindow *) */
@@ -15079,7 +15212,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_destroy(window);
-@@ -4621,8 +4621,8 @@
+@@ -4621,8 +4621,8 @@ public static final void gdk_window_destroy(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -15090,7 +15223,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_end_paint(window);
-@@ -4631,8 +4631,8 @@
+@@ -4631,8 +4631,8 @@ public static final void gdk_window_end_paint(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -15101,7 +15234,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_window_get_children(window);
-@@ -4641,8 +4641,8 @@
+@@ -4641,8 +4641,8 @@ public static final int /*long*/ gdk_window_get_children(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -15112,7 +15245,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_window_get_events(window);
-@@ -4651,8 +4651,8 @@
+@@ -4651,8 +4651,8 @@ public static final int gdk_window_get_events(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -15123,7 +15256,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_focus(window, timestamp);
-@@ -4661,8 +4661,8 @@
+@@ -4661,8 +4661,8 @@ public static final void gdk_window_focus(int /*long*/ window, int timestamp) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -15134,7 +15267,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_freeze_updates(window);
-@@ -4674,8 +4674,8 @@
+@@ -4674,8 +4674,8 @@ public static final void gdk_window_freeze_updates(int /*long*/ window) {
* @param window cast=(GdkWindow *)
* @param rect cast=(GdkRectangle *),flags=no_in
*/
@@ -15145,7 +15278,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_get_frame_extents(window, rect);
-@@ -4689,8 +4689,8 @@
+@@ -4689,8 +4689,8 @@ public static final void gdk_window_get_frame_extents(int /*long*/ window, GdkRe
* @param x_offset cast=(gint *)
* @param y_offset cast=(gint *)
*/
@@ -15156,7 +15289,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_get_internal_paint_info(window, real_drawable, x_offset, y_offset);
-@@ -4703,8 +4703,8 @@
+@@ -4703,8 +4703,8 @@ public static final void gdk_window_get_internal_paint_info(int /*long*/ window,
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
@@ -15167,7 +15300,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_window_get_origin(window, x, y);
-@@ -4713,8 +4713,8 @@
+@@ -4713,8 +4713,8 @@ public static final int gdk_window_get_origin(int /*long*/ window, int[] x, int[
}
}
/** @param window cast=(GdkWindow *) */
@@ -15178,7 +15311,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_window_get_parent(window);
-@@ -4728,8 +4728,8 @@
+@@ -4728,8 +4728,8 @@ public static final int /*long*/ gdk_window_get_parent(int /*long*/ window) {
* @param y cast=(gint *)
* @param mask cast=(GdkModifierType *)
*/
@@ -15189,7 +15322,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_window_get_pointer(window, x, y, mask);
-@@ -4742,8 +4742,8 @@
+@@ -4742,8 +4742,8 @@ public static final int /*long*/ gdk_window_get_pointer(int /*long*/ window, int
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
@@ -15200,7 +15333,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_get_position(window, x, y);
-@@ -4755,8 +4755,8 @@
+@@ -4755,8 +4755,8 @@ public static final void gdk_window_get_position(int /*long*/ window, int[] x, i
* @param window cast=(GdkWindow *)
* @param data cast=(gpointer *)
*/
@@ -15211,7 +15344,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_get_user_data(window, data);
-@@ -4765,8 +4765,8 @@
+@@ -4765,8 +4765,8 @@ public static final void gdk_window_get_user_data(int /*long*/ window, int /*lon
}
}
/** @param window cast=(GdkWindow *) */
@@ -15222,7 +15355,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_hide(window);
-@@ -4779,8 +4779,8 @@
+@@ -4779,8 +4779,8 @@ public static final void gdk_window_hide(int /*long*/ window) {
* @param rectangle cast=(GdkRectangle *),flags=no_out
* @param invalidate_children cast=(gboolean)
*/
@@ -15233,7 +15366,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_invalidate_rect(window, rectangle, invalidate_children);
-@@ -4793,8 +4793,8 @@
+@@ -4793,8 +4793,8 @@ public static final void gdk_window_invalidate_rect(int /*long*/ window, GdkRect
* @param region cast=(GdkRegion *)
* @param invalidate_children cast=(gboolean)
*/
@@ -15244,7 +15377,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_invalidate_region(window, region, invalidate_children);
-@@ -4803,8 +4803,8 @@
+@@ -4803,8 +4803,8 @@ public static final void gdk_window_invalidate_region(int /*long*/ window, int /
}
}
/** @param window cast=(GdkWindow *) */
@@ -15255,7 +15388,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_window_is_visible(window);
-@@ -4813,8 +4813,8 @@
+@@ -4813,8 +4813,8 @@ public static final boolean gdk_window_is_visible(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -15266,7 +15399,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_move(window, x, y);
-@@ -4826,8 +4826,8 @@
+@@ -4826,8 +4826,8 @@ public static final void gdk_window_move(int /*long*/ window, int x, int y) {
* @param parent cast=(GdkWindow *)
* @param attributes flags=no_out
*/
@@ -15277,7 +15410,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gdk_window_new(parent, attributes, attributes_mask);
-@@ -4836,8 +4836,8 @@
+@@ -4836,8 +4836,8 @@ public static final int /*long*/ gdk_window_new(int /*long*/ parent, GdkWindowAt
}
}
/** @param window cast=(GdkWindow *) */
@@ -15288,7 +15421,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_lower(window);
-@@ -4858,8 +4858,8 @@
+@@ -4858,8 +4858,8 @@ public static final void gdk_window_process_all_updates() {
* @param window cast=(GdkWindow *)
* @param update_children cast=(gboolean)
*/
@@ -15299,7 +15432,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_process_updates(window, update_children);
-@@ -4868,8 +4868,8 @@
+@@ -4868,8 +4868,8 @@ public static final void gdk_window_process_updates(int /*long*/ window, boolean
}
}
/** @param window cast=(GdkWindow *) */
@@ -15310,7 +15443,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_raise(window);
-@@ -4878,8 +4878,8 @@
+@@ -4878,8 +4878,8 @@ public static final void gdk_window_raise(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -15321,7 +15454,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_resize(window, width, height);
-@@ -4888,8 +4888,8 @@
+@@ -4888,8 +4888,8 @@ public static final void gdk_window_resize(int /*long*/ window, int width, int h
}
}
/** @param window cast=(GdkWindow *) */
@@ -15332,7 +15465,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_scroll(window, dx, dy);
-@@ -4902,8 +4902,8 @@
+@@ -4902,8 +4902,8 @@ public static final void gdk_window_scroll(int /*long*/ window, int dx, int dy)
* @param window cast=(GdkWindow *)
* @param accept_focus cast=(gboolean)
*/
@@ -15343,7 +15476,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_set_accept_focus(window, accept_focus);
-@@ -4916,8 +4916,8 @@
+@@ -4916,8 +4916,8 @@ public static final void gdk_window_set_accept_focus(int /*long*/ window, boolea
* @param pixmap cast=(GdkPixmap *)
* @param parent_relative cast=(gboolean)
*/
@@ -15354,7 +15487,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_set_back_pixmap(window, pixmap, parent_relative);
-@@ -4929,8 +4929,8 @@
+@@ -4929,8 +4929,8 @@ public static final void gdk_window_set_back_pixmap(int /*long*/ window, int /*l
* @param window cast=(GdkWindow *)
* @param cursor cast=(GdkCursor *)
*/
@@ -15365,7 +15498,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_set_cursor(window, cursor);
-@@ -4952,8 +4952,8 @@
+@@ -4952,8 +4952,8 @@ public static final void gdk_window_set_debug_updates(boolean setting) {
* @param window cast=(GdkWindow *)
* @param decorations cast=(GdkWMDecoration)
*/
@@ -15376,7 +15509,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_set_decorations(window, decorations);
-@@ -4962,8 +4962,8 @@
+@@ -4962,8 +4962,8 @@ public static final void gdk_window_set_decorations(int /*long*/ window, int dec
}
}
/** @param window cast=(GdkWindow *) */
@@ -15387,7 +15520,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_set_events(window, event_mask);
-@@ -4977,8 +4977,8 @@
+@@ -4977,8 +4977,8 @@ public static final void gdk_window_set_events(int /*long*/ window, int event_ma
* @param pixmap cast=(GdkPixmap *)
* @param mask cast=(GdkBitmap *)
*/
@@ -15398,7 +15531,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_set_icon(window, icon_window, pixmap, mask);
-@@ -4990,8 +4990,8 @@
+@@ -4990,8 +4990,8 @@ public static final void gdk_window_set_icon(int /*long*/ window, int /*long*/ i
* @param window cast=(GdkWindow *)
* @param pixbufs cast=(GList *)
*/
@@ -15409,7 +15542,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_set_icon_list(window, pixbufs);
-@@ -5004,8 +5004,8 @@
+@@ -5004,8 +5004,8 @@ public static final void gdk_window_set_icon_list(int /*long*/ window, int /*lon
* @param window cast=(GdkWindow *)
* @param setting cast=(gboolean)
*/
@@ -15420,7 +15553,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_set_keep_above(window, setting);
-@@ -5017,8 +5017,8 @@
+@@ -5017,8 +5017,8 @@ public static final void gdk_window_set_keep_above(int /*long*/ window, boolean
* @param window cast=(GdkWindow *)
* @param override_redirect cast=(gboolean)
*/
@@ -15431,7 +15564,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_set_override_redirect(window, override_redirect);
-@@ -5030,8 +5030,8 @@
+@@ -5030,8 +5030,8 @@ public static final void gdk_window_set_override_redirect(int /*long*/ window, b
* @param window cast=(GdkWindow *)
* @param user_data cast=(gpointer)
*/
@@ -15442,7 +15575,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_set_user_data(window, user_data);
-@@ -5043,8 +5043,8 @@
+@@ -5043,8 +5043,8 @@ public static final void gdk_window_set_user_data(int /*long*/ window, int /*lon
* @param window cast=(GdkWindow *)
* @param shape_region cast=(GdkRegion *)
*/
@@ -15453,7 +15586,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_shape_combine_region(window, shape_region, offset_x, offset_y);
-@@ -5053,8 +5053,8 @@
+@@ -5053,8 +5053,8 @@ public static final void gdk_window_shape_combine_region (int /*long*/ window, i
}
}
/** @param window cast=(GdkWindow *) */
@@ -15464,7 +15597,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_show(window);
-@@ -5063,8 +5063,8 @@
+@@ -5063,8 +5063,8 @@ public static final void gdk_window_show(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -15475,7 +15608,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_show_unraised(window);
-@@ -5073,8 +5073,8 @@
+@@ -5073,8 +5073,8 @@ public static final void gdk_window_show_unraised(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -15486,7 +15619,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gdk_window_thaw_updates(window);
-@@ -5082,8 +5082,8 @@
+@@ -5082,8 +5082,8 @@ public static final void gdk_window_thaw_updates(int /*long*/ window) {
lock.unlock();
}
}
@@ -15497,7 +15630,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_accel_group_new();
-@@ -5096,8 +5096,8 @@
+@@ -5096,8 +5096,8 @@ public static final int /*long*/ gtk_accel_group_new() {
* @param accelKey cast=(guint)
* @param accelMods cast=(GdkModifierType)
*/
@@ -15508,7 +15641,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_accel_groups_activate(accelGroup, accelKey, accelMods);
-@@ -5109,8 +5109,8 @@
+@@ -5109,8 +5109,8 @@ public static final boolean gtk_accel_groups_activate(int /*long*/ accelGroup, i
* @param accel_label cast=(GtkAccelLabel *)
* @param accel_widget cast=(GtkWidget *)
*/
@@ -15519,7 +15652,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_accel_label_set_accel_widget(accel_label, accel_widget);
-@@ -5119,8 +5119,8 @@
+@@ -5119,8 +5119,8 @@ public static final void gtk_accel_label_set_accel_widget(int /*long*/ accel_lab
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -15530,7 +15663,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_adjustment_changed(adjustment);
-@@ -5135,8 +5135,8 @@
+@@ -5135,8 +5135,8 @@ public static final void gtk_adjustment_changed(int /*long*/ adjustment) {
* @param step_increment cast=(gdouble)
* @param page_increment cast=(gdouble)
*/
@@ -15541,7 +15674,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_adjustment_new(value, lower, upper, step_increment, page_increment, page_size);
-@@ -5148,8 +5148,8 @@
+@@ -5148,8 +5148,8 @@ public static final int /*long*/ gtk_adjustment_new(double value, double lower,
* @param adjustment cast=(GtkAdjustment *)
* @param value cast=(gdouble)
*/
@@ -15552,7 +15685,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_adjustment_set_value(adjustment, value);
-@@ -5158,8 +5158,8 @@
+@@ -5158,8 +5158,8 @@ public static final void gtk_adjustment_set_value(int /*long*/ adjustment, doubl
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -15563,7 +15696,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_adjustment_value_changed(adjustment);
-@@ -5171,8 +5171,8 @@
+@@ -5171,8 +5171,8 @@ public static final void gtk_adjustment_value_changed(int /*long*/ adjustment) {
* @param arrow_type cast=(GtkArrowType)
* @param shadow_type cast=(GtkShadowType)
*/
@@ -15574,7 +15707,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_arrow_new(arrow_type, shadow_type);
-@@ -5185,8 +5185,8 @@
+@@ -5185,8 +5185,8 @@ public static final int /*long*/ gtk_arrow_new(int arrow_type, int shadow_type)
* @param arrow_type cast=(GtkArrowType)
* @param shadow_type cast=(GtkShadowType)
*/
@@ -15585,7 +15718,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_arrow_set(arrow, arrow_type, shadow_type);
-@@ -5195,8 +5195,8 @@
+@@ -5195,8 +5195,8 @@ public static final void gtk_arrow_set(int /*long*/ arrow, int arrow_type, int s
}
}
/** @param bin cast=(GtkBin *) */
@@ -15596,7 +15729,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_bin_get_child(bin);
-@@ -5205,8 +5205,8 @@
+@@ -5205,8 +5205,8 @@ public static final int /*long*/ gtk_bin_get_child(int /*long*/ bin) {
}
}
/** @param border cast=(GtkBorder *) */
@@ -15607,7 +15740,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_border_free(border);
-@@ -5215,8 +5215,8 @@
+@@ -5215,8 +5215,8 @@ public static final void gtk_border_free(int /*long*/ border) {
}
}
/** @param box cast=(GtkBox *) */
@@ -15618,7 +15751,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_box_set_spacing(box, spacing);
-@@ -5228,8 +5228,8 @@
+@@ -5228,8 +5228,8 @@ public static final void gtk_box_set_spacing(int /*long*/ box, int spacing) {
* @param box cast=(GtkBox *)
* @param child cast=(GtkWidget *)
*/
@@ -15629,7 +15762,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_box_set_child_packing(box, child, expand, fill, padding, pack_type);
-@@ -5238,8 +5238,8 @@
+@@ -5238,8 +5238,8 @@ public static final void gtk_box_set_child_packing(int /*long*/ box, int /*long*
}
}
/** @param button cast=(GtkButton *) */
@@ -15640,7 +15773,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_button_clicked(button);
-@@ -5248,8 +5248,8 @@
+@@ -5248,8 +5248,8 @@ public static final void gtk_button_clicked(int /*long*/ button) {
}
}
/** @param button cast=(GtkButton *) */
@@ -15651,7 +15784,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_button_get_relief(button);
-@@ -5257,8 +5257,8 @@
+@@ -5257,8 +5257,8 @@ public static final int gtk_button_get_relief(int /*long*/ button) {
lock.unlock();
}
}
@@ -15662,7 +15795,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_button_new();
-@@ -5270,8 +5270,8 @@
+@@ -5270,8 +5270,8 @@ public static final int /*long*/ gtk_button_new() {
* @param button cast=(GtkButton *)
* @param newstyle cast=(GtkReliefStyle)
*/
@@ -15673,7 +15806,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_button_set_relief(button, newstyle);
-@@ -5280,8 +5280,8 @@
+@@ -5280,8 +5280,8 @@ public static final void gtk_button_set_relief(int /*long*/ button, int newstyle
}
}
/** @method flags=dynamic */
@@ -15684,7 +15817,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_calendar_new();
-@@ -5295,8 +5295,8 @@
+@@ -5295,8 +5295,8 @@ public static final int /*long*/ gtk_calendar_new() {
* @param month cast=(guint)
* @param year cast=(guint)
*/
@@ -15695,7 +15828,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_calendar_select_month(calendar, month, year);
-@@ -5309,8 +5309,8 @@
+@@ -5309,8 +5309,8 @@ public static final boolean /*long*/ gtk_calendar_select_month(int /*long*/ cale
* @param calendar cast=(GtkCalendar *)
* @param day cast=(guint)
*/
@@ -15706,7 +15839,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_calendar_select_day(calendar, day);
-@@ -5323,8 +5323,8 @@
+@@ -5323,8 +5323,8 @@ public static final void gtk_calendar_select_day(int /*long*/ calendar, int day)
* @param calendar cast=(GtkCalendar *)
* @param flags cast=(GtkCalendarDisplayOptions)
*/
@@ -15717,7 +15850,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_calendar_set_display_options(calendar, flags);
-@@ -5337,8 +5337,8 @@
+@@ -5337,8 +5337,8 @@ public static final void gtk_calendar_set_display_options(int /*long*/ calendar,
* @param calendar cast=(GtkCalendar *)
* @param flags cast=(GtkCalendarDisplayOptions)
*/
@@ -15728,7 +15861,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_calendar_display_options(calendar, flags);
-@@ -5353,8 +5353,8 @@
+@@ -5353,8 +5353,8 @@ public static final void gtk_calendar_display_options(int /*long*/ calendar, int
* @param month cast=(guint *)
* @param day cast=(guint *)
*/
@@ -15739,7 +15872,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_calendar_get_date(calendar, year, month, day);
-@@ -5363,8 +5363,8 @@
+@@ -5363,8 +5363,8 @@ public static final void gtk_calendar_get_date(int /*long*/ calendar, int[] year
}
}
/** @method flags=dynamic */
@@ -15750,7 +15883,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_cell_layout_clear(cell_layout);
-@@ -5373,8 +5373,8 @@
+@@ -5373,8 +5373,8 @@ public static final void gtk_cell_layout_clear(int /*long*/ cell_layout) {
}
}
/** @method flags=no_gen */
@@ -15761,7 +15894,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_cell_layout_set_attributes(cell_layout, cell, attribute, column, sentinel);
-@@ -5383,8 +5383,8 @@
+@@ -5383,8 +5383,8 @@ public static final void gtk_cell_layout_set_attributes(int /*long*/ cell_layout
}
}
/** @method flags=dynamic */
@@ -15772,7 +15905,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_cell_layout_pack_start(cell_layout, cell, expand);
-@@ -5401,8 +5401,8 @@
+@@ -5401,8 +5401,8 @@ public static final void gtk_cell_layout_pack_start(int /*long*/ cell_layout, in
* @param width cast=(gint *)
* @param height cast=(gint *)
*/
@@ -15783,7 +15916,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_cell_renderer_get_size(cell, widget, area, x_offset, y_offset, width, height);
-@@ -5410,8 +5410,8 @@
+@@ -5410,8 +5410,8 @@ public static final void gtk_cell_renderer_get_size(int /*long*/ cell, int /*lon
lock.unlock();
}
}
@@ -15794,7 +15927,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_cell_renderer_pixbuf_new();
-@@ -5419,8 +5419,8 @@
+@@ -5419,8 +5419,8 @@ public static final int /*long*/ gtk_cell_renderer_pixbuf_new() {
lock.unlock();
}
}
@@ -15805,7 +15938,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_cell_renderer_text_new();
-@@ -5428,8 +5428,8 @@
+@@ -5428,8 +5428,8 @@ public static final int /*long*/ gtk_cell_renderer_text_new() {
lock.unlock();
}
}
@@ -15816,7 +15949,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_cell_renderer_toggle_new();
-@@ -5437,8 +5437,8 @@
+@@ -5437,8 +5437,8 @@ public static final int /*long*/ gtk_cell_renderer_toggle_new() {
lock.unlock();
}
}
@@ -15827,7 +15960,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_check_button_new();
-@@ -5447,8 +5447,8 @@
+@@ -5447,8 +5447,8 @@ public static final int /*long*/ gtk_check_button_new() {
}
}
/** @param check_menu_item cast=(GtkCheckMenuItem *) */
@@ -15838,7 +15971,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_check_menu_item_get_active(check_menu_item);
-@@ -5457,8 +5457,8 @@
+@@ -5457,8 +5457,8 @@ public static final boolean gtk_check_menu_item_get_active(int /*long*/ check_me
}
}
/** @param label cast=(const gchar *) */
@@ -15849,7 +15982,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_check_menu_item_new_with_label(label);
-@@ -5470,8 +5470,8 @@
+@@ -5470,8 +5470,8 @@ public static final int /*long*/ gtk_check_menu_item_new_with_label(byte[] label
* @param wid cast=(GtkCheckMenuItem *)
* @param active cast=(gboolean)
*/
@@ -15860,7 +15993,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_check_menu_item_set_active(wid, active);
-@@ -5479,8 +5479,8 @@
+@@ -5479,8 +5479,8 @@ public static final void gtk_check_menu_item_set_active(int /*long*/ wid, boolea
lock.unlock();
}
}
@@ -15871,7 +16004,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_check_version(required_major, required_minor, required_micro);
-@@ -5489,8 +5489,8 @@
+@@ -5489,8 +5489,8 @@ public static final int /*long*/ gtk_check_version(int required_major, int requi
}
}
/** @param clipboard cast=(GtkClipboard *) */
@@ -15882,7 +16015,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_clipboard_clear(clipboard);
-@@ -5499,8 +5499,8 @@
+@@ -5499,8 +5499,8 @@ public static final void gtk_clipboard_clear(int /*long*/ clipboard) {
}
}
/** @param selection cast=(GdkAtom) */
@@ -15893,7 +16026,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_clipboard_get(selection);
-@@ -5516,8 +5516,8 @@
+@@ -5516,8 +5516,8 @@ public static final int /*long*/ gtk_clipboard_get(int /*long*/ selection) {
* @param clear_func cast=(GtkClipboardClearFunc)
* @param user_data cast=(GObject *)
*/
@@ -15904,7 +16037,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_clipboard_set_with_data(clipboard, target, n_targets, get_func, clear_func, user_data);
-@@ -5529,8 +5529,8 @@
+@@ -5529,8 +5529,8 @@ public static final boolean gtk_clipboard_set_with_data(int /*long*/ clipboard,
* @param clipboard cast=(GtkClipboard *)
* @param target cast=(GdkAtom)
*/
@@ -15915,7 +16048,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_clipboard_wait_for_contents(clipboard, target);
-@@ -5539,8 +5539,8 @@
+@@ -5539,8 +5539,8 @@ public static final int /*long*/ gtk_clipboard_wait_for_contents(int /*long*/ cl
}
}
/** @param title cast=(const gchar *) */
@@ -15926,7 +16059,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_color_selection_dialog_new(title);
-@@ -5552,8 +5552,8 @@
+@@ -5552,8 +5552,8 @@ public static final int /*long*/ gtk_color_selection_dialog_new(byte[] title) {
* @param colorsel cast=(GtkColorSelection *)
* @param color cast=(GdkColor *),flags=no_in
*/
@@ -15937,7 +16070,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_color_selection_get_current_color(colorsel, color);
-@@ -5565,8 +5565,8 @@
+@@ -5565,8 +5565,8 @@ public static final void gtk_color_selection_get_current_color(int /*long*/ colo
* @param colorsel cast=(GtkColorSelection *)
* @param color cast=(GdkColor *),flags=no_out
*/
@@ -15948,7 +16081,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_color_selection_set_current_color(colorsel, color);
-@@ -5575,8 +5575,8 @@
+@@ -5575,8 +5575,8 @@ public static final void gtk_color_selection_set_current_color(int /*long*/ colo
}
}
/** @param colorsel cast=(GtkColorSelection *) */
@@ -15959,7 +16092,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_color_selection_set_has_palette(colorsel, has_palette);
-@@ -5585,8 +5585,8 @@
+@@ -5585,8 +5585,8 @@ public static final void gtk_color_selection_set_has_palette(int /*long*/ colors
}
}
/** @param combo cast=(GtkCombo *) */
@@ -15970,7 +16103,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_combo_disable_activate(combo);
-@@ -5594,8 +5594,8 @@
+@@ -5594,8 +5594,8 @@ public static final void gtk_combo_disable_activate(int /*long*/ combo) {
lock.unlock();
}
}
@@ -15981,7 +16114,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_combo_new();
-@@ -5607,8 +5607,8 @@
+@@ -5607,8 +5607,8 @@ public static final int /*long*/ gtk_combo_new() {
* @param combo cast=(GtkCombo *)
* @param val cast=(gboolean)
*/
@@ -15992,7 +16125,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_combo_set_case_sensitive(combo, val);
-@@ -5617,8 +5617,8 @@
+@@ -5617,8 +5617,8 @@ public static final void gtk_combo_set_case_sensitive(int /*long*/ combo, boolea
}
}
/** @method flags=dynamic */
@@ -16003,7 +16136,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_combo_box_set_focus_on_click(combo, val);
-@@ -5630,8 +5630,8 @@
+@@ -5630,8 +5630,8 @@ public static final void gtk_combo_box_set_focus_on_click(int /*long*/ combo, bo
* @param combo cast=(GtkCombo *)
* @param strings cast=(GList *)
*/
@@ -16014,7 +16147,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_combo_set_popdown_strings(combo, strings);
-@@ -5640,8 +5640,8 @@
+@@ -5640,8 +5640,8 @@ public static final void gtk_combo_set_popdown_strings(int /*long*/ combo, int /
}
}
/** @method flags=dynamic */
@@ -16025,7 +16158,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_combo_box_entry_new_text();
-@@ -5650,8 +5650,8 @@
+@@ -5650,8 +5650,8 @@ public static final int /*long*/ gtk_combo_box_entry_new_text() {
}
}
/** @method flags=dynamic */
@@ -16036,7 +16169,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_combo_box_new_text();
-@@ -5660,8 +5660,8 @@
+@@ -5660,8 +5660,8 @@ public static final int /*long*/ gtk_combo_box_new_text() {
}
}
/** @method flags=dynamic */
@@ -16047,7 +16180,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_combo_box_insert_text(combo_box, position, text);
-@@ -5670,8 +5670,8 @@
+@@ -5670,8 +5670,8 @@ public static final void gtk_combo_box_insert_text(int /*long*/ combo_box, int p
}
}
/** @method flags=dynamic */
@@ -16058,7 +16191,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_combo_box_remove_text(combo_box, position);
-@@ -5680,8 +5680,8 @@
+@@ -5680,8 +5680,8 @@ public static final void gtk_combo_box_remove_text(int /*long*/ combo_box, int p
}
}
/** @method flags=dynamic */
@@ -16069,7 +16202,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_combo_box_get_active(combo_box);
-@@ -5690,8 +5690,8 @@
+@@ -5690,8 +5690,8 @@ public static final int gtk_combo_box_get_active(int /*long*/ combo_box) {
}
}
/** @method flags=dynamic */
@@ -16080,7 +16213,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_combo_box_get_model(combo_box);
-@@ -5700,8 +5700,8 @@
+@@ -5700,8 +5700,8 @@ public static final int /*long*/ gtk_combo_box_get_model(int /*long*/ combo_box)
}
}
/** @method flags=dynamic */
@@ -16091,7 +16224,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_combo_box_set_active(combo_box, index);
-@@ -5710,8 +5710,8 @@
+@@ -5710,8 +5710,8 @@ public static final void gtk_combo_box_set_active(int /*long*/ combo_box, int in
}
}
/** @method flags=dynamic */
@@ -16102,7 +16235,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_combo_box_popup(combo_box);
-@@ -5720,8 +5720,8 @@
+@@ -5720,8 +5720,8 @@ public static final void gtk_combo_box_popup(int /*long*/ combo_box) {
}
}
/** @method flags=dynamic */
@@ -16113,7 +16246,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_combo_box_popdown(combo_box);
-@@ -5733,8 +5733,8 @@
+@@ -5733,8 +5733,8 @@ public static final void gtk_combo_box_popdown(int /*long*/ combo_box) {
* @param container cast=(GtkContainer *)
* @param widget cast=(GtkWidget *)
*/
@@ -16124,7 +16257,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_container_add(container, widget);
-@@ -5747,8 +5747,8 @@
+@@ -5747,8 +5747,8 @@ public static final void gtk_container_add(int /*long*/ container, int /*long*/
* @param callback cast=(GtkCallback)
* @param callback_data cast=(gpointer)
*/
@@ -16135,7 +16268,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_container_forall(container, callback, callback_data);
-@@ -5757,8 +5757,8 @@
+@@ -5757,8 +5757,8 @@ public static final void gtk_container_forall(int /*long*/ container, int /*long
}
}
/** @param container cast=(GtkContainer *) */
@@ -16146,7 +16279,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_container_get_border_width(container);
-@@ -5767,8 +5767,8 @@
+@@ -5767,8 +5767,8 @@ public static final int gtk_container_get_border_width(int /*long*/ container) {
}
}
/** @param container cast=(GtkContainer *) */
@@ -16157,7 +16290,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_container_get_children(container);
-@@ -5780,8 +5780,8 @@
+@@ -5780,8 +5780,8 @@ public static final int /*long*/ gtk_container_get_children(int /*long*/ contain
* @param container cast=(GtkContainer *)
* @param widget cast=(GtkWidget *)
*/
@@ -16168,7 +16301,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_container_remove(container, widget);
-@@ -5790,8 +5790,8 @@
+@@ -5790,8 +5790,8 @@ public static final void gtk_container_remove(int /*long*/ container, int /*long
}
}
/** @param container cast=(GtkContainer *) */
@@ -16179,7 +16312,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_container_resize_children(container);
-@@ -5803,8 +5803,8 @@
+@@ -5803,8 +5803,8 @@ public static final void gtk_container_resize_children(int /*long*/ container) {
* @param container cast=(GtkContainer *)
* @param border_width cast=(guint)
*/
@@ -16190,7 +16323,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_container_set_border_width(container, border_width);
-@@ -5817,8 +5817,8 @@
+@@ -5817,8 +5817,8 @@ public static final void gtk_container_set_border_width(int /*long*/ container,
* @param button_text cast=(const gchar *)
* @param response_id cast=(gint)
*/
@@ -16201,7 +16334,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_dialog_add_button(dialog, button_text, response_id);
-@@ -5827,8 +5827,8 @@
+@@ -5827,8 +5827,8 @@ public static final int /*long*/ gtk_dialog_add_button(int /*long*/ dialog, byte
}
}
/** @param dialog cast=(GtkDialog *) */
@@ -16212,7 +16345,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_dialog_run(dialog);
-@@ -5843,8 +5843,8 @@
+@@ -5843,8 +5843,8 @@ public static final int gtk_dialog_run(int /*long*/ dialog) {
* @param button cast=(gint)
* @param event cast=(GdkEvent *)
*/
@@ -16223,7 +16356,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_drag_begin(widget, targets, actions, button, event);
-@@ -5859,8 +5859,8 @@
+@@ -5859,8 +5859,8 @@ public static final int /*long*/ gtk_drag_begin(int /*long*/ widget, int /*long*
* @param current_x cast=(gint)
* @param current_y cast=(gint)
*/
@@ -16234,7 +16367,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_drag_check_threshold(widget, start_x, start_y, current_x, current_y);
-@@ -5873,8 +5873,8 @@
+@@ -5873,8 +5873,8 @@ public static final boolean gtk_drag_check_threshold(int /*long*/ widget, int st
* @param context cast=(GdkDragContext *)
* @param target_list cast=(GtkTargetList *)
*/
@@ -16245,7 +16378,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_drag_dest_find_target(widget, context, target_list);
-@@ -5889,8 +5889,8 @@
+@@ -5889,8 +5889,8 @@ public static final int /*long*/ gtk_drag_dest_find_target(int /*long*/ widget,
* @param n_targets cast=(gint)
* @param actions cast=(GdkDragAction)
*/
@@ -16256,7 +16389,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_drag_dest_set(widget, flags, targets, n_targets, actions);
-@@ -5899,8 +5899,8 @@
+@@ -5899,8 +5899,8 @@ public static final void gtk_drag_dest_set(int /*long*/ widget, int flags, int /
}
}
/** @param widget cast=(GtkWidget *) */
@@ -16267,7 +16400,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_drag_dest_unset(widget);
-@@ -5914,8 +5914,8 @@
+@@ -5914,8 +5914,8 @@ public static final void gtk_drag_dest_unset(int /*long*/ widget) {
* @param delete cast=(gboolean)
* @param time cast=(guint32)
*/
@@ -16278,7 +16411,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_drag_finish(context, success, delete, time);
-@@ -5929,8 +5929,8 @@
+@@ -5929,8 +5929,8 @@ public static final void gtk_drag_finish(int /*long*/ context, boolean success,
* @param target cast=(GdkAtom)
* @param time cast=(guint32)
*/
@@ -16289,7 +16422,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_drag_get_data(widget, context, target, time);
-@@ -5942,8 +5942,8 @@
+@@ -5942,8 +5942,8 @@ public static final void gtk_drag_get_data(int /*long*/ widget, int /*long*/ con
* @param context cast=(GdkDragContext *)
* @param pixbuf cast=(GdkPixbuf *)
*/
@@ -16300,7 +16433,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_drag_set_icon_pixbuf(context, pixbuf, hot_x, hot_y);
-@@ -5951,8 +5951,8 @@
+@@ -5951,8 +5951,8 @@ public static final void gtk_drag_set_icon_pixbuf(int /*long*/ context, int /*lo
lock.unlock();
}
}
@@ -16311,7 +16444,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_drawing_area_new();
-@@ -5961,8 +5961,8 @@
+@@ -5961,8 +5961,8 @@ public static final int /*long*/ gtk_drawing_area_new() {
}
}
/** @param editable cast=(GtkEditable *) */
@@ -16322,7 +16455,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_editable_copy_clipboard(editable);
-@@ -5971,8 +5971,8 @@
+@@ -5971,8 +5971,8 @@ public static final void gtk_editable_copy_clipboard(int /*long*/ editable) {
}
}
/** @param editable cast=(GtkEditable *) */
@@ -16333,7 +16466,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_editable_cut_clipboard(editable);
-@@ -5981,8 +5981,8 @@
+@@ -5981,8 +5981,8 @@ public static final void gtk_editable_cut_clipboard(int /*long*/ editable) {
}
}
/** @param editable cast=(GtkEditable *) */
@@ -16344,7 +16477,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_editable_delete_selection(editable);
-@@ -5995,8 +5995,8 @@
+@@ -5995,8 +5995,8 @@ public static final void gtk_editable_delete_selection(int /*long*/ editable) {
* @param start_pos cast=(gint)
* @param end_pos cast=(gint)
*/
@@ -16355,7 +16488,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_editable_delete_text(editable, start_pos, end_pos);
-@@ -6009,8 +6009,8 @@
+@@ -6009,8 +6009,8 @@ public static final void gtk_editable_delete_text(int /*long*/ editable, int sta
* @param start_pos cast=(gint)
* @param end_pos cast=(gint)
*/
@@ -16366,7 +16499,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_editable_get_chars(editable, start_pos, end_pos);
-@@ -6019,8 +6019,8 @@
+@@ -6019,8 +6019,8 @@ public static final int /*long*/ gtk_editable_get_chars(int /*long*/ editable, i
}
}
/** @param editable cast=(GtkEditable *) */
@@ -16377,7 +16510,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_editable_get_editable(editable);
-@@ -6029,8 +6029,8 @@
+@@ -6029,8 +6029,8 @@ public static final boolean gtk_editable_get_editable(int /*long*/ editable) {
}
}
/** @param editable cast=(GtkEditable *) */
@@ -16388,7 +16521,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_editable_get_position(editable);
-@@ -6043,8 +6043,8 @@
+@@ -6043,8 +6043,8 @@ public static final int gtk_editable_get_position(int /*long*/ editable) {
* @param start cast=(gint *)
* @param end cast=(gint *)
*/
@@ -16399,7 +16532,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_editable_get_selection_bounds(editable, start, end);
-@@ -6058,8 +6058,8 @@
+@@ -6058,8 +6058,8 @@ public static final boolean gtk_editable_get_selection_bounds(int /*long*/ edita
* @param new_text_length cast=(gint)
* @param position cast=(gint *)
*/
@@ -16410,7 +16543,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_editable_insert_text(editable, new_text, new_text_length, position);
-@@ -6068,8 +6068,8 @@
+@@ -6068,8 +6068,8 @@ public static final void gtk_editable_insert_text(int /*long*/ editable, byte[]
}
}
/** @param editable cast=(GtkEditable *) */
@@ -16421,7 +16554,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_editable_paste_clipboard(editable);
-@@ -6082,8 +6082,8 @@
+@@ -6082,8 +6082,8 @@ public static final void gtk_editable_paste_clipboard(int /*long*/ editable) {
* @param start cast=(gint)
* @param end cast=(gint)
*/
@@ -16432,7 +16565,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_editable_select_region(editable, start, end);
-@@ -6095,8 +6095,8 @@
+@@ -6095,8 +6095,8 @@ public static final void gtk_editable_select_region(int /*long*/ editable, int s
* @param entry cast=(GtkEditable *)
* @param editable cast=(gboolean)
*/
@@ -16443,7 +16576,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_editable_set_editable(entry, editable);
-@@ -6108,8 +6108,8 @@
+@@ -6108,8 +6108,8 @@ public static final void gtk_editable_set_editable(int /*long*/ entry, boolean e
* @param editable cast=(GtkEditable *)
* @param position cast=(gint)
*/
@@ -16454,7 +16587,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_editable_set_position(editable, position);
-@@ -6118,8 +6118,8 @@
+@@ -6118,8 +6118,8 @@ public static final void gtk_editable_set_position(int /*long*/ editable, int po
}
}
/** @method flags=dynamic */
@@ -16465,7 +16598,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_entry_get_inner_border(entry);
-@@ -6128,8 +6128,8 @@
+@@ -6128,8 +6128,8 @@ public static final int /*long*/ gtk_entry_get_inner_border (int /*long*/ entry)
}
}
/** @param entry cast=(GtkEntry *) */
@@ -16476,7 +16609,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_entry_get_invisible_char(entry);
-@@ -6138,8 +6138,8 @@
+@@ -6138,8 +6138,8 @@ public static final char gtk_entry_get_invisible_char(int /*long*/ entry) {
}
}
/** @param entry cast=(GtkEntry *) */
@@ -16487,7 +16620,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_entry_get_layout(entry);
-@@ -6148,8 +6148,8 @@
+@@ -6148,8 +6148,8 @@ public static final int /*long*/ gtk_entry_get_layout (int /*long*/ entry) {
}
}
/** @param entry cast=(GtkEntry *) */
@@ -16498,7 +16631,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_entry_get_layout_offsets(entry, x, y);
-@@ -6158,8 +6158,8 @@
+@@ -6158,8 +6158,8 @@ public static final void gtk_entry_get_layout_offsets (int /*long*/ entry, int[]
}
}
/** @method flags=dynamic */
@@ -16509,7 +16642,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_entry_text_index_to_layout_index(entry, index);
-@@ -6168,8 +6168,8 @@
+@@ -6168,8 +6168,8 @@ public static final int gtk_entry_text_index_to_layout_index (int /*long*/ entry
}
}
/** @param entry cast=(GtkEntry *) */
@@ -16520,7 +16653,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_entry_get_max_length(entry);
-@@ -6178,8 +6178,8 @@
+@@ -6178,8 +6178,8 @@ public static final int gtk_entry_get_max_length(int /*long*/ entry) {
}
}
/** @param entry cast=(GtkEntry *) */
@@ -16531,7 +16664,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_entry_get_text(entry);
-@@ -6188,8 +6188,8 @@
+@@ -6188,8 +6188,8 @@ public static final int /*long*/ gtk_entry_get_text(int /*long*/ entry) {
}
}
/** @method flags=dynamic */
@@ -16542,7 +16675,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _FcConfigAppFontAddFile(config, file);
-@@ -6198,8 +6198,8 @@
+@@ -6198,8 +6198,8 @@ public static final boolean FcConfigAppFontAddFile(int /*long*/ config, byte[] f
}
}
/** @param entry cast=(GtkEntry *) */
@@ -16553,7 +16686,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_entry_get_visibility(entry);
-@@ -6207,8 +6207,8 @@
+@@ -6207,8 +6207,8 @@ public static final boolean gtk_entry_get_visibility(int /*long*/ entry) {
lock.unlock();
}
}
@@ -16564,7 +16697,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_entry_new();
-@@ -6220,8 +6220,8 @@
+@@ -6220,8 +6220,8 @@ public static final int /*long*/ gtk_entry_new() {
* @param entry cast=(GtkEntry *)
* @param setting cast=(gboolean)
*/
@@ -16575,7 +16708,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_entry_set_activates_default(entry, setting);
-@@ -6234,8 +6234,8 @@
+@@ -6234,8 +6234,8 @@ public static final void gtk_entry_set_activates_default(int /*long*/ entry, boo
* @param entry cast=(GtkEntry *)
* @param xalign cast=(gfloat)
*/
@@ -16586,7 +16719,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_entry_set_alignment(entry, xalign);
-@@ -6247,8 +6247,8 @@
+@@ -6247,8 +6247,8 @@ public static final void gtk_entry_set_alignment(int /*long*/ entry, float xalig
* @param entry cast=(GtkEntry *)
* @param setting cast=(gboolean)
*/
@@ -16597,7 +16730,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_entry_set_has_frame(entry, setting);
-@@ -6260,8 +6260,8 @@
+@@ -6260,8 +6260,8 @@ public static final void gtk_entry_set_has_frame(int /*long*/ entry, boolean set
* @param entry cast=(GtkEntry *)
* @param ch cast=(gint)
*/
@@ -16608,7 +16741,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_entry_set_invisible_char(entry, ch);
-@@ -6273,8 +6273,8 @@
+@@ -6273,8 +6273,8 @@ public static final void gtk_entry_set_invisible_char(int /*long*/ entry, char c
* @param entry cast=(GtkEntry *)
* @param max cast=(gint)
*/
@@ -16619,7 +16752,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_entry_set_max_length(entry, max);
-@@ -6286,8 +6286,8 @@
+@@ -6286,8 +6286,8 @@ public static final void gtk_entry_set_max_length(int /*long*/ entry, int max) {
* @param entry cast=(GtkEntry *)
* @param text cast=(const gchar *)
*/
@@ -16630,7 +16763,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_entry_set_text(entry, text);
-@@ -6299,8 +6299,8 @@
+@@ -6299,8 +6299,8 @@ public static final void gtk_entry_set_text(int /*long*/ entry, byte[] text) {
* @param entry cast=(GtkEntry *)
* @param visible cast=(gboolean)
*/
@@ -16641,7 +16774,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_entry_set_visibility(entry, visible);
-@@ -6318,8 +6318,8 @@
+@@ -6318,8 +6318,8 @@ public static final int gtk_events_pending() {
}
}
/** @method flags=dynamic */
@@ -16652,7 +16785,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_expander_get_expanded(expander);
-@@ -6328,8 +6328,8 @@
+@@ -6328,8 +6328,8 @@ public static final boolean gtk_expander_get_expanded(int /*long*/ expander) {
}
}
/** @method flags=dynamic */
@@ -16663,7 +16796,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_expander_get_label_widget(expander);
-@@ -6341,8 +6341,8 @@
+@@ -6341,8 +6341,8 @@ public static final int /*long*/ gtk_expander_get_label_widget(int /*long*/ expa
* @method flags=dynamic
* @param label cast=(const gchar *)
*/
@@ -16674,7 +16807,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_expander_new(label);
-@@ -6351,8 +6351,8 @@
+@@ -6351,8 +6351,8 @@ public static final int /*long*/ gtk_expander_new(byte[] label) {
}
}
/** @method flags=dynamic */
@@ -16685,7 +16818,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_expander_set_expanded(expander, expanded);
-@@ -6364,8 +6364,8 @@
+@@ -6364,8 +6364,8 @@ public static final void gtk_expander_set_expanded(int /*long*/ expander, boolea
* @method flags=dynamic
* @param label cast=(const gchar *)
*/
@@ -16696,7 +16829,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_expander_set_label(expander, label);
-@@ -6374,8 +6374,8 @@
+@@ -6374,8 +6374,8 @@ public static final void gtk_expander_set_label(int /*long*/ expander, byte[] la
}
}
/** @method flags=dynamic */
@@ -16707,7 +16840,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_expander_set_label_widget(expander, label_widget);
-@@ -6384,8 +6384,8 @@
+@@ -6384,8 +6384,8 @@ public static final void gtk_expander_set_label_widget(int /*long*/ expander, i
}
}
/** @method flags=dynamic */
@@ -16718,7 +16851,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_chooser_add_filter(chooser, filter);
-@@ -6394,8 +6394,8 @@
+@@ -6394,8 +6394,8 @@ public static final void gtk_file_chooser_add_filter(int /*long*/ chooser, int /
}
}
/** @method flags=no_gen */
@@ -16729,7 +16862,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_chooser_dialog_new(title, parent, action, first_button_text, first_button_id, second_button_text, second_button_id, terminator);
-@@ -6404,8 +6404,8 @@
+@@ -6404,8 +6404,8 @@ public static final int /*long*/ gtk_file_chooser_dialog_new(byte[] title, int /
}
}
/** @method flags=dynamic */
@@ -16740,7 +16873,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_chooser_get_current_folder(chooser);
-@@ -6414,8 +6414,8 @@
+@@ -6414,8 +6414,8 @@ public static final int /*long*/ gtk_file_chooser_get_current_folder(int /*long*
}
}
/** @method flags=dynamic */
@@ -16751,7 +16884,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_chooser_get_filename(chooser);
-@@ -6424,8 +6424,8 @@
+@@ -6424,8 +6424,8 @@ public static final int /*long*/ gtk_file_chooser_get_filename(int /*long*/ choo
}
}
/** @method flags=dynamic */
@@ -16762,7 +16895,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_chooser_get_filenames(chooser);
-@@ -6434,8 +6434,8 @@
+@@ -6434,8 +6434,8 @@ public static final int /*long*/ gtk_file_chooser_get_filenames(int /*long*/ cho
}
}
/** @method flags=dynamic */
@@ -16773,7 +16906,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_chooser_get_uri(chooser);
-@@ -6444,8 +6444,8 @@
+@@ -6444,8 +6444,8 @@ public static final int /*long*/ gtk_file_chooser_get_uri(int /*long*/ chooser)
}
}
/** @method flags=dynamic */
@@ -16784,7 +16917,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_chooser_get_uris(chooser);
-@@ -6454,8 +6454,8 @@
+@@ -6454,8 +6454,8 @@ public static final int /*long*/ gtk_file_chooser_get_uris(int /*long*/ chooser)
}
}
/** @method flags=dynamic */
@@ -16795,7 +16928,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_chooser_get_filter(chooser);
-@@ -6464,8 +6464,8 @@
+@@ -6464,8 +6464,8 @@ public static final int /*long*/ gtk_file_chooser_get_filter(int /*long*/ choose
}
}
/** @method flags=dynamic */
@@ -16806,7 +16939,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_chooser_set_current_folder(chooser, filename);
-@@ -6474,8 +6474,8 @@
+@@ -6474,8 +6474,8 @@ public static final void gtk_file_chooser_set_current_folder(int /*long*/ choose
}
}
/** @method flags=dynamic */
@@ -16817,7 +16950,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_chooser_set_current_folder_uri(chooser, uri);
-@@ -6484,8 +6484,8 @@
+@@ -6484,8 +6484,8 @@ public static final void gtk_file_chooser_set_current_folder_uri(int /*long*/ ch
}
}
/** @method flags=dynamic */
@@ -16828,7 +16961,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_chooser_set_current_name(chooser, name);
-@@ -6494,8 +6494,8 @@
+@@ -6494,8 +6494,8 @@ public static final void gtk_file_chooser_set_current_name(int /*long*/ chooser,
}
}
/** @method flags=dynamic */
@@ -16839,7 +16972,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_chooser_set_local_only(chooser, local_only);
-@@ -6504,8 +6504,8 @@
+@@ -6504,8 +6504,8 @@ public static final void gtk_file_chooser_set_local_only(int /*long*/ chooser, b
}
}
/** @method flags=dynamic */
@@ -16850,7 +16983,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_chooser_set_do_overwrite_confirmation(chooser, do_overwrite_confirmation);
-@@ -6514,8 +6514,8 @@
+@@ -6514,8 +6514,8 @@ public static final void gtk_file_chooser_set_do_overwrite_confirmation(int /*lo
}
}
/** @method flags=dynamic */
@@ -16861,7 +16994,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_chooser_set_extra_widget(chooser, extra_widget);
-@@ -6524,8 +6524,8 @@
+@@ -6524,8 +6524,8 @@ public static final void gtk_file_chooser_set_extra_widget(int /*long*/ chooser,
}
}
/** @method flags=dynamic */
@@ -16872,7 +17005,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_chooser_set_filename(chooser, name);
-@@ -6534,8 +6534,8 @@
+@@ -6534,8 +6534,8 @@ public static final void gtk_file_chooser_set_filename(int /*long*/ chooser, int
}
}
/** @method flags=dynamic */
@@ -16883,7 +17016,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_chooser_set_filter(chooser, filter);
-@@ -6544,8 +6544,8 @@
+@@ -6544,8 +6544,8 @@ public static final void gtk_file_chooser_set_filter(int /*long*/ chooser, int /
}
}
/** @method flags=dynamic */
@@ -16894,7 +17027,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_chooser_set_uri(chooser, uri);
-@@ -6554,8 +6554,8 @@
+@@ -6554,8 +6554,8 @@ public static final void gtk_file_chooser_set_uri(int /*long*/ chooser, byte []
}
}
/** @method flags=dynamic */
@@ -16905,7 +17038,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_chooser_set_select_multiple(chooser, select_multiple);
-@@ -6564,8 +6564,8 @@
+@@ -6564,8 +6564,8 @@ public static final void gtk_file_chooser_set_select_multiple(int /*long*/ choos
}
}
/** @method flags=dynamic */
@@ -16916,7 +17049,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_filter_add_pattern(filter, pattern);
-@@ -6574,8 +6574,8 @@
+@@ -6574,8 +6574,8 @@ public static final void gtk_file_filter_add_pattern(int /*long*/ filter, byte[]
}
}
/** @method flags=dynamic */
@@ -16927,7 +17060,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_filter_new();
-@@ -6584,8 +6584,8 @@
+@@ -6584,8 +6584,8 @@ public static final int /*long*/ gtk_file_filter_new() {
}
}
/** @method flags=dynamic */
@@ -16938,7 +17071,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_filter_get_name(filter);
-@@ -6594,8 +6594,8 @@
+@@ -6594,8 +6594,8 @@ public static final int /*long*/ gtk_file_filter_get_name(int /*long*/ filter) {
}
}
/** @method flags=dynamic */
@@ -16949,7 +17082,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_filter_set_name(filter, name);
-@@ -6604,8 +6604,8 @@
+@@ -6604,8 +6604,8 @@ public static final void gtk_file_filter_set_name(int /*long*/ filter, byte[] na
}
}
/** @param filesel cast=(GtkFileSelection *) */
@@ -16960,7 +17093,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_selection_get_filename(filesel);
-@@ -6614,8 +6614,8 @@
+@@ -6614,8 +6614,8 @@ public static final int /*long*/ gtk_file_selection_get_filename(int /*long*/ fi
}
}
/** @param filesel cast=(GtkFileSelection *) */
@@ -16971,7 +17104,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_selection_get_selections(filesel);
-@@ -6624,8 +6624,8 @@
+@@ -6624,8 +6624,8 @@ public static final int /*long*/ gtk_file_selection_get_selections(int /*long*/
}
}
/** @param filesel cast=(GtkFileSelection *) */
@@ -16982,7 +17115,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_selection_hide_fileop_buttons(filesel);
-@@ -6634,8 +6634,8 @@
+@@ -6634,8 +6634,8 @@ public static final void gtk_file_selection_hide_fileop_buttons(int /*long*/ fil
}
}
/** @param title cast=(const gchar *) */
@@ -16993,7 +17126,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_file_selection_new(title);
-@@ -6647,8 +6647,8 @@
+@@ -6647,8 +6647,8 @@ public static final int /*long*/ gtk_file_selection_new(byte[] title) {
* @param filesel cast=(GtkFileSelection *)
* @param filename cast=(const gchar *)
*/
@@ -17004,7 +17137,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_selection_set_filename(filesel, filename);
-@@ -6660,8 +6660,8 @@
+@@ -6660,8 +6660,8 @@ public static final void gtk_file_selection_set_filename(int /*long*/ filesel, i
* @param filesel cast=(GtkFileSelection *)
* @param select_multiple cast=(gboolean)
*/
@@ -17015,7 +17148,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_file_selection_set_select_multiple(filesel, select_multiple);
-@@ -6675,8 +6675,8 @@
+@@ -6675,8 +6675,8 @@ public static final void gtk_file_selection_set_select_multiple(int /*long*/ fil
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -17026,7 +17159,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_fixed_move(fixed, widget, x, y);
-@@ -6684,8 +6684,8 @@
+@@ -6684,8 +6684,8 @@ public static final void gtk_fixed_move(int /*long*/ fixed, int /*long*/ widget,
lock.unlock();
}
}
@@ -17037,7 +17170,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_fixed_new();
-@@ -6697,8 +6697,8 @@
+@@ -6697,8 +6697,8 @@ public static final int /*long*/ gtk_fixed_new() {
* @param fixed cast=(GtkFixed *)
* @param has_window cast=(gboolean)
*/
@@ -17048,7 +17181,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_fixed_set_has_window(fixed, has_window);
-@@ -6707,8 +6707,8 @@
+@@ -6707,8 +6707,8 @@ public static final void gtk_fixed_set_has_window(int /*long*/ fixed, boolean ha
}
}
/** @param fsd cast=(GtkFontSelectionDialog *) */
@@ -17059,7 +17192,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_font_selection_dialog_get_font_name(fsd);
-@@ -6717,8 +6717,8 @@
+@@ -6717,8 +6717,8 @@ public static final int /*long*/ gtk_font_selection_dialog_get_font_name(int /*l
}
}
/** @param title cast=(const gchar *) */
@@ -17070,7 +17203,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_font_selection_dialog_new(title);
-@@ -6730,8 +6730,8 @@
+@@ -6730,8 +6730,8 @@ public static final int /*long*/ gtk_font_selection_dialog_new(byte[] title) {
* @param fsd cast=(GtkFontSelectionDialog *)
* @param fontname cast=(const gchar *)
*/
@@ -17081,7 +17214,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_font_selection_dialog_set_font_name(fsd, fontname);
-@@ -6740,8 +6740,8 @@
+@@ -6740,8 +6740,8 @@ public static final boolean gtk_font_selection_dialog_set_font_name(int /*long*/
}
}
/** @param label cast=(const gchar *) */
@@ -17092,7 +17225,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_frame_new(label);
-@@ -6750,8 +6750,8 @@
+@@ -6750,8 +6750,8 @@ public static final int /*long*/ gtk_frame_new(byte[] label) {
}
}
/** @param frame cast=(GtkFrame *) */
@@ -17103,7 +17236,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_frame_get_label_widget(frame);
-@@ -6763,8 +6763,8 @@
+@@ -6763,8 +6763,8 @@ public static final int /*long*/ gtk_frame_get_label_widget(int /*long*/ frame)
* @param frame cast=(GtkFrame *)
* @param label cast=(const gchar *)
*/
@@ -17114,7 +17247,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_frame_set_label(frame, label);
-@@ -6776,8 +6776,8 @@
+@@ -6776,8 +6776,8 @@ public static final void gtk_frame_set_label(int /*long*/ frame, byte[] label) {
* @param frame cast=(GtkFrame *)
* @param label_widget cast=(GtkWidget *)
*/
@@ -17125,7 +17258,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_frame_set_label_widget(frame, label_widget);
-@@ -6789,8 +6789,8 @@
+@@ -6789,8 +6789,8 @@ public static final void gtk_frame_set_label_widget(int /*long*/ frame, int /*lo
* @param frame cast=(GtkFrame *)
* @param type cast=(GtkShadowType)
*/
@@ -17136,7 +17269,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_frame_set_shadow_type(frame, type);
-@@ -6798,8 +6798,8 @@
+@@ -6798,8 +6798,8 @@ public static final void gtk_frame_set_shadow_type(int /*long*/ frame, int type)
lock.unlock();
}
}
@@ -17147,7 +17280,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_get_current_event();
-@@ -6826,8 +6826,8 @@
+@@ -6826,8 +6826,8 @@ public static final int gtk_get_current_event_time() {
lock.unlock();
}
}
@@ -17158,7 +17291,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_get_default_language();
-@@ -6836,8 +6836,8 @@
+@@ -6836,8 +6836,8 @@ public static final int /*long*/ gtk_get_default_language() {
}
}
/** @param event cast=(GdkEvent *) */
@@ -17169,7 +17302,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_get_event_widget(event);
-@@ -6846,8 +6846,8 @@
+@@ -6846,8 +6846,8 @@ public static final int /*long*/ gtk_get_event_widget(int /*long*/ event) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -17180,7 +17313,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_grab_add(widget);
-@@ -6855,8 +6855,8 @@
+@@ -6855,8 +6855,8 @@ public static final void gtk_grab_add(int /*long*/ widget) {
lock.unlock();
}
}
@@ -17191,7 +17324,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_grab_get_current();
-@@ -6865,8 +6865,8 @@
+@@ -6865,8 +6865,8 @@ public static final int /*long*/ gtk_grab_get_current() {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -17202,7 +17335,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_grab_remove(widget);
-@@ -6878,8 +6878,8 @@
+@@ -6878,8 +6878,8 @@ public static final void gtk_grab_remove(int /*long*/ widget) {
* @param homogeneous cast=(gboolean)
* @param spacing cast=(gint)
*/
@@ -17213,7 +17346,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_hbox_new(homogeneous, spacing);
-@@ -6888,8 +6888,8 @@
+@@ -6888,8 +6888,8 @@ public static final int /*long*/ gtk_hbox_new(boolean homogeneous, int spacing)
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -17224,7 +17357,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_hscale_new(adjustment);
-@@ -6898,8 +6898,8 @@
+@@ -6898,8 +6898,8 @@ public static final int /*long*/ gtk_hscale_new(int /*long*/ adjustment) {
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -17235,7 +17368,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_hscrollbar_new(adjustment);
-@@ -6907,8 +6907,8 @@
+@@ -6907,8 +6907,8 @@ public static final int /*long*/ gtk_hscrollbar_new(int /*long*/ adjustment) {
lock.unlock();
}
}
@@ -17246,7 +17379,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_hseparator_new();
-@@ -6917,8 +6917,8 @@
+@@ -6917,8 +6917,8 @@ public static final int /*long*/ gtk_hseparator_new() {
}
}
/** @param stock_id cast=(const gchar *) */
@@ -17257,7 +17390,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_icon_factory_lookup_default(stock_id);
-@@ -6927,8 +6927,8 @@
+@@ -6927,8 +6927,8 @@ public static final int /*long*/ gtk_icon_factory_lookup_default(byte[] stock_id
}
}
/** @param source cast=(GtkIconSource *) */
@@ -17268,7 +17401,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_icon_source_free(source);
-@@ -6936,8 +6936,8 @@
+@@ -6936,8 +6936,8 @@ public static final void gtk_icon_source_free(int /*long*/ source) {
lock.unlock();
}
}
@@ -17279,7 +17412,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_icon_source_new();
-@@ -6949,8 +6949,8 @@
+@@ -6949,8 +6949,8 @@ public static final int /*long*/ gtk_icon_source_new() {
* @param source cast=(GtkIconSource *)
* @param pixbuf cast=(GdkPixbuf *)
*/
@@ -17290,7 +17423,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_icon_source_set_pixbuf(source, pixbuf);
-@@ -6967,8 +6967,8 @@
+@@ -6967,8 +6967,8 @@ public static final void gtk_icon_source_set_pixbuf(int /*long*/ source, int /*l
* @param widget cast=(GtkWidget *)
* @param detail cast=(const char *)
*/
@@ -17301,7 +17434,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_icon_set_render_icon(icon_set, style, direction, state, size, widget, detail);
-@@ -6980,8 +6980,8 @@
+@@ -6980,8 +6980,8 @@ public static final int /*long*/ gtk_icon_set_render_icon(int /*long*/ icon_set,
* @param context cast=(GtkIMContext *)
* @param event cast=(GdkEventKey *)
*/
@@ -17312,7 +17445,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_im_context_filter_keypress(context, event);
-@@ -6990,8 +6990,8 @@
+@@ -6990,8 +6990,8 @@ public static final boolean gtk_im_context_filter_keypress(int /*long*/ context,
}
}
/** @param context cast=(GtkIMContext *) */
@@ -17323,7 +17456,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_im_context_focus_in(context);
-@@ -7000,8 +7000,8 @@
+@@ -7000,8 +7000,8 @@ public static final void gtk_im_context_focus_in(int /*long*/ context) {
}
}
/** @param context cast=(GtkIMContext *) */
@@ -17334,7 +17467,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_im_context_focus_out(context);
-@@ -7015,8 +7015,8 @@
+@@ -7015,8 +7015,8 @@ public static final void gtk_im_context_focus_out(int /*long*/ context) {
* @param attrs cast=(PangoAttrList **)
* @param cursor_pos cast=(gint *)
*/
@@ -17345,7 +17478,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_im_context_get_preedit_string(context, str, attrs, cursor_pos);
-@@ -7024,8 +7024,8 @@
+@@ -7024,8 +7024,8 @@ public static final void gtk_im_context_get_preedit_string(int /*long*/ context,
lock.unlock();
}
}
@@ -17356,7 +17489,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_im_context_get_type();
-@@ -7034,8 +7034,8 @@
+@@ -7034,8 +7034,8 @@ public static final int /*long*/ gtk_im_context_get_type() {
}
}
/** @param context cast=(GtkIMContext *) */
@@ -17367,7 +17500,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_im_context_reset(context);
-@@ -7047,8 +7047,8 @@
+@@ -7047,8 +7047,8 @@ public static final void gtk_im_context_reset(int /*long*/ context) {
* @param context cast=(GtkIMContext *)
* @param window cast=(GdkWindow *)
*/
@@ -17378,7 +17511,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_im_context_set_client_window(context, window);
-@@ -7060,8 +7060,8 @@
+@@ -7060,8 +7060,8 @@ public static final void gtk_im_context_set_client_window(int /*long*/ context,
* @param context cast=(GtkIMContext *)
* @param area cast=(GdkRectangle *),flags=no_out
*/
@@ -17389,7 +17522,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_im_context_set_cursor_location(context, area);
-@@ -7073,8 +7073,8 @@
+@@ -7073,8 +7073,8 @@ public static final void gtk_im_context_set_cursor_location(int /*long*/ context
* @param context cast=(GtkIMMulticontext *)
* @param menushell cast=(GtkMenuShell *)
*/
@@ -17400,7 +17533,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_im_multicontext_append_menuitems(context, menushell);
-@@ -7082,8 +7082,8 @@
+@@ -7082,8 +7082,8 @@ public static final void gtk_im_multicontext_append_menuitems (int /*long*/ cont
lock.unlock();
}
}
@@ -17411,7 +17544,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_im_multicontext_new();
-@@ -7092,8 +7092,8 @@
+@@ -7092,8 +7092,8 @@ public static final int /*long*/ gtk_im_multicontext_new() {
}
}
/** @param label cast=(const gchar *) */
@@ -17422,7 +17555,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_image_menu_item_new_with_label(label);
-@@ -7105,8 +7105,8 @@
+@@ -7105,8 +7105,8 @@ public static final int /*long*/ gtk_image_menu_item_new_with_label(byte[] label
* @param menu_item cast=(GtkImageMenuItem *)
* @param image cast=(GtkWidget *)
*/
@@ -17433,7 +17566,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_image_menu_item_set_image(menu_item, image);
-@@ -7114,8 +7114,8 @@
+@@ -7114,8 +7114,8 @@ public static final void gtk_image_menu_item_set_image(int /*long*/ menu_item, i
lock.unlock();
}
}
@@ -17444,7 +17577,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_image_new();
-@@ -7124,8 +7124,8 @@
+@@ -7124,8 +7124,8 @@ public static final int /*long*/ gtk_image_new() {
}
}
/** @param pixbuf cast=(GdkPixbuf *) */
@@ -17455,7 +17588,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_image_new_from_pixbuf(pixbuf);
-@@ -7137,8 +7137,8 @@
+@@ -7137,8 +7137,8 @@ public static final int /*long*/ gtk_image_new_from_pixbuf(int /*long*/ pixbuf)
* @param pixmap cast=(GdkPixmap *)
* @param mask cast=(GdkBitmap *)
*/
@@ -17466,7 +17599,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_image_new_from_pixmap(pixmap, mask);
-@@ -7150,8 +7150,8 @@
+@@ -7150,8 +7150,8 @@ public static final int /*long*/ gtk_image_new_from_pixmap(int /*long*/ pixmap,
* @param image cast=(GtkImage *)
* @param pixbuf cast=(GdkPixbuf *)
*/
@@ -17477,7 +17610,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_image_set_from_pixbuf(image, pixbuf);
-@@ -7164,8 +7164,8 @@
+@@ -7164,8 +7164,8 @@ public static final void gtk_image_set_from_pixbuf(int /*long*/ image, int /*lon
* @param pixmap cast=(GdkBitmap *)
* @param mask cast=(GdkBitmap *)
*/
@@ -17488,7 +17621,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_image_set_from_pixmap(image, pixmap, mask);
-@@ -7177,8 +7177,8 @@
+@@ -7177,8 +7177,8 @@ public static final void gtk_image_set_from_pixmap(int /*long*/ image, int /*lon
* @param argc cast=(int *)
* @param argv cast=(char ***)
*/
@@ -17499,7 +17632,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_init_check(argc, argv);
-@@ -7187,8 +7187,8 @@
+@@ -7187,8 +7187,8 @@ public static final boolean gtk_init_check(int /*long*/[] argc, int /*long*/[] a
}
}
/** @param label cast=(GtkLabel *) */
@@ -17510,7 +17643,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_label_get_layout(label);
-@@ -7197,8 +7197,8 @@
+@@ -7197,8 +7197,8 @@ public static final int /*long*/ gtk_label_get_layout(int /*long*/ label) {
}
}
/** @param label cast=(GtkLabel *) */
@@ -17521,7 +17654,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_label_get_mnemonic_keyval(label);
-@@ -7207,8 +7207,8 @@
+@@ -7207,8 +7207,8 @@ public static final int gtk_label_get_mnemonic_keyval(int /*long*/ label) {
}
}
/** @param label cast=(const gchar *) */
@@ -17532,7 +17665,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_label_new(label);
-@@ -7217,8 +7217,8 @@
+@@ -7217,8 +7217,8 @@ public static final int /*long*/ gtk_label_new(byte[] label) {
}
}
/** @param str cast=(const gchar *) */
@@ -17543,7 +17676,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_label_new_with_mnemonic(str);
-@@ -7230,8 +7230,8 @@
+@@ -7230,8 +7230,8 @@ public static final int /*long*/ gtk_label_new_with_mnemonic(byte[] str) {
* @param label cast=(GtkLabel *)
* @param attrs cast=(PangoAttrList *)
*/
@@ -17554,7 +17687,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_label_set_attributes(label, attrs);
-@@ -7243,8 +7243,8 @@
+@@ -7243,8 +7243,8 @@ public static final void gtk_label_set_attributes(int /*long*/ label, int /*long
* @param label cast=(GtkLabel *)
* @param jtype cast=(GtkJustification)
*/
@@ -17565,7 +17698,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_label_set_justify(label, jtype);
-@@ -7256,8 +7256,8 @@
+@@ -7256,8 +7256,8 @@ public static final void gtk_label_set_justify(int /*long*/ label, int jtype) {
* @param label cast=(GtkLabel *)
* @param wrap cast=(gboolean)
*/
@@ -17576,7 +17709,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_label_set_line_wrap(label, wrap);
-@@ -7266,8 +7266,8 @@
+@@ -7266,8 +7266,8 @@ public static final void gtk_label_set_line_wrap(int /*long*/ label, boolean wra
}
}
/** @method flags=dynamic */
@@ -17587,7 +17720,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_label_set_line_wrap_mode(label, wrap_mode);
-@@ -7279,8 +7279,8 @@
+@@ -7279,8 +7279,8 @@ public static final void gtk_label_set_line_wrap_mode(int /*long*/ label, int wr
* @param label cast=(GtkLabel *)
* @param str cast=(const gchar *)
*/
@@ -17598,7 +17731,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_label_set_text(label, str);
-@@ -7292,8 +7292,8 @@
+@@ -7292,8 +7292,8 @@ public static final void gtk_label_set_text(int /*long*/ label, int /*long*/ str
* @param label cast=(GtkLabel *)
* @param str cast=(const gchar *)
*/
@@ -17609,7 +17742,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_label_set_text(label, str);
-@@ -7305,8 +7305,8 @@
+@@ -7305,8 +7305,8 @@ public static final void gtk_label_set_text(int /*long*/ label, byte[] str) {
* @param label cast=(GtkLabel *)
* @param str cast=(const gchar *)
*/
@@ -17620,7 +17753,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_label_set_text_with_mnemonic(label, str);
-@@ -7318,8 +7318,8 @@
+@@ -7318,8 +7318,8 @@ public static final void gtk_label_set_text_with_mnemonic(int /*long*/ label, by
* @param list cast=(GtkList *)
* @param items cast=(GList *)
*/
@@ -17631,7 +17764,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_append_items(list, items);
-@@ -7328,8 +7328,8 @@
+@@ -7328,8 +7328,8 @@ public static final void gtk_list_append_items(int /*long*/ list, int /*long*/ i
}
}
/** @param list cast=(GtkList *) */
@@ -17642,7 +17775,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_clear_items(list, start, end);
-@@ -7341,8 +7341,8 @@
+@@ -7341,8 +7341,8 @@ public static final void gtk_list_clear_items(int /*long*/ list, int start, int
* @param list cast=(GtkList *)
* @param items cast=(GList *)
*/
@@ -17653,7 +17786,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_insert_items(list, items, position);
-@@ -7351,8 +7351,8 @@
+@@ -7351,8 +7351,8 @@ public static final void gtk_list_insert_items(int /*long*/ list, int /*long*/ i
}
}
/** @param label cast=(const gchar *) */
@@ -17664,7 +17797,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_list_item_new_with_label(label);
-@@ -7364,8 +7364,8 @@
+@@ -7364,8 +7364,8 @@ public static final int /*long*/ gtk_list_item_new_with_label(byte[] label) {
* @param list cast=(GtkList *)
* @param items cast=(GList *)
*/
@@ -17675,7 +17808,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_remove_items(list, items);
-@@ -7374,8 +7374,8 @@
+@@ -7374,8 +7374,8 @@ public static final void gtk_list_remove_items(int /*long*/ list, int /*long*/ i
}
}
/** @param list cast=(GtkList *) */
@@ -17686,7 +17819,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_select_item(list, item);
-@@ -7384,8 +7384,8 @@
+@@ -7384,8 +7384,8 @@ public static final void gtk_list_select_item(int /*long*/ list, int item) {
}
}
/** @param list cast=(GtkList *) */
@@ -17697,7 +17830,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_unselect_all(list);
-@@ -7394,8 +7394,8 @@
+@@ -7394,8 +7394,8 @@ public static final void gtk_list_unselect_all(int /*long*/ list) {
}
}
/** @param list cast=(GtkList *) */
@@ -17708,7 +17841,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_unselect_item(list, item);
-@@ -7407,8 +7407,8 @@
+@@ -7407,8 +7407,8 @@ public static final void gtk_list_unselect_item(int /*long*/ list, int item) {
* @param list_store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -17719,7 +17852,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_store_append(list_store, iter);
-@@ -7417,8 +7417,8 @@
+@@ -7417,8 +7417,8 @@ public static final void gtk_list_store_append(int /*long*/ list_store, int /*lo
}
}
/** @param store cast=(GtkListStore *) */
@@ -17730,7 +17863,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_store_clear(store);
-@@ -7431,8 +7431,8 @@
+@@ -7431,8 +7431,8 @@ public static final void gtk_list_store_clear(int /*long*/ store) {
* @param iter cast=(GtkTreeIter *)
* @param position cast=(gint)
*/
@@ -17741,7 +17874,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_store_insert(list_store, iter, position);
-@@ -7444,8 +7444,8 @@
+@@ -7444,8 +7444,8 @@ public static final void gtk_list_store_insert(int /*long*/ list_store, int /*lo
* @param numColumns cast=(gint)
* @param types cast=(GType *)
*/
@@ -17752,7 +17885,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_list_store_newv(numColumns, types);
-@@ -7457,8 +7457,8 @@
+@@ -7457,8 +7457,8 @@ public static final int /*long*/ gtk_list_store_newv(int numColumns, int /*long*
* @param list_store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -17763,7 +17896,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_store_remove(list_store, iter);
-@@ -7470,8 +7470,8 @@
+@@ -7470,8 +7470,8 @@ public static final void gtk_list_store_remove(int /*long*/ list_store, int /*lo
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -17774,7 +17907,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -7483,8 +7483,8 @@
+@@ -7483,8 +7483,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -17785,7 +17918,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -7496,8 +7496,8 @@
+@@ -7496,8 +7496,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -17796,7 +17929,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -7510,8 +7510,8 @@
+@@ -7510,8 +7510,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
* @param iter cast=(GtkTreeIter *)
* @param value flags=no_out
*/
@@ -17807,7 +17940,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -7523,8 +7523,8 @@
+@@ -7523,8 +7523,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -17818,7 +17951,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -7581,8 +7581,8 @@
+@@ -7581,8 +7581,8 @@ public static final int gtk_main_iteration() {
}
}
/** @param event cast=(GdkEvent *) */
@@ -17829,7 +17962,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_main_do_event(event);
-@@ -7590,8 +7590,8 @@
+@@ -7590,8 +7590,8 @@ public static final void gtk_main_do_event(int /*long*/ event) {
lock.unlock();
}
}
@@ -17840,7 +17973,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_menu_bar_new();
-@@ -7600,8 +7600,8 @@
+@@ -7600,8 +7600,8 @@ public static final int /*long*/ gtk_menu_bar_new() {
}
}
/** @param menu cast=(GtkMenu *) */
@@ -17851,7 +17984,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_menu_get_attach_widget(menu);
-@@ -7610,8 +7610,8 @@
+@@ -7610,8 +7610,8 @@ public static final int /*long*/ gtk_menu_get_attach_widget(int /*long*/ menu) {
}
}
/** @param menu_item cast=(GtkMenuItem *) */
@@ -17862,7 +17995,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_menu_item_remove_submenu(menu_item);
-@@ -7620,8 +7620,8 @@
+@@ -7620,8 +7620,8 @@ public static final void gtk_menu_item_remove_submenu(int /*long*/ menu_item) {
}
}
/** @param menu_item cast=(GtkMenuItem *) */
@@ -17873,7 +18006,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_menu_item_get_submenu(menu_item);
-@@ -7633,8 +7633,8 @@
+@@ -7633,8 +7633,8 @@ public static final int /*long*/ gtk_menu_item_get_submenu(int /*long*/ menu_ite
* @param menu_item cast=(GtkMenuItem *)
* @param submenu cast=(GtkWidget *)
*/
@@ -17884,7 +18017,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_menu_item_set_submenu(menu_item, submenu);
-@@ -7642,8 +7642,8 @@
+@@ -7642,8 +7642,8 @@ public static final void gtk_menu_item_set_submenu(int /*long*/ menu_item, int /
lock.unlock();
}
}
@@ -17895,7 +18028,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_menu_new();
-@@ -7652,8 +7652,8 @@
+@@ -7652,8 +7652,8 @@ public static final int /*long*/ gtk_menu_new() {
}
}
/** @param menu cast=(GtkMenu *) */
@@ -17906,7 +18039,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_menu_popdown(menu);
-@@ -7670,8 +7670,8 @@
+@@ -7670,8 +7670,8 @@ public static final void gtk_menu_popdown(int /*long*/ menu) {
* @param button cast=(guint)
* @param activate_time cast=(guint32)
*/
@@ -17917,7 +18050,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_menu_popup(menu, parent_menu_shell, parent_menu_item, func, data, button, activate_time);
-@@ -7680,8 +7680,8 @@
+@@ -7680,8 +7680,8 @@ public static final void gtk_menu_popup(int /*long*/ menu, int /*long*/ parent_m
}
}
/** @param menu_shell cast=(GtkMenuShell *) */
@@ -17928,7 +18061,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_menu_shell_deactivate(menu_shell);
-@@ -7694,8 +7694,8 @@
+@@ -7694,8 +7694,8 @@ public static final void gtk_menu_shell_deactivate(int /*long*/ menu_shell) {
* @param child cast=(GtkWidget *)
* @param position cast=(gint)
*/
@@ -17939,7 +18072,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_menu_shell_insert(menu_shell, child, position);
-@@ -7707,8 +7707,8 @@
+@@ -7707,8 +7707,8 @@ public static final void gtk_menu_shell_insert(int /*long*/ menu_shell, int /*lo
* @param menu_shell cast=(GtkMenuShell *)
* @param menu_item cast=(GtkWidget *)
*/
@@ -17950,7 +18083,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_menu_shell_select_item(menu_shell, menu_item);
-@@ -7721,8 +7721,8 @@
+@@ -7721,8 +7721,8 @@ public static final void gtk_menu_shell_select_item(int /*long*/ menu_shell, int
* @param menu_shell cast=(GtkMenuShell *)
* @param take_focus cast=(gboolean)
*/
@@ -17961,7 +18094,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_menu_shell_set_take_focus(menu_shell, take_focus);
-@@ -7737,8 +7737,8 @@
+@@ -7737,8 +7737,8 @@ public static final void gtk_menu_shell_set_take_focus(int /*long*/ menu_shell,
* @param buttons cast=(GtkButtonsType)
* @param message_format cast=(const gchar *)
*/
@@ -17972,7 +18105,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_message_dialog_new(parent, flags, type, buttons, message_format);
-@@ -7751,8 +7751,8 @@
+@@ -7751,8 +7751,8 @@ public static final int /*long*/ gtk_message_dialog_new(int /*long*/ parent, int
* @param xalign cast=(gfloat)
* @param yalign cast=(gfloat)
*/
@@ -17983,7 +18116,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_misc_set_alignment(misc, xalign, yalign);
-@@ -7761,8 +7761,8 @@
+@@ -7761,8 +7761,8 @@ public static final void gtk_misc_set_alignment(int /*long*/ misc, float xalign,
}
}
/** @param notebook cast=(GtkNotebook *) */
@@ -17994,7 +18127,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_notebook_get_current_page(notebook);
-@@ -7771,8 +7771,8 @@
+@@ -7771,8 +7771,8 @@ public static final int gtk_notebook_get_current_page(int /*long*/ notebook) {
}
}
/** @param notebook cast=(GtkNotebook *) */
@@ -18005,7 +18138,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_notebook_get_scrollable(notebook);
-@@ -7786,8 +7786,8 @@
+@@ -7786,8 +7786,8 @@ public static final boolean gtk_notebook_get_scrollable(int /*long*/ notebook) {
* @param tab_label cast=(GtkWidget *)
* @param position cast=(gint)
*/
@@ -18016,7 +18149,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_notebook_insert_page(notebook, child, tab_label, position);
-@@ -7795,8 +7795,8 @@
+@@ -7795,8 +7795,8 @@ public static final void gtk_notebook_insert_page(int /*long*/ notebook, int /*l
lock.unlock();
}
}
@@ -18027,7 +18160,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_notebook_new();
-@@ -7805,8 +7805,8 @@
+@@ -7805,8 +7805,8 @@ public static final int /*long*/ gtk_notebook_new() {
}
}
/** @param notebook cast=(GtkNotebook *) */
@@ -18038,7 +18171,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_notebook_next_page(notebook);
-@@ -7815,8 +7815,8 @@
+@@ -7815,8 +7815,8 @@ public static final void gtk_notebook_next_page(int /*long*/ notebook) {
}
}
/** @param notebook cast=(GtkNotebook *) */
@@ -18049,7 +18182,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_notebook_prev_page(notebook);
-@@ -7828,8 +7828,8 @@
+@@ -7828,8 +7828,8 @@ public static final void gtk_notebook_prev_page(int /*long*/ notebook) {
* @param notebook cast=(GtkNotebook *)
* @param page_num cast=(gint)
*/
@@ -18060,7 +18193,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_notebook_remove_page(notebook, page_num);
-@@ -7841,8 +7841,8 @@
+@@ -7841,8 +7841,8 @@ public static final void gtk_notebook_remove_page(int /*long*/ notebook, int pag
* @param notebook cast=(GtkNotebook *)
* @param page_num cast=(gint)
*/
@@ -18071,7 +18204,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_notebook_set_current_page(notebook, page_num);
-@@ -7854,8 +7854,8 @@
+@@ -7854,8 +7854,8 @@ public static final void gtk_notebook_set_current_page(int /*long*/ notebook, in
* @param notebook cast=(GtkNotebook *)
* @param scrollable cast=(gboolean)
*/
@@ -18082,7 +18215,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_notebook_set_scrollable(notebook, scrollable);
-@@ -7867,8 +7867,8 @@
+@@ -7867,8 +7867,8 @@ public static final void gtk_notebook_set_scrollable(int /*long*/ notebook, bool
* @param notebook cast=(GtkNotebook *)
* @param show_tabs cast=(gboolean)
*/
@@ -18093,7 +18226,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_notebook_set_show_tabs(notebook, show_tabs);
-@@ -7880,8 +7880,8 @@
+@@ -7880,8 +7880,8 @@ public static final void gtk_notebook_set_show_tabs(int /*long*/ notebook, boole
* @param notebook cast=(GtkNotebook *)
* @param pos cast=(GtkPositionType)
*/
@@ -18104,7 +18237,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_notebook_set_tab_pos(notebook, pos);
-@@ -7890,8 +7890,8 @@
+@@ -7890,8 +7890,8 @@ public static final void gtk_notebook_set_tab_pos(int /*long*/ notebook, int pos
}
}
/** @param object cast=(GtkObject *) */
@@ -18115,7 +18248,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_object_sink(object);
-@@ -7900,8 +7900,8 @@
+@@ -7900,8 +7900,8 @@ public static final void gtk_object_sink(int /*long*/ object) {
}
}
/** @method flags=dynamic */
@@ -18126,7 +18259,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_page_setup_new ();
-@@ -7910,8 +7910,8 @@
+@@ -7910,8 +7910,8 @@ public static final int /*long*/ gtk_page_setup_new () {
}
}
/** @method flags=dynamic */
@@ -18137,7 +18270,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_page_setup_get_orientation(setup);
-@@ -7920,8 +7920,8 @@
+@@ -7920,8 +7920,8 @@ public static final int gtk_page_setup_get_orientation(int /*long*/ setup) {
}
}
/** @method flags=dynamic */
@@ -18148,7 +18281,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_page_setup_set_orientation(setup, orientation);
-@@ -7930,8 +7930,8 @@
+@@ -7930,8 +7930,8 @@ public static final void gtk_page_setup_set_orientation(int /*long*/ setup, int
}
}
/** @method flags=dynamic */
@@ -18159,7 +18292,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_page_setup_get_paper_size(setup);
-@@ -7940,8 +7940,8 @@
+@@ -7940,8 +7940,8 @@ public static final int /*long*/ gtk_page_setup_get_paper_size(int /*long*/ setu
}
}
/** @method flags=dynamic */
@@ -18170,7 +18303,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_page_setup_set_paper_size(setup, size);
-@@ -7950,8 +7950,8 @@
+@@ -7950,8 +7950,8 @@ public static final void gtk_page_setup_set_paper_size(int /*long*/ setup, int /
}
}
/** @method flags=dynamic */
@@ -18181,7 +18314,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_page_setup_get_top_margin(setup, unit);
-@@ -7960,8 +7960,8 @@
+@@ -7960,8 +7960,8 @@ public static final double gtk_page_setup_get_top_margin(int /*long*/ setup, int
}
}
/** @method flags=dynamic */
@@ -18192,7 +18325,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_page_setup_set_top_margin(setup, margin, unit);
-@@ -7970,8 +7970,8 @@
+@@ -7970,8 +7970,8 @@ public static final void gtk_page_setup_set_top_margin(int /*long*/ setup, doubl
}
}
/** @method flags=dynamic */
@@ -18203,7 +18336,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_page_setup_get_bottom_margin(setup, unit);
-@@ -7980,8 +7980,8 @@
+@@ -7980,8 +7980,8 @@ public static final double gtk_page_setup_get_bottom_margin(int /*long*/ setup,
}
}
/** @method flags=dynamic */
@@ -18214,7 +18347,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_page_setup_set_bottom_margin(setup, margin, unit);
-@@ -7990,8 +7990,8 @@
+@@ -7990,8 +7990,8 @@ public static final void gtk_page_setup_set_bottom_margin(int /*long*/ setup, do
}
}
/** @method flags=dynamic */
@@ -18225,7 +18358,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_page_setup_get_left_margin(setup, unit);
-@@ -8000,8 +8000,8 @@
+@@ -8000,8 +8000,8 @@ public static final double gtk_page_setup_get_left_margin(int /*long*/ setup, in
}
}
/** @method flags=dynamic */
@@ -18236,7 +18369,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_page_setup_set_left_margin(setup, margin, unit);
-@@ -8010,8 +8010,8 @@
+@@ -8010,8 +8010,8 @@ public static final void gtk_page_setup_set_left_margin(int /*long*/ setup, doub
}
}
/** @method flags=dynamic */
@@ -18247,7 +18380,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_page_setup_get_right_margin(setup, unit);
-@@ -8020,8 +8020,8 @@
+@@ -8020,8 +8020,8 @@ public static final double gtk_page_setup_get_right_margin(int /*long*/ setup, i
}
}
/** @method flags=dynamic */
@@ -18258,7 +18391,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_page_setup_set_right_margin(setup, margin, unit);
-@@ -8030,8 +8030,8 @@
+@@ -8030,8 +8030,8 @@ public static final void gtk_page_setup_set_right_margin(int /*long*/ setup, dou
}
}
/** @method flags=dynamic */
@@ -18269,7 +18402,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_page_setup_get_paper_width(setup, unit);
-@@ -8040,8 +8040,8 @@
+@@ -8040,8 +8040,8 @@ public static final double gtk_page_setup_get_paper_width(int /*long*/ setup, in
}
}
/** @method flags=dynamic */
@@ -18280,7 +18413,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_page_setup_get_paper_height(setup, unit);
-@@ -8050,8 +8050,8 @@
+@@ -8050,8 +8050,8 @@ public static final double gtk_page_setup_get_paper_height(int /*long*/ setup, i
}
}
/** @method flags=dynamic */
@@ -18291,7 +18424,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_page_setup_get_page_width(setup, unit);
-@@ -8060,8 +8060,8 @@
+@@ -8060,8 +8060,8 @@ public static final double gtk_page_setup_get_page_width(int /*long*/ setup, int
}
}
/** @method flags=dynamic */
@@ -18302,7 +18435,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_page_setup_get_page_height(setup, unit);
-@@ -8076,8 +8076,8 @@
+@@ -8076,8 +8076,8 @@ public static final double gtk_page_setup_get_page_height(int /*long*/ setup, in
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -18313,7 +18446,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_handle(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
-@@ -8091,8 +8091,8 @@
+@@ -8091,8 +8091,8 @@ public static final void gtk_paint_handle(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -18324,7 +18457,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_flat_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8107,8 +8107,8 @@
+@@ -8107,8 +8107,8 @@ public static final void gtk_paint_flat_box(int /*long*/ style, int /*long*/ win
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -18335,7 +18468,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_focus(style, window, state_type, area, widget, detail, x, y, width, height);
-@@ -8122,8 +8122,8 @@
+@@ -8122,8 +8122,8 @@ public static final void gtk_paint_focus(int /*long*/ style, int /*long*/ window
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -18346,7 +18479,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_option(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8137,8 +8137,8 @@
+@@ -8137,8 +8137,8 @@ public static final void gtk_paint_option(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -18357,7 +18490,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_slider(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
-@@ -8152,8 +8152,8 @@
+@@ -8152,8 +8152,8 @@ public static final void gtk_paint_slider(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -18368,7 +18501,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_tab(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8167,8 +8167,8 @@
+@@ -8167,8 +8167,8 @@ public static final void gtk_paint_tab(int /*long*/ style, int /*long*/ window,
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -18379,7 +18512,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_arrow(style, window, state_type, shadow_type, area, widget, detail, arrow_type, fill, x, y, width, height);
-@@ -8183,8 +8183,8 @@
+@@ -8183,8 +8183,8 @@ public static final void gtk_paint_arrow(int /*long*/ style, int /*long*/ window
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -18390,7 +18523,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8198,8 +8198,8 @@
+@@ -8198,8 +8198,8 @@ public static final void gtk_paint_box(int /*long*/ style, int /*long*/ window,
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
@@ -18401,7 +18534,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_box_gap(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);
-@@ -8213,8 +8213,8 @@
+@@ -8213,8 +8213,8 @@ public static final void gtk_paint_box_gap(int /*long*/ style, int /*long*/ wind
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -18412,7 +18545,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_check(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8228,8 +8228,8 @@
+@@ -8228,8 +8228,8 @@ public static final void gtk_paint_check(int /*long*/ style, int /*long*/ window
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -18423,7 +18556,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_expander(style, window, state_type, area, widget, detail, x, y, expander_style);
-@@ -8243,8 +8243,8 @@
+@@ -8243,8 +8243,8 @@ public static final void gtk_paint_expander(int /*long*/ style, int /*long*/ win
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
@@ -18434,7 +18567,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_extension(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side);
-@@ -8258,8 +8258,8 @@
+@@ -8258,8 +8258,8 @@ public static final void gtk_paint_extension(int /*long*/ style, int /*long*/ wi
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -18445,7 +18578,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_hline(style, window, state_type, area, widget, detail, x1, x2, y);
-@@ -8274,8 +8274,8 @@
+@@ -8274,8 +8274,8 @@ public static final void gtk_paint_hline(int /*long*/ style, int /*long*/ window
* @param detail cast=(const gchar *)
* @param layout cast=(PangoLayout *)
*/
@@ -18456,7 +18589,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_layout(style, window, state_type, use_text, area, widget, detail, x, y, layout);
-@@ -8289,8 +8289,8 @@
+@@ -8289,8 +8289,8 @@ public static final void gtk_paint_layout(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
@@ -18467,7 +18600,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_shadow_gap(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);
-@@ -8304,8 +8304,8 @@
+@@ -8304,8 +8304,8 @@ public static final void gtk_paint_shadow_gap(int /*long*/ style, int /*long*/ w
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
@@ -18478,7 +18611,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_shadow(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8319,8 +8319,8 @@
+@@ -8319,8 +8319,8 @@ public static final void gtk_paint_shadow(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -18489,7 +18622,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paint_vline(style, window, state_type, area, widget, detail, y1, y2, x);
-@@ -8329,8 +8329,8 @@
+@@ -8329,8 +8329,8 @@ public static final void gtk_paint_vline(int /*long*/ style, int /*long*/ window
}
}
/** @method flags=dynamic */
@@ -18500,7 +18633,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_paper_size_free(size);
-@@ -8339,8 +8339,8 @@
+@@ -8339,8 +8339,8 @@ public static final void gtk_paper_size_free(int /*long*/ size) {
}
}
/** @method flags=dynamic */
@@ -18511,7 +18644,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_paper_size_new(name);
-@@ -8349,8 +8349,8 @@
+@@ -8349,8 +8349,8 @@ public static final int /*long*/ gtk_paper_size_new(byte [] name) {
}
}
/** @method flags=dynamic */
@@ -18522,7 +18655,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_paper_size_new_from_ppd(ppd_name, ppd_display_name, width, height);
-@@ -8359,8 +8359,8 @@
+@@ -8359,8 +8359,8 @@ public static final int /*long*/ gtk_paper_size_new_from_ppd(byte [] ppd_name, b
}
}
/** @method flags=dynamic */
@@ -18533,7 +18666,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_paper_size_new_custom(name, display_name, width, height, unit);
-@@ -8369,8 +8369,8 @@
+@@ -8369,8 +8369,8 @@ public static final int /*long*/ gtk_paper_size_new_custom(byte [] name, byte []
}
}
/** @method flags=dynamic */
@@ -18544,7 +18677,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_paper_size_get_name(size);
-@@ -8379,8 +8379,8 @@
+@@ -8379,8 +8379,8 @@ public static final int /*long*/ gtk_paper_size_get_name(int /*long*/ size) {
}
}
/** @method flags=dynamic */
@@ -18555,7 +18688,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_paper_size_get_display_name(size);
-@@ -8389,8 +8389,8 @@
+@@ -8389,8 +8389,8 @@ public static final int /*long*/ gtk_paper_size_get_display_name(int /*long*/ si
}
}
/** @method flags=dynamic */
@@ -18566,7 +18699,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_paper_size_get_ppd_name(size);
-@@ -8399,8 +8399,8 @@
+@@ -8399,8 +8399,8 @@ public static final int /*long*/ gtk_paper_size_get_ppd_name(int /*long*/ size)
}
}
/** @method flags=dynamic */
@@ -18577,7 +18710,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_paper_size_get_width(size, unit);
-@@ -8409,8 +8409,8 @@
+@@ -8409,8 +8409,8 @@ public static final double gtk_paper_size_get_width(int /*long*/ size, int unit)
}
}
/** @method flags=dynamic */
@@ -18588,7 +18721,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_paper_size_get_height(size, unit);
-@@ -8419,8 +8419,8 @@
+@@ -8419,8 +8419,8 @@ public static final double gtk_paper_size_get_height(int /*long*/ size, int unit
}
}
/** @method flags=dynamic */
@@ -18599,7 +18732,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_paper_size_is_custom(size);
-@@ -8429,8 +8429,8 @@
+@@ -8429,8 +8429,8 @@ public static final boolean gtk_paper_size_is_custom(int /*long*/ size) {
}
}
/** @param plug cast=(GtkPlug *) */
@@ -18610,7 +18743,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_plug_get_id(plug);
-@@ -8438,8 +8438,8 @@
+@@ -8438,8 +8438,8 @@ public static final int /*long*/ gtk_plug_get_id(int /*long*/ plug) {
lock.unlock();
}
}
@@ -18621,7 +18754,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_plug_new(socket_id);
-@@ -8448,8 +8448,8 @@
+@@ -8448,8 +8448,8 @@ public static final int /*long*/ gtk_plug_new(int /*long*/ socket_id) {
}
}
/** @method flags=dynamic */
@@ -18632,7 +18765,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_printer_get_backend(printer);
-@@ -8458,8 +8458,8 @@
+@@ -8458,8 +8458,8 @@ public static final int /*long*/ gtk_printer_get_backend(int /*long*/ printer) {
}
}
/** @method flags=dynamic */
@@ -18643,7 +18776,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_printer_get_name(printer);
-@@ -8468,8 +8468,8 @@
+@@ -8468,8 +8468,8 @@ public static final int /*long*/ gtk_printer_get_name(int /*long*/ printer) {
}
}
/** @method flags=dynamic */
@@ -18654,7 +18787,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_printer_is_default(printer);
-@@ -8483,8 +8483,8 @@
+@@ -8483,8 +8483,8 @@ public static final boolean gtk_printer_is_default(int /*long*/ printer) {
* @param destroy cast=(GDestroyNotify)
* @param wait cast=(gboolean)
*/
@@ -18665,7 +18798,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_enumerate_printers(func, data, destroy, wait);
-@@ -8496,8 +8496,8 @@
+@@ -8496,8 +8496,8 @@ public static final void gtk_enumerate_printers(int /*long*/ func, int /*long*/d
* @method flags=dynamic
* @param title cast=(const gchar *)
*/
@@ -18676,7 +18809,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_job_new(title, printer, settings, page_setup);
-@@ -8506,8 +8506,8 @@
+@@ -8506,8 +8506,8 @@ public static final int /*long*/ gtk_print_job_new(byte[] title, int /*long*/ pr
}
}
/** @method flags=dynamic */
@@ -18687,7 +18820,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_job_get_settings(job);
-@@ -8516,8 +8516,8 @@
+@@ -8516,8 +8516,8 @@ public static final int /*long*/ gtk_print_job_get_settings(int /*long*/ job) {
}
}
/** @method flags=dynamic */
@@ -18698,7 +18831,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_job_get_printer(job);
-@@ -8526,8 +8526,8 @@
+@@ -8526,8 +8526,8 @@ public static final int /*long*/ gtk_print_job_get_printer(int /*long*/ job) {
}
}
/** @method flags=dynamic */
@@ -18709,7 +18842,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_job_get_title(job);
-@@ -8536,8 +8536,8 @@
+@@ -8536,8 +8536,8 @@ public static final int /*long*/ gtk_print_job_get_title(int /*long*/ job) {
}
}
/** @method flags=dynamic */
@@ -18720,7 +18853,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_job_get_status(job);
-@@ -8550,8 +8550,8 @@
+@@ -8550,8 +8550,8 @@ public static final int gtk_print_job_get_status(int /*long*/ job) {
* @param filename cast=(const gchar *)
* @param error cast=(GError **)
*/
@@ -18731,7 +18864,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_job_set_source_file(job, filename, error);
-@@ -8563,8 +8563,8 @@
+@@ -8563,8 +8563,8 @@ public static final boolean gtk_print_job_set_source_file(int /*long*/ job, byte
* @method flags=dynamic
* @param error cast=(GError **)
*/
@@ -18742,7 +18875,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_job_get_surface(job, error);
-@@ -8577,8 +8577,8 @@
+@@ -8577,8 +8577,8 @@ public static final int /*long*/ gtk_print_job_get_surface(int /*long*/ job, int
* @param user_data cast=(gpointer)
* @param dnotify cast=(GDestroyNotify)
*/
@@ -18753,7 +18886,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_job_send(job, callback, user_data, dnotify);
-@@ -8587,8 +8587,8 @@
+@@ -8587,8 +8587,8 @@ public static final void gtk_print_job_send(int /*long*/ job, int /*long*/ callb
}
}
/** @method flags=dynamic */
@@ -18764,7 +18897,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_settings_new();
-@@ -8600,8 +8600,8 @@
+@@ -8600,8 +8600,8 @@ public static final int /*long*/ gtk_print_settings_new() {
* @method flags=dynamic
* @param data cast=(gpointer)
*/
@@ -18775,7 +18908,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_settings_foreach(settings, func, data);
-@@ -8613,8 +8613,8 @@
+@@ -8613,8 +8613,8 @@ public static final void gtk_print_settings_foreach(int /*long*/ settings, int /
* @method flags=dynamic
* @param key cast=(const gchar *)
*/
@@ -18786,7 +18919,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_settings_get(settings, key);
-@@ -8627,8 +8627,8 @@
+@@ -8627,8 +8627,8 @@ public static final int /*long*/ gtk_print_settings_get(int /*long*/ settings, b
* @param key cast=(const gchar *)
* @param value cast=(const gchar *)
*/
@@ -18797,7 +18930,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_settings_set(settings, key, value);
-@@ -8637,8 +8637,8 @@
+@@ -8637,8 +8637,8 @@ public static final void gtk_print_settings_set(int /*long*/ settings, byte [] k
}
}
/** @method flags=dynamic */
@@ -18808,7 +18941,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_settings_get_printer(settings);
-@@ -8647,8 +8647,8 @@
+@@ -8647,8 +8647,8 @@ public static final int /*long*/ gtk_print_settings_get_printer(int /*long*/ set
}
}
/** @method flags=dynamic */
@@ -18819,7 +18952,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_settings_set_printer(settings, printer);
-@@ -8657,8 +8657,8 @@
+@@ -8657,8 +8657,8 @@ public static final void gtk_print_settings_set_printer(int /*long*/ settings, b
}
}
/** @method flags=dynamic */
@@ -18830,7 +18963,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_settings_get_orientation(settings);
-@@ -8667,8 +8667,8 @@
+@@ -8667,8 +8667,8 @@ public static final int gtk_print_settings_get_orientation(int /*long*/ settings
}
}
/** @method flags=dynamic */
@@ -18841,7 +18974,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_settings_set_orientation(settings, orientation);
-@@ -8677,8 +8677,8 @@
+@@ -8677,8 +8677,8 @@ public static final void gtk_print_settings_set_orientation(int /*long*/ setting
}
}
/** @method flags=dynamic */
@@ -18852,7 +18985,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_settings_get_collate(settings);
-@@ -8690,8 +8690,8 @@
+@@ -8690,8 +8690,8 @@ public static final boolean gtk_print_settings_get_collate(int /*long*/ settings
* @method flags=dynamic
* @param collate cast=(gboolean)
*/
@@ -18863,7 +18996,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_settings_set_collate(settings, collate);
-@@ -8700,8 +8700,8 @@
+@@ -8700,8 +8700,8 @@ public static final void gtk_print_settings_set_collate(int /*long*/ settings, b
}
}
/** @method flags=dynamic */
@@ -18874,7 +19007,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_settings_get_n_copies(settings);
-@@ -8713,8 +8713,8 @@
+@@ -8713,8 +8713,8 @@ public static final int gtk_print_settings_get_n_copies(int /*long*/ settings) {
* @method flags=dynamic
* @param num_copies cast=(gint)
*/
@@ -18885,7 +19018,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_settings_set_n_copies(settings, num_copies);
-@@ -8723,8 +8723,8 @@
+@@ -8723,8 +8723,8 @@ public static final void gtk_print_settings_set_n_copies(int /*long*/ settings,
}
}
/** @method flags=dynamic */
@@ -18896,7 +19029,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_settings_get_print_pages(settings);
-@@ -8733,8 +8733,8 @@
+@@ -8733,8 +8733,8 @@ public static final int gtk_print_settings_get_print_pages(int /*long*/ settings
}
}
/** @method flags=dynamic */
@@ -18907,7 +19040,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_settings_set_print_pages(settings, pages);
-@@ -8746,8 +8746,8 @@
+@@ -8746,8 +8746,8 @@ public static final void gtk_print_settings_set_print_pages(int /*long*/ setting
* @method flags=dynamic
* @param num_ranges cast=(gint *)
*/
@@ -18918,7 +19051,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_settings_get_page_ranges(settings, num_ranges);
-@@ -8759,8 +8759,8 @@
+@@ -8759,8 +8759,8 @@ public static final int /*long*/ gtk_print_settings_get_page_ranges(int /*long*/
* @method flags=dynamic
* @param num_ranges cast=(gint)
*/
@@ -18929,7 +19062,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_settings_set_page_ranges(settings, page_ranges, num_ranges);
-@@ -8769,8 +8769,8 @@
+@@ -8769,8 +8769,8 @@ public static final void gtk_print_settings_set_page_ranges(int /*long*/ setting
}
}
/** @method flags=dynamic */
@@ -18940,7 +19073,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_settings_get_paper_width(settings, unit);
-@@ -8779,8 +8779,8 @@
+@@ -8779,8 +8779,8 @@ public static final double gtk_print_settings_get_paper_width(int /*long*/ setti
}
}
/** @method flags=dynamic */
@@ -18951,7 +19084,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_settings_get_paper_height(settings, unit);
-@@ -8789,8 +8789,8 @@
+@@ -8789,8 +8789,8 @@ public static final double gtk_print_settings_get_paper_height(int /*long*/ sett
}
}
/** @method flags=dynamic */
@@ -18962,7 +19095,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_settings_get_resolution(settings);
-@@ -8803,8 +8803,8 @@
+@@ -8803,8 +8803,8 @@ public static final int gtk_print_settings_get_resolution(int /*long*/ settings)
* @param title cast=(const gchar *)
* @param parent cast=(GtkWindow *)
*/
@@ -18973,7 +19106,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_unix_dialog_new(title, parent);
-@@ -8813,8 +8813,8 @@
+@@ -8813,8 +8813,8 @@ public static final int /*long*/ gtk_print_unix_dialog_new(byte[] title, int /*l
}
}
/** @method flags=dynamic */
@@ -18984,7 +19117,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_unix_dialog_set_page_setup(dialog, page_setup);
-@@ -8823,8 +8823,8 @@
+@@ -8823,8 +8823,8 @@ public static final void gtk_print_unix_dialog_set_page_setup(int /*long*/ dialo
}
}
/** @method flags=dynamic */
@@ -18995,7 +19128,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_unix_dialog_get_page_setup(dialog);
-@@ -8836,8 +8836,8 @@
+@@ -8836,8 +8836,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_page_setup(int /*long
* @method flags=dynamic
* @param current_page cast=(gint)
*/
@@ -19006,7 +19139,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_unix_dialog_set_current_page(dialog, current_page);
-@@ -8846,8 +8846,8 @@
+@@ -8846,8 +8846,8 @@ public static final void gtk_print_unix_dialog_set_current_page(int /*long*/ dia
}
}
/** @method flags=dynamic */
@@ -19017,7 +19150,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_unix_dialog_get_current_page(dialog);
-@@ -8856,8 +8856,8 @@
+@@ -8856,8 +8856,8 @@ public static final int gtk_print_unix_dialog_get_current_page(int /*long*/ dial
}
}
/** @method flags=dynamic */
@@ -19028,7 +19161,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_unix_dialog_set_settings(dialog, settings);
-@@ -8866,8 +8866,8 @@
+@@ -8866,8 +8866,8 @@ public static final void gtk_print_unix_dialog_set_settings(int /*long*/ dialog,
}
}
/** @method flags=dynamic */
@@ -19039,7 +19172,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_unix_dialog_get_settings(dialog);
-@@ -8876,8 +8876,8 @@
+@@ -8876,8 +8876,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_settings(int /*long*/
}
}
/** @method flags=dynamic */
@@ -19050,7 +19183,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_print_unix_dialog_get_selected_printer(dialog);
-@@ -8886,8 +8886,8 @@
+@@ -8886,8 +8886,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_selected_printer(int
}
}
/** @method flags=dynamic */
@@ -19061,7 +19194,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_print_unix_dialog_set_manual_capabilities(dialog, capabilities);
-@@ -8895,8 +8895,8 @@
+@@ -8895,8 +8895,8 @@ public static final void gtk_print_unix_dialog_set_manual_capabilities(int /*lon
lock.unlock();
}
}
@@ -19072,7 +19205,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_progress_bar_new();
-@@ -8905,8 +8905,8 @@
+@@ -8905,8 +8905,8 @@ public static final int /*long*/ gtk_progress_bar_new() {
}
}
/** @param pbar cast=(GtkProgressBar *) */
@@ -19083,7 +19216,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_progress_bar_pulse(pbar);
-@@ -8918,8 +8918,8 @@
+@@ -8918,8 +8918,8 @@ public static final void gtk_progress_bar_pulse(int /*long*/ pbar) {
* @param pbar cast=(GtkProgressBar *)
* @param fraction cast=(gdouble)
*/
@@ -19094,7 +19227,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_progress_bar_set_fraction(pbar, fraction);
-@@ -8931,8 +8931,8 @@
+@@ -8931,8 +8931,8 @@ public static final void gtk_progress_bar_set_fraction(int /*long*/ pbar, double
* @param pbar cast=(GtkProgressBar *)
* @param orientation cast=(GtkProgressBarOrientation)
*/
@@ -19105,7 +19238,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_progress_bar_set_orientation(pbar, orientation);
-@@ -8941,8 +8941,8 @@
+@@ -8941,8 +8941,8 @@ public static final void gtk_progress_bar_set_orientation(int /*long*/ pbar, int
}
}
/** @param radio_button cast=(GtkRadioButton *) */
@@ -19116,7 +19249,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_radio_button_get_group(radio_button);
-@@ -8951,8 +8951,8 @@
+@@ -8951,8 +8951,8 @@ public static final int /*long*/ gtk_radio_button_get_group(int /*long*/ radio_b
}
}
/** @param group cast=(GSList *) */
@@ -19127,7 +19260,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_radio_button_new(group);
-@@ -8961,8 +8961,8 @@
+@@ -8961,8 +8961,8 @@ public static final int /*long*/ gtk_radio_button_new(int /*long*/ group) {
}
}
/** @param radio_menu_item cast=(GtkRadioMenuItem *) */
@@ -19138,7 +19271,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_radio_menu_item_get_group(radio_menu_item);
-@@ -8971,8 +8971,8 @@
+@@ -8971,8 +8971,8 @@ public static final int /*long*/ gtk_radio_menu_item_get_group(int /*long*/ radi
}
}
/** @param group cast=(GSList *) */
@@ -19149,7 +19282,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_radio_menu_item_new(group);
-@@ -8984,8 +8984,8 @@
+@@ -8984,8 +8984,8 @@ public static final int /*long*/ gtk_radio_menu_item_new(int /*long*/ group) {
* @param group cast=(GSList *)
* @param label cast=(const gchar *)
*/
@@ -19160,7 +19293,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_radio_menu_item_new_with_label(group, label);
-@@ -8994,8 +8994,8 @@
+@@ -8994,8 +8994,8 @@ public static final int /*long*/ gtk_radio_menu_item_new_with_label(int /*long*/
}
}
/** @param range cast=(GtkRange *) */
@@ -19171,7 +19304,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_range_get_adjustment(range);
-@@ -9004,8 +9004,8 @@
+@@ -9004,8 +9004,8 @@ public static final int /*long*/ gtk_range_get_adjustment(int /*long*/ range) {
}
}
/** @param range cast=(GtkRange *) */
@@ -19182,7 +19315,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_range_set_increments(range, step, page);
-@@ -9014,8 +9014,8 @@
+@@ -9014,8 +9014,8 @@ public static final void gtk_range_set_increments(int /*long*/ range, double ste
}
}
/** @param range cast=(GtkRange *) */
@@ -19193,7 +19326,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_range_set_inverted(range, setting);
-@@ -9024,8 +9024,8 @@
+@@ -9024,8 +9024,8 @@ public static final void gtk_range_set_inverted(int /*long*/ range, boolean sett
}
}
/** @param range cast=(GtkRange *) */
@@ -19204,7 +19337,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_range_set_range(range, min, max);
-@@ -9034,8 +9034,8 @@
+@@ -9034,8 +9034,8 @@ public static final void gtk_range_set_range(int /*long*/ range, double min, dou
}
}
/** @param range cast=(GtkRange *) */
@@ -19215,7 +19348,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_range_set_value(range, value);
-@@ -9054,8 +9054,8 @@
+@@ -9054,8 +9054,8 @@ public static final void gtk_rc_parse_string(byte[] rc_string) {
}
}
/** @param style cast=(GtkRcStyle *) */
@@ -19226,7 +19359,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_rc_style_get_bg_pixmap_name(style, index);
-@@ -9064,8 +9064,8 @@
+@@ -9064,8 +9064,8 @@ public static final int /*long*/ gtk_rc_style_get_bg_pixmap_name(int /*long*/ st
}
}
/** @param style cast=(GtkRcStyle *) */
@@ -19237,7 +19370,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_rc_style_get_color_flags(style, index);
-@@ -9077,8 +9077,8 @@
+@@ -9077,8 +9077,8 @@ public static final int gtk_rc_style_get_color_flags(int /*long*/ style, int ind
* @param style cast=(GtkRcStyle *)
* @param color flags=no_out
*/
@@ -19248,7 +19381,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_rc_style_set_bg(style, index, color);
-@@ -9090,8 +9090,8 @@
+@@ -9090,8 +9090,8 @@ public static final void gtk_rc_style_set_bg(int /*long*/ style, int index, GdkC
* @param style cast=(GtkRcStyle *)
* @param name cast=(char *)
*/
@@ -19259,7 +19392,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_rc_style_set_bg_pixmap_name(style, index, name);
-@@ -9100,8 +9100,8 @@
+@@ -9100,8 +9100,8 @@ public static final void gtk_rc_style_set_bg_pixmap_name(int /*long*/ style, int
}
}
/** @param style cast=(GtkRcStyle *) */
@@ -19270,7 +19403,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_rc_style_set_color_flags(style, index, flag);
-@@ -9113,8 +9113,8 @@
+@@ -9113,8 +9113,8 @@ public static final void gtk_rc_style_set_color_flags(int /*long*/ style, int in
* @param scale cast=(GtkScale *)
* @param digits cast=(gint)
*/
@@ -19281,7 +19414,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_scale_set_digits(scale, digits);
-@@ -9126,8 +9126,8 @@
+@@ -9126,8 +9126,8 @@ public static final void gtk_scale_set_digits(int /*long*/ scale, int digits) {
* @param scale cast=(GtkScale *)
* @param draw_value cast=(gboolean)
*/
@@ -19292,7 +19425,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_scale_set_draw_value(scale, draw_value);
-@@ -9139,8 +9139,8 @@
+@@ -9139,8 +9139,8 @@ public static final void gtk_scale_set_draw_value(int /*long*/ scale, boolean dr
* @param style cast=(GtkRcStyle *)
* @param color flags=no_out
*/
@@ -19303,7 +19436,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_rc_style_set_fg(style, index, color);
-@@ -9152,8 +9152,8 @@
+@@ -9152,8 +9152,8 @@ public static final void gtk_rc_style_set_fg(int /*long*/ style, int index, GdkC
* @param style cast=(GtkRcStyle *)
* @param color flags=no_out
*/
@@ -19314,7 +19447,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_rc_style_set_text(style, index, color);
-@@ -9165,8 +9165,8 @@
+@@ -9165,8 +9165,8 @@ public static final void gtk_rc_style_set_text(int /*long*/ style, int index, Gd
* @param scrolled_window cast=(GtkScrolledWindow *)
* @param child cast=(GtkWidget *)
*/
@@ -19325,7 +19458,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_scrolled_window_add_with_viewport(scrolled_window, child);
-@@ -9175,8 +9175,8 @@
+@@ -9175,8 +9175,8 @@ public static final void gtk_scrolled_window_add_with_viewport(int /*long*/ scro
}
}
/** @param scrolled_window cast=(GtkScrolledWindow *) */
@@ -19336,7 +19469,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_scrolled_window_get_hadjustment(scrolled_window);
-@@ -9189,8 +9189,8 @@
+@@ -9189,8 +9189,8 @@ public static final int /*long*/ gtk_scrolled_window_get_hadjustment(int /*long*
* @param hscrollbar_policy cast=(GtkPolicyType *)
* @param vscrollbar_policy cast=(GtkPolicyType *)
*/
@@ -19347,7 +19480,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_scrolled_window_get_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy);
-@@ -9199,8 +9199,8 @@
+@@ -9199,8 +9199,8 @@ public static final void gtk_scrolled_window_get_policy(int /*long*/ scrolled_wi
}
}
/** @param scrolled_window cast=(GtkScrolledWindow *) */
@@ -19358,7 +19491,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_scrolled_window_get_shadow_type(scrolled_window);
-@@ -9209,8 +9209,8 @@
+@@ -9209,8 +9209,8 @@ public static final int gtk_scrolled_window_get_shadow_type(int /*long*/ scrolle
}
}
/** @param scrolled_window cast=(GtkScrolledWindow *) */
@@ -19369,7 +19502,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_scrolled_window_get_vadjustment(scrolled_window);
-@@ -9222,8 +9222,8 @@
+@@ -9222,8 +9222,8 @@ public static final int /*long*/ gtk_scrolled_window_get_vadjustment(int /*long*
* @param hadjustment cast=(GtkAdjustment *)
* @param vadjustment cast=(GtkAdjustment *)
*/
@@ -19380,7 +19513,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_scrolled_window_new(hadjustment, vadjustment);
-@@ -9235,8 +9235,8 @@
+@@ -9235,8 +9235,8 @@ public static final int /*long*/ gtk_scrolled_window_new(int /*long*/ hadjustmen
* @param scrolled_window cast=(GtkScrolledWindow *)
* @param placement cast=(GtkCornerType)
*/
@@ -19391,7 +19524,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_scrolled_window_set_placement(scrolled_window, placement);
-@@ -9249,8 +9249,8 @@
+@@ -9249,8 +9249,8 @@ public static final void gtk_scrolled_window_set_placement(int /*long*/ scrolled
* @param hscrollbar_policy cast=(GtkPolicyType)
* @param vscrollbar_policy cast=(GtkPolicyType)
*/
@@ -19402,7 +19535,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_scrolled_window_set_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy);
-@@ -9262,8 +9262,8 @@
+@@ -9262,8 +9262,8 @@ public static final void gtk_scrolled_window_set_policy(int /*long*/ scrolled_wi
* @param scrolled_window cast=(GtkScrolledWindow *)
* @param type cast=(GtkShadowType)
*/
@@ -19413,7 +19546,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_scrolled_window_set_shadow_type(scrolled_window, type);
-@@ -9271,8 +9271,8 @@
+@@ -9271,8 +9271,8 @@ public static final void gtk_scrolled_window_set_shadow_type(int /*long*/ scroll
lock.unlock();
}
}
@@ -19424,7 +19557,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_settings_get_default();
-@@ -9281,8 +9281,8 @@
+@@ -9281,8 +9281,8 @@ public static final int /*long*/ gtk_settings_get_default() {
}
}
/** @param selection_data cast=(GtkSelectionData *) */
@@ -19435,7 +19568,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_selection_data_free(selection_data);
-@@ -9297,8 +9297,8 @@
+@@ -9297,8 +9297,8 @@ public static final void gtk_selection_data_free(int /*long*/ selection_data) {
* @param data cast=(const guchar *)
* @param length cast=(gint)
*/
@@ -19446,7 +19579,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_selection_data_set(selection_data, type, format, data, length);
-@@ -9306,8 +9306,8 @@
+@@ -9306,8 +9306,8 @@ public static final void gtk_selection_data_set(int /*long*/ selection_data, int
lock.unlock();
}
}
@@ -19457,7 +19590,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_separator_menu_item_new();
-@@ -9315,8 +9315,8 @@
+@@ -9315,8 +9315,8 @@ public static final int /*long*/ gtk_separator_menu_item_new() {
lock.unlock();
}
}
@@ -19468,7 +19601,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_set_locale();
-@@ -9325,8 +9325,8 @@
+@@ -9325,8 +9325,8 @@ public static final int /*long*/ gtk_set_locale() {
}
}
/** @param socket cast=(GtkSocket *) */
@@ -19479,7 +19612,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_socket_get_id(socket);
-@@ -9334,8 +9334,8 @@
+@@ -9334,8 +9334,8 @@ public static final int /*long*/ gtk_socket_get_id(int /*long*/ socket) {
lock.unlock();
}
}
@@ -19490,7 +19623,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_socket_new();
-@@ -9344,8 +9344,8 @@
+@@ -9344,8 +9344,8 @@ public static final int /*long*/ gtk_socket_new() {
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -19501,7 +19634,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_spin_button_new(adjustment, climb_rate, digits);
-@@ -9354,8 +9354,8 @@
+@@ -9354,8 +9354,8 @@ public static final int /*long*/ gtk_spin_button_new(int /*long*/ adjustment, do
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -19512,7 +19645,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_spin_button_get_adjustment(spin_button);
-@@ -9365,8 +9365,8 @@
+@@ -9365,8 +9365,8 @@ public static final int /*long*/ gtk_spin_button_get_adjustment(int /*long*/ spi
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -19523,7 +19656,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_spin_button_get_digits(spin_button);
-@@ -9375,8 +9375,8 @@
+@@ -9375,8 +9375,8 @@ public static final int gtk_spin_button_get_digits(int /*long*/ spin_button) {
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -19534,7 +19667,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_spin_button_set_digits(spin_button, digits);
-@@ -9385,8 +9385,8 @@
+@@ -9385,8 +9385,8 @@ public static final void gtk_spin_button_set_digits(int /*long*/ spin_button, in
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -19545,7 +19678,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_spin_button_set_increments(spin_button, step, page);
-@@ -9395,8 +9395,8 @@
+@@ -9395,8 +9395,8 @@ public static final void gtk_spin_button_set_increments(int /*long*/ spin_button
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -19556,7 +19689,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_spin_button_set_range(spin_button, max, min);
-@@ -9405,8 +9405,8 @@
+@@ -9405,8 +9405,8 @@ public static final void gtk_spin_button_set_range(int /*long*/ spin_button, dou
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -19567,7 +19700,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_spin_button_set_value(spin_button, value);
-@@ -9415,8 +9415,8 @@
+@@ -9415,8 +9415,8 @@ public static final void gtk_spin_button_set_value(int /*long*/ spin_button, dou
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -19578,7 +19711,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_spin_button_set_wrap(spin_button, wrap);
-@@ -9425,8 +9425,8 @@
+@@ -9425,8 +9425,8 @@ public static final void gtk_spin_button_set_wrap(int /*long*/ spin_button, bool
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -19589,7 +19722,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_spin_button_update(spin_button);
-@@ -9437,8 +9437,8 @@
+@@ -9437,8 +9437,8 @@ public static final void gtk_spin_button_update(int /*long*/ spin_button) {
/**
* @method flags=dynamic
*/
@@ -19600,7 +19733,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_status_icon_get_geometry(handle, screen, area, orientation);
-@@ -9449,8 +9449,8 @@
+@@ -9449,8 +9449,8 @@ public static final boolean gtk_status_icon_get_geometry(int /*long*/ handle, in
/**
* @method flags=dynamic
*/
@@ -19611,7 +19744,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_status_icon_get_visible(handle);
-@@ -9459,8 +9459,8 @@
+@@ -9459,8 +9459,8 @@ public static final boolean gtk_status_icon_get_visible(int /*long*/ handle) {
}
}
/** @method flags=dynamic */
@@ -19622,7 +19755,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_status_icon_new();
-@@ -9471,8 +9471,8 @@
+@@ -9471,8 +9471,8 @@ public static final int /*long*/ gtk_status_icon_new() {
/**
* @method flags=dynamic
*/
@@ -19633,7 +19766,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_status_icon_set_from_pixbuf(handle, pixbuf);
-@@ -9483,8 +9483,8 @@
+@@ -9483,8 +9483,8 @@ public static final void gtk_status_icon_set_from_pixbuf(int /*long*/ handle, in
/**
* @method flags=dynamic
*/
@@ -19644,7 +19777,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_status_icon_set_visible(handle, visible);
-@@ -9495,8 +9495,8 @@
+@@ -9495,8 +9495,8 @@ public static final void gtk_status_icon_set_visible(int /*long*/ handle, boolea
/**
* @method flags=dynamic
*/
@@ -19655,7 +19788,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_status_icon_set_tooltip(handle, tip_text);
-@@ -9508,8 +9508,8 @@
+@@ -9508,8 +9508,8 @@ public static final void gtk_status_icon_set_tooltip(int /*long*/ handle, byte[]
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -19666,7 +19799,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_base(style, index, color);
-@@ -9521,8 +9521,8 @@
+@@ -9521,8 +9521,8 @@ public static final void gtk_style_get_base(int /*long*/ style, int index, GdkCo
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -19677,7 +19810,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_black(style, color);
-@@ -9534,8 +9534,8 @@
+@@ -9534,8 +9534,8 @@ public static final void gtk_style_get_black(int /*long*/ style, GdkColor color)
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -19688,7 +19821,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_bg(style, index, color);
-@@ -9547,8 +9547,8 @@
+@@ -9547,8 +9547,8 @@ public static final void gtk_style_get_bg(int /*long*/ style, int index, GdkColo
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -19699,7 +19832,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_dark(style, index, color);
-@@ -9560,8 +9560,8 @@
+@@ -9560,8 +9560,8 @@ public static final void gtk_style_get_dark(int /*long*/ style, int index, GdkCo
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -19710,7 +19843,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_fg(style, index, color);
-@@ -9573,8 +9573,8 @@
+@@ -9573,8 +9573,8 @@ public static final void gtk_style_get_fg(int /*long*/ style, int index, GdkColo
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **),flags=no_in
*/
@@ -19721,7 +19854,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_fg_gc(style, index, gc);
-@@ -9586,8 +9586,8 @@
+@@ -9586,8 +9586,8 @@ public static final void gtk_style_get_fg_gc(int /*long*/ style, int index, int
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **),flags=no_in
*/
@@ -19732,7 +19865,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_bg_gc(style, index, gc);
-@@ -9599,8 +9599,8 @@
+@@ -9599,8 +9599,8 @@ public static final void gtk_style_get_bg_gc(int /*long*/ style, int index, int
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -19743,7 +19876,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_light_gc(style, index, gc);
-@@ -9612,8 +9612,8 @@
+@@ -9612,8 +9612,8 @@ public static final void gtk_style_get_light_gc(int /*long*/ style, int index, i
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **),flags=no_in
*/
@@ -19754,7 +19887,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_dark_gc(style, index, gc);
-@@ -9625,8 +9625,8 @@
+@@ -9625,8 +9625,8 @@ public static final void gtk_style_get_dark_gc(int /*long*/ style, int index, in
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -19765,7 +19898,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_mid_gc(style, index, gc);
-@@ -9638,8 +9638,8 @@
+@@ -9638,8 +9638,8 @@ public static final void gtk_style_get_mid_gc(int /*long*/ style, int index, int
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -19776,7 +19909,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_text_gc(style, index, gc);
-@@ -9651,8 +9651,8 @@
+@@ -9651,8 +9651,8 @@ public static final void gtk_style_get_text_gc(int /*long*/ style, int index, in
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -19787,7 +19920,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_text_aa_gc(style, index, gc);
-@@ -9664,8 +9664,8 @@
+@@ -9664,8 +9664,8 @@ public static final void gtk_style_get_text_aa_gc(int /*long*/ style, int index,
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **),flags=no_in
*/
@@ -19798,7 +19931,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_black_gc(style, gc);
-@@ -9677,8 +9677,8 @@
+@@ -9677,8 +9677,8 @@ public static final void gtk_style_get_black_gc(int /*long*/ style, int /*long*/
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -19809,7 +19942,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_white_gc(style, gc);
-@@ -9687,8 +9687,8 @@
+@@ -9687,8 +9687,8 @@ public static final void gtk_style_get_white_gc(int /*long*/ style, int /*long*/
}
}
/** @param style cast=(GtkStyle *) */
@@ -19820,7 +19953,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_style_get_font_desc(style);
-@@ -9700,8 +9700,8 @@
+@@ -9700,8 +9700,8 @@ public static final int /*long*/ gtk_style_get_font_desc(int /*long*/ style) {
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -19831,7 +19964,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_light(style, index, color);
-@@ -9713,8 +9713,8 @@
+@@ -9713,8 +9713,8 @@ public static final void gtk_style_get_light(int /*long*/ style, int index, GdkC
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -19842,7 +19975,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_style_get_text(style, index, color);
-@@ -9723,8 +9723,8 @@
+@@ -9723,8 +9723,8 @@ public static final void gtk_style_get_text(int /*long*/ style, int index, GdkCo
}
}
/** @param style cast=(GtkStyle *) */
@@ -19853,7 +19986,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_style_get_xthickness(style);
-@@ -9733,8 +9733,8 @@
+@@ -9733,8 +9733,8 @@ public static final int gtk_style_get_xthickness(int /*long*/ style) {
}
}
/** @param style cast=(GtkStyle *) */
@@ -19864,7 +19997,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_style_get_ythickness(style);
-@@ -9748,8 +9748,8 @@
+@@ -9748,8 +9748,8 @@ public static final int gtk_style_get_ythickness(int /*long*/ style) {
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -19875,7 +20008,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_style_render_icon(style, source, direction, state, size, widget, detail);
-@@ -9761,8 +9761,8 @@
+@@ -9761,8 +9761,8 @@ public static final int /*long*/ gtk_style_render_icon(int /*long*/ style, int /
* @param targets cast=(const GtkTargetEntry *)
* @param ntargets cast=(guint)
*/
@@ -19886,7 +20019,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_target_list_new(targets, ntargets);
-@@ -9771,8 +9771,8 @@
+@@ -9771,8 +9771,8 @@ public static final int /*long*/ gtk_target_list_new(int /*long*/ targets, int n
}
}
/** @param list cast=(GtkTargetList *) */
@@ -19897,7 +20030,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_target_list_unref(list);
-@@ -9784,8 +9784,8 @@
+@@ -9784,8 +9784,8 @@ public static final void gtk_target_list_unref(int /*long*/ list) {
* @param buffer cast=(GtkTextBuffer *)
* @param clipboard cast=(GtkClipboard *)
*/
@@ -19908,7 +20041,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_copy_clipboard(buffer, clipboard);
-@@ -9798,8 +9798,8 @@
+@@ -9798,8 +9798,8 @@ public static final void gtk_text_buffer_copy_clipboard(int /*long*/ buffer, int
* @param clipboard cast=(GtkClipboard *)
* @param default_editable cast=(gboolean)
*/
@@ -19919,7 +20052,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_cut_clipboard(buffer, clipboard, default_editable);
-@@ -9812,8 +9812,8 @@
+@@ -9812,8 +9812,8 @@ public static final void gtk_text_buffer_cut_clipboard(int /*long*/ buffer, int
* @param start cast=(GtkTextIter *)
* @param end cast=(GtkTextIter *)
*/
@@ -19930,7 +20063,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_delete(buffer, start, end);
-@@ -9826,8 +9826,8 @@
+@@ -9826,8 +9826,8 @@ public static final void gtk_text_buffer_delete(int /*long*/ buffer, byte[] star
* @param start cast=(GtkTextIter *)
* @param end cast=(GtkTextIter *)
*/
@@ -19941,7 +20074,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_get_bounds(buffer, start, end);
-@@ -9836,8 +9836,8 @@
+@@ -9836,8 +9836,8 @@ public static final void gtk_text_buffer_get_bounds(int /*long*/ buffer, byte[]
}
}
/** @param buffer cast=(GtkTextBuffer *) */
@@ -19952,7 +20085,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_text_buffer_get_char_count(buffer);
-@@ -9849,8 +9849,8 @@
+@@ -9849,8 +9849,8 @@ public static final int gtk_text_buffer_get_char_count(int /*long*/ buffer) {
* @param buffer cast=(GtkTextBuffer *)
* @param iter cast=(GtkTextIter *)
*/
@@ -19963,7 +20096,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_get_end_iter(buffer, iter);
-@@ -9859,8 +9859,8 @@
+@@ -9859,8 +9859,8 @@ public static final void gtk_text_buffer_get_end_iter(int /*long*/ buffer, byte[
}
}
/** @param buffer cast=(GtkTextBuffer *) */
@@ -19974,7 +20107,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_text_buffer_get_insert(buffer);
-@@ -9873,8 +9873,8 @@
+@@ -9873,8 +9873,8 @@ public static final int /*long*/ gtk_text_buffer_get_insert(int /*long*/ buffer)
* @param iter cast=(GtkTextIter *)
* @param line_number cast=(gint)
*/
@@ -19985,7 +20118,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_get_iter_at_line(buffer, iter, line_number);
-@@ -9887,8 +9887,8 @@
+@@ -9887,8 +9887,8 @@ public static final void gtk_text_buffer_get_iter_at_line(int /*long*/ buffer, b
* @param iter cast=(GtkTextIter *)
* @param mark cast=(GtkTextMark *)
*/
@@ -19996,7 +20129,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
-@@ -9901,8 +9901,8 @@
+@@ -9901,8 +9901,8 @@ public static final void gtk_text_buffer_get_iter_at_mark(int /*long*/ buffer, b
* @param iter cast=(GtkTextIter *)
* @param char_offset cast=(gint)
*/
@@ -20007,7 +20140,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_get_iter_at_offset(buffer, iter, char_offset);
-@@ -9911,8 +9911,8 @@
+@@ -9911,8 +9911,8 @@ public static final void gtk_text_buffer_get_iter_at_offset(int /*long*/ buffer,
}
}
/** @param buffer cast=(GtkTextBuffer *) */
@@ -20018,7 +20151,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_text_buffer_get_line_count(buffer);
-@@ -9921,8 +9921,8 @@
+@@ -9921,8 +9921,8 @@ public static final int gtk_text_buffer_get_line_count(int /*long*/ buffer) {
}
}
/** @param buffer cast=(GtkTextBuffer *) */
@@ -20029,7 +20162,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_text_buffer_get_selection_bound(buffer);
-@@ -9935,8 +9935,8 @@
+@@ -9935,8 +9935,8 @@ public static final int /*long*/ gtk_text_buffer_get_selection_bound(int /*long*
* @param start cast=(GtkTextIter *)
* @param end cast=(GtkTextIter *)
*/
@@ -20040,7 +20173,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_text_buffer_get_selection_bounds(buffer, start, end);
-@@ -9950,8 +9950,8 @@
+@@ -9950,8 +9950,8 @@ public static final boolean gtk_text_buffer_get_selection_bounds(int /*long*/ bu
* @param end cast=(GtkTextIter *)
* @param include_hidden_chars cast=(gboolean)
*/
@@ -20051,7 +20184,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_text_buffer_get_text(buffer, start, end, include_hidden_chars);
-@@ -9965,8 +9965,8 @@
+@@ -9965,8 +9965,8 @@ public static final int /*long*/ gtk_text_buffer_get_text(int /*long*/ buffer, b
* @param text cast=(const gchar *)
* @param len cast=(gint)
*/
@@ -20062,7 +20195,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_insert(buffer, iter, text, len);
-@@ -9980,8 +9980,8 @@
+@@ -9980,8 +9980,8 @@ public static final void gtk_text_buffer_insert(int /*long*/ buffer, byte[] iter
* @param text cast=(const gchar *)
* @param len cast=(gint)
*/
@@ -20073,7 +20206,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_insert(buffer, iter, text, len);
-@@ -9994,8 +9994,8 @@
+@@ -9994,8 +9994,8 @@ public static final void gtk_text_buffer_insert(int /*long*/ buffer, int /*long*
* @param mark cast=(GtkTextMark *)
* @param where cast=(const GtkTextIter *)
*/
@@ -20084,7 +20217,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_move_mark(buffer, mark, where);
-@@ -10009,8 +10009,8 @@
+@@ -10009,8 +10009,8 @@ public static final void gtk_text_buffer_move_mark(int /*long*/ buffer, int /*lo
* @param override_location cast=(GtkTextIter *)
* @param default_editable cast=(gboolean)
*/
@@ -20095,7 +20228,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_paste_clipboard(buffer, clipboard, override_location, default_editable);
-@@ -10022,8 +10022,8 @@
+@@ -10022,8 +10022,8 @@ public static final void gtk_text_buffer_paste_clipboard(int /*long*/ buffer, in
* @param buffer cast=(GtkTextBuffer *)
* @param where cast=(const GtkTextIter *)
*/
@@ -20106,7 +20239,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_place_cursor(buffer, where);
-@@ -10036,8 +10036,8 @@
+@@ -10036,8 +10036,8 @@ public static final void gtk_text_buffer_place_cursor(int /*long*/ buffer, byte[
* @param text cast=(const gchar *)
* @param len cast=(gint)
*/
@@ -20117,7 +20250,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_buffer_set_text(buffer, text, len);
-@@ -10073,8 +10073,8 @@
+@@ -10073,8 +10073,8 @@ public static final int gtk_text_iter_get_offset(byte[] iter) {
* @param window_x cast=(gint *)
* @param window_y cast=(gint *)
*/
@@ -20128,7 +20261,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_view_buffer_to_window_coords(text_view, win, buffer_x, buffer_y, window_x, window_y);
-@@ -10083,8 +10083,8 @@
+@@ -10083,8 +10083,8 @@ public static final void gtk_text_view_buffer_to_window_coords(int /*long*/ text
}
}
/** @param text_view cast=(GtkTextView *) */
@@ -20139,7 +20272,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_text_view_get_buffer(text_view);
-@@ -10093,8 +10093,8 @@
+@@ -10093,8 +10093,8 @@ public static final int /*long*/ gtk_text_view_get_buffer(int /*long*/ text_view
}
}
/** @param text_view cast=(GtkTextView *) */
@@ -20150,7 +20283,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_text_view_get_editable(text_view);
-@@ -10108,8 +10108,8 @@
+@@ -10108,8 +10108,8 @@ public static final boolean gtk_text_view_get_editable(int /*long*/ text_view) {
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -20161,7 +20294,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_view_get_iter_at_location(text_view, iter, x, y);
-@@ -10122,8 +10122,8 @@
+@@ -10122,8 +10122,8 @@ public static final void gtk_text_view_get_iter_at_location(int /*long*/ text_vi
* @param iter cast=(const GtkTextIter *)
* @param location cast=(GdkRectangle *),flags=no_in
*/
@@ -20172,7 +20305,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_view_get_iter_location(text_view, iter, location);
-@@ -10137,8 +10137,8 @@
+@@ -10137,8 +10137,8 @@ public static final void gtk_text_view_get_iter_location(int /*long*/ text_view,
* @param y cast=(gint)
* @param line_top cast=(gint *)
*/
@@ -20183,7 +20316,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_view_get_line_at_y(text_view, target_iter, y, line_top);
-@@ -10150,8 +10150,8 @@
+@@ -10150,8 +10150,8 @@ public static final void gtk_text_view_get_line_at_y(int /*long*/ text_view, byt
* @param text_view cast=(GtkTextView *)
* @param visible_rect cast=(GdkRectangle *),flags=no_in
*/
@@ -20194,7 +20327,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_view_get_visible_rect(text_view, visible_rect);
-@@ -10163,8 +10163,8 @@
+@@ -10163,8 +10163,8 @@ public static final void gtk_text_view_get_visible_rect(int /*long*/ text_view,
* @param text_view cast=(GtkTextView *)
* @param win cast=(GtkTextWindowType)
*/
@@ -20205,7 +20338,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_text_view_get_window(text_view, win);
-@@ -10172,8 +10172,8 @@
+@@ -10172,8 +10172,8 @@ public static final int /*long*/ gtk_text_view_get_window(int /*long*/ text_view
lock.unlock();
}
}
@@ -20216,7 +20349,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_text_view_new();
-@@ -10185,8 +10185,8 @@
+@@ -10185,8 +10185,8 @@ public static final int /*long*/ gtk_text_view_new() {
* @param text_view cast=(GtkTextView *)
* @param mark cast=(GtkTextMark *)
*/
@@ -20227,7 +20360,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_view_scroll_mark_onscreen(text_view, mark);
-@@ -10202,8 +10202,8 @@
+@@ -10202,8 +10202,8 @@ public static final void gtk_text_view_scroll_mark_onscreen(int /*long*/ text_vi
* @param xalign cast=(gdouble)
* @param yalign cast=(gdouble)
*/
@@ -20238,7 +20371,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_text_view_scroll_to_iter(text_view, iter, within_margin, use_align, xalign, yalign);
-@@ -10215,8 +10215,8 @@
+@@ -10215,8 +10215,8 @@ public static final boolean gtk_text_view_scroll_to_iter(int /*long*/ text_view,
* @param text_view cast=(GtkTextView *)
* @param setting cast=(gboolean)
*/
@@ -20249,7 +20382,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_view_set_editable(text_view, setting);
-@@ -10225,8 +10225,8 @@
+@@ -10225,8 +10225,8 @@ public static final void gtk_text_view_set_editable(int /*long*/ text_view, bool
}
}
/** @param text_view cast=(GtkTextView *) */
@@ -20260,7 +20393,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_view_set_justification(text_view, justification);
-@@ -10238,8 +10238,8 @@
+@@ -10238,8 +10238,8 @@ public static final void gtk_text_view_set_justification(int /*long*/ text_view,
* @param text_view cast=(GtkTextView *)
* @param tabs cast=(PangoTabArray *)
*/
@@ -20271,7 +20404,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_view_set_tabs(text_view, tabs);
-@@ -10248,8 +10248,8 @@
+@@ -10248,8 +10248,8 @@ public static final void gtk_text_view_set_tabs(int /*long*/ text_view, int /*lo
}
}
/** @param text_view cast=(GtkTextView *) */
@@ -20282,7 +20415,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_view_set_wrap_mode(text_view, wrap_mode);
-@@ -10265,8 +10265,8 @@
+@@ -10265,8 +10265,8 @@ public static final void gtk_text_view_set_wrap_mode(int /*long*/ text_view, int
* @param buffer_x cast=(gint *)
* @param buffer_y cast=(gint *)
*/
@@ -20293,7 +20426,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_text_view_window_to_buffer_coords(text_view, win, window_x, window_y, buffer_x, buffer_y);
-@@ -10279,8 +10279,8 @@
+@@ -10279,8 +10279,8 @@ public static final void gtk_text_view_window_to_buffer_coords(int /*long*/ text
* @param function cast=(GtkFunction)
* @param data cast=(gpointer)
*/
@@ -20304,7 +20437,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_timeout_add(interval, function, data);
-@@ -10299,8 +10299,8 @@
+@@ -10299,8 +10299,8 @@ public static final void gtk_timeout_remove(int timeout_handler_id) {
}
}
/** @param toggle_button cast=(GtkToggleButton *) */
@@ -20315,7 +20448,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_toggle_button_get_active(toggle_button);
-@@ -10308,8 +10308,8 @@
+@@ -10308,8 +10308,8 @@ public static final boolean gtk_toggle_button_get_active(int /*long*/ toggle_but
lock.unlock();
}
}
@@ -20326,7 +20459,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_toggle_button_new();
-@@ -10318,8 +10318,8 @@
+@@ -10318,8 +10318,8 @@ public static final int /*long*/ gtk_toggle_button_new() {
}
}
/** @param toggle_button cast=(GtkToggleButton *) */
@@ -20337,7 +20470,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_toggle_button_get_inconsistent(toggle_button);
-@@ -10331,8 +10331,8 @@
+@@ -10331,8 +10331,8 @@ public static final boolean gtk_toggle_button_get_inconsistent(int /*long*/ togg
* @param toggle_button cast=(GtkToggleButton *)
* @param is_active cast=(gboolean)
*/
@@ -20348,7 +20481,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_toggle_button_set_active(toggle_button, is_active);
-@@ -10344,8 +10344,8 @@
+@@ -10344,8 +10344,8 @@ public static final void gtk_toggle_button_set_active(int /*long*/ toggle_button
* @param toggle_button cast=(GtkToggleButton *)
* @param setting cast=(gboolean)
*/
@@ -20359,7 +20492,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_toggle_button_set_inconsistent(toggle_button, setting);
-@@ -10357,8 +10357,8 @@
+@@ -10357,8 +10357,8 @@ public static final void gtk_toggle_button_set_inconsistent(int /*long*/ toggle_
* @param toggle_button cast=(GtkToggleButton *)
* @param draw_indicator cast=(gboolean)
*/
@@ -20370,7 +20503,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_toggle_button_set_mode(toggle_button, draw_indicator);
-@@ -10373,8 +10373,8 @@
+@@ -10373,8 +10373,8 @@ public static final void gtk_toggle_button_set_mode(int /*long*/ toggle_button,
* @param tooltip_private_text cast=(const char *)
* @param position cast=(gint)
*/
@@ -20381,7 +20514,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_toolbar_insert_widget(toolbar, widget, tooltip_text, tooltip_private_text, position);
-@@ -10382,8 +10382,8 @@
+@@ -10382,8 +10382,8 @@ public static final void gtk_toolbar_insert_widget(int /*long*/ toolbar, int /*l
lock.unlock();
}
}
@@ -20392,7 +20525,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_toolbar_new();
-@@ -10395,8 +10395,8 @@
+@@ -10395,8 +10395,8 @@ public static final int /*long*/ gtk_toolbar_new() {
* @param toolbar cast=(GtkToolbar *)
* @param orientation cast=(GtkOrientation)
*/
@@ -20403,7 +20536,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_toolbar_set_orientation(toolbar, orientation);
-@@ -10405,8 +10405,8 @@
+@@ -10405,8 +10405,8 @@ public static final void gtk_toolbar_set_orientation(int /*long*/ toolbar, int o
}
}
/** @param widget cast=(GtkWidget *) */
@@ -20414,7 +20547,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tooltips_data_get(widget);
-@@ -10415,8 +10415,8 @@
+@@ -10415,8 +10415,8 @@ public static final int /*long*/ gtk_tooltips_data_get(int /*long*/ widget) {
}
}
/** @param tooltips cast=(GtkTooltips *) */
@@ -20425,7 +20558,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tooltips_disable(tooltips);
-@@ -10425,8 +10425,8 @@
+@@ -10425,8 +10425,8 @@ public static final void gtk_tooltips_disable(int /*long*/ tooltips) {
}
}
/** @param tooltips cast=(GtkTooltips *) */
@@ -20436,7 +20569,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tooltips_enable(tooltips);
-@@ -10434,8 +10434,8 @@
+@@ -10434,8 +10434,8 @@ public static final void gtk_tooltips_enable(int /*long*/ tooltips) {
lock.unlock();
}
}
@@ -20447,7 +20580,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tooltips_new();
-@@ -10444,8 +10444,8 @@
+@@ -10444,8 +10444,8 @@ public static final int /*long*/ gtk_tooltips_new() {
}
}
/** @param tooltips cast=(GtkTooltips *) */
@@ -20458,7 +20591,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tooltips_force_window(tooltips);
-@@ -10459,8 +10459,8 @@
+@@ -10459,8 +10459,8 @@ public static final void gtk_tooltips_force_window(int /*long*/ tooltips) {
* @param tip_text cast=(const gchar *)
* @param tip_private cast=(const gchar *)
*/
@@ -20469,7 +20602,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tooltips_set_tip(tooltips, widget, tip_text, tip_private);
-@@ -10472,8 +10472,8 @@
+@@ -10472,8 +10472,8 @@ public static final void gtk_tooltips_set_tip(int /*long*/ tooltips, int /*long*
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -20480,7 +20613,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_model_get(tree_model, iter, column, value, terminator);
-@@ -10485,8 +10485,8 @@
+@@ -10485,8 +10485,8 @@ public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -20491,7 +20624,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_model_get(tree_model, iter, column, value, terminator);
-@@ -10499,8 +10499,8 @@
+@@ -10499,8 +10499,8 @@ public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*
* @param iter cast=(GtkTreeIter *)
* @param path cast=(GtkTreePath *)
*/
@@ -20502,7 +20635,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_model_get_iter(tree_model, iter, path);
-@@ -10512,8 +10512,8 @@
+@@ -10512,8 +10512,8 @@ public static final boolean gtk_tree_model_get_iter(int /*long*/ tree_model, int
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -20513,7 +20646,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_model_get_iter_first(tree_model, iter);
-@@ -10522,8 +10522,8 @@
+@@ -10522,8 +10522,8 @@ public static final boolean gtk_tree_model_get_iter_first(int /*long*/ tree_mode
}
}
/** @param tree_model cast=(GtkTreeModel *) */
@@ -20524,7 +20657,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_model_get_n_columns(tree_model);
-@@ -10535,8 +10535,8 @@
+@@ -10535,8 +10535,8 @@ public static final int gtk_tree_model_get_n_columns(int /*long*/ tree_model) {
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -20535,7 +20668,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_model_get_path(tree_model, iter);
-@@ -10544,8 +10544,8 @@
+@@ -10544,8 +10544,8 @@ public static final int /*long*/ gtk_tree_model_get_path(int /*long*/ tree_model
lock.unlock();
}
}
@@ -20546,7 +20679,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_model_get_type();
-@@ -10558,8 +10558,8 @@
+@@ -10558,8 +10558,8 @@ public static final int /*long*/ gtk_tree_model_get_type() {
* @param iter cast=(GtkTreeIter *)
* @param parent cast=(GtkTreeIter *)
*/
@@ -20557,7 +20690,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_model_iter_children(model, iter, parent);
-@@ -10571,8 +10571,8 @@
+@@ -10571,8 +10571,8 @@ public static final boolean gtk_tree_model_iter_children(int /*long*/ model, int
* @param model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -20568,7 +20701,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_model_iter_n_children(model, iter);
-@@ -10584,8 +10584,8 @@
+@@ -10584,8 +10584,8 @@ public static final int gtk_tree_model_iter_n_children(int /*long*/ model, int /
* @param model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -20579,7 +20712,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_model_iter_next(model, iter);
-@@ -10598,8 +10598,8 @@
+@@ -10598,8 +10598,8 @@ public static final boolean gtk_tree_model_iter_next(int /*long*/ model, int /*l
* @param iter cast=(GtkTreeIter *)
* @param parent cast=(GtkTreeIter *)
*/
@@ -20590,7 +20723,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_model_iter_nth_child(tree_model, iter, parent, n);
-@@ -10608,8 +10608,8 @@
+@@ -10608,8 +10608,8 @@ public static final boolean gtk_tree_model_iter_nth_child(int /*long*/ tree_mode
}
}
/** @param path cast=(GtkTreePath *) */
@@ -20601,7 +20734,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_path_append_index(path, index);
-@@ -10621,8 +10621,8 @@
+@@ -10621,8 +10621,8 @@ public static final void gtk_tree_path_append_index(int /*long*/ path, int index
* @param a cast=(const GtkTreePath *)
* @param b cast=(const GtkTreePath *)
*/
@@ -20612,7 +20745,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_path_compare(a, b);
-@@ -10631,8 +10631,8 @@
+@@ -10631,8 +10631,8 @@ public static final int /*long*/ gtk_tree_path_compare(int /*long*/ a, int /*lon
}
}
/** @param path cast=(GtkTreePath *) */
@@ -20623,7 +20756,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_path_down(path);
-@@ -10641,8 +10641,8 @@
+@@ -10641,8 +10641,8 @@ public static final void gtk_tree_path_down(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
@@ -20634,7 +20767,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_path_free(path);
-@@ -10651,8 +10651,8 @@
+@@ -10651,8 +10651,8 @@ public static final void gtk_tree_path_free(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
@@ -20645,7 +20778,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_path_get_depth(path);
-@@ -10661,8 +10661,8 @@
+@@ -10661,8 +10661,8 @@ public static final int gtk_tree_path_get_depth(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
@@ -20656,7 +20789,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_path_get_indices(path);
-@@ -10670,8 +10670,8 @@
+@@ -10670,8 +10670,8 @@ public static final int /*long*/ gtk_tree_path_get_indices(int /*long*/ path) {
lock.unlock();
}
}
@@ -20667,7 +20800,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_path_new();
-@@ -10679,8 +10679,8 @@
+@@ -10679,8 +10679,8 @@ public static final int /*long*/ gtk_tree_path_new() {
lock.unlock();
}
}
@@ -20678,7 +20811,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_path_new_first();
-@@ -10689,8 +10689,8 @@
+@@ -10689,8 +10689,8 @@ public static final int /*long*/ gtk_tree_path_new_first() {
}
}
/** @param path cast=(const gchar *) */
@@ -20689,7 +20822,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_path_new_from_string(path);
-@@ -10699,8 +10699,8 @@
+@@ -10699,8 +10699,8 @@ public static final int /*long*/ gtk_tree_path_new_from_string(byte[] path) {
}
}
/** @param path cast=(const gchar *) */
@@ -20700,7 +20833,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_path_new_from_string(path);
-@@ -10709,8 +10709,8 @@
+@@ -10709,8 +10709,8 @@ public static final int /*long*/ gtk_tree_path_new_from_string(int /*long*/ path
}
}
/** @param path cast=(GtkTreePath *) */
@@ -20711,7 +20844,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_path_next(path);
-@@ -10719,8 +10719,8 @@
+@@ -10719,8 +10719,8 @@ public static final void gtk_tree_path_next(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
@@ -20722,7 +20855,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_path_prev(path);
-@@ -10729,8 +10729,8 @@
+@@ -10729,8 +10729,8 @@ public static final boolean gtk_tree_path_prev(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
@@ -20733,7 +20866,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_path_up(path);
-@@ -10742,8 +10742,8 @@
+@@ -10742,8 +10742,8 @@ public static final boolean gtk_tree_path_up(int /*long*/ path) {
* @method flags=dynamic
* @param selection cast=(GtkTreeSelection *)
*/
@@ -20744,7 +20877,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_selection_count_selected_rows(selection);
-@@ -10756,8 +10756,8 @@
+@@ -10756,8 +10756,8 @@ public static final int gtk_tree_selection_count_selected_rows(int /*long*/ sele
* @param model cast=(GtkTreeModel **)
* @param iter cast=(GtkTreeIter *)
*/
@@ -20755,7 +20888,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_selection_get_selected(selection, model, iter);
-@@ -10770,8 +10770,8 @@
+@@ -10770,8 +10770,8 @@ public static final boolean gtk_tree_selection_get_selected(int /*long*/ selecti
* @param selection cast=(GtkTreeSelection *)
* @param model cast=(GtkTreeModel **)
*/
@@ -20766,7 +20899,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_selection_get_selected_rows(selection, model);
-@@ -10783,8 +10783,8 @@
+@@ -10783,8 +10783,8 @@ public static final int /*long*/ gtk_tree_selection_get_selected_rows(int /*long
* @param selection cast=(GtkTreeSelection *)
* @param path cast=(GtkTreePath *)
*/
@@ -20777,7 +20910,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_selection_path_is_selected(selection, path);
-@@ -10793,8 +10793,8 @@
+@@ -10793,8 +10793,8 @@ public static final boolean gtk_tree_selection_path_is_selected(int /*long*/ sel
}
}
/** @param selection cast=(GtkTreeSelection *) */
@@ -20788,7 +20921,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_selection_select_all(selection);
-@@ -10806,8 +10806,8 @@
+@@ -10806,8 +10806,8 @@ public static final void gtk_tree_selection_select_all(int /*long*/ selection) {
* @param selection cast=(GtkTreeSelection *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -20799,7 +20932,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_selection_select_iter(selection, iter);
-@@ -10820,8 +10820,8 @@
+@@ -10820,8 +10820,8 @@ public static final void gtk_tree_selection_select_iter(int /*long*/ selection,
* @param func cast=(GtkTreeSelectionForeachFunc)
* @param data cast=(gpointer)
*/
@@ -20810,7 +20943,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_selection_selected_foreach(selection, func, data);
-@@ -10833,8 +10833,8 @@
+@@ -10833,8 +10833,8 @@ public static final void gtk_tree_selection_selected_foreach(int /*long*/ select
* @param selection cast=(GtkTreeSelection *)
* @param mode cast=(GtkSelectionMode)
*/
@@ -20821,7 +20954,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_selection_set_mode(selection, mode);
-@@ -10843,8 +10843,8 @@
+@@ -10843,8 +10843,8 @@ public static final void gtk_tree_selection_set_mode(int /*long*/ selection, int
}
}
/** @param selection cast=(GtkTreeSelection *) */
@@ -20832,7 +20965,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_selection_unselect_all(selection);
-@@ -10856,8 +10856,8 @@
+@@ -10856,8 +10856,8 @@ public static final void gtk_tree_selection_unselect_all(int /*long*/ selection)
* @param selection cast=(GtkTreeSelection *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -20843,7 +20976,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_selection_unselect_iter(selection, iter);
-@@ -10870,8 +10870,8 @@
+@@ -10870,8 +10870,8 @@ public static final void gtk_tree_selection_unselect_iter(int /*long*/ selection
* @param iter cast=(GtkTreeIter *)
* @param parent cast=(GtkTreeIter *)
*/
@@ -20854,7 +20987,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_store_append(store, iter, parent);
-@@ -10880,8 +10880,8 @@
+@@ -10880,8 +10880,8 @@ public static final void gtk_tree_store_append(int /*long*/ store, int /*long*/
}
}
/** @param store cast=(GtkTreeStore *) */
@@ -20865,7 +20998,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_store_clear(store);
-@@ -10895,8 +10895,8 @@
+@@ -10895,8 +10895,8 @@ public static final void gtk_tree_store_clear(int /*long*/ store) {
* @param parent cast=(GtkTreeIter *)
* @param position cast=(gint)
*/
@@ -20876,7 +21009,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_store_insert(store, iter, parent, position);
-@@ -10905,8 +10905,8 @@
+@@ -10905,8 +10905,8 @@ public static final void gtk_tree_store_insert(int /*long*/ store, int /*long*/
}
}
/** @param types cast=(GType *) */
@@ -20887,7 +21020,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_store_newv(numColumns, types);
-@@ -10918,8 +10918,8 @@
+@@ -10918,8 +10918,8 @@ public static final int /*long*/ gtk_tree_store_newv(int numColumns, int /*long*
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -20898,7 +21031,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_store_remove(store, iter);
-@@ -10931,8 +10931,8 @@
+@@ -10931,8 +10931,8 @@ public static final void gtk_tree_store_remove(int /*long*/ store, int /*long*/
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -20909,7 +21042,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -10944,8 +10944,8 @@
+@@ -10944,8 +10944,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -20920,7 +21053,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -10957,8 +10957,8 @@
+@@ -10957,8 +10957,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -20931,7 +21064,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -10971,8 +10971,8 @@
+@@ -10971,8 +10971,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param iter cast=(GtkTreeIter *)
* @param value flags=no_out
*/
@@ -20942,7 +21075,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -10984,8 +10984,8 @@
+@@ -10984,8 +10984,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -20953,7 +21086,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -10997,8 +10997,8 @@
+@@ -10997,8 +10997,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
@@ -20964,7 +21097,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_create_row_drag_icon(view, path);
-@@ -11010,8 +11010,8 @@
+@@ -11010,8 +11010,8 @@ public static final int /*long*/ gtk_tree_view_create_row_drag_icon(int /*long*/
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
@@ -20975,7 +21108,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_collapse_row(view, path);
-@@ -11025,8 +11025,8 @@
+@@ -11025,8 +11025,8 @@ public static final boolean gtk_tree_view_collapse_row(int /*long*/ view, int /*
* @param attribute cast=(const gchar *)
* @param column cast=(gint)
*/
@@ -20986,7 +21119,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_add_attribute(treeColumn, cellRenderer, attribute, column);
-@@ -11041,8 +11041,8 @@
+@@ -11041,8 +11041,8 @@ public static final void gtk_tree_view_column_add_attribute(int /*long*/ treeCol
* @param start_pos cast=(gint *)
* @param width cast=(gint *)
*/
@@ -20997,7 +21130,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_cell_get_position(tree_column, cell_renderer, start_pos, width);
-@@ -11058,8 +11058,8 @@
+@@ -11058,8 +11058,8 @@ public static final boolean gtk_tree_view_column_cell_get_position(int /*long*/
* @param width cast=(gint *)
* @param height cast=(gint *)
*/
@@ -21008,7 +21141,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_cell_get_size(tree_column, cell_area, x_offset, y_offset, width, height);
-@@ -11072,8 +11072,8 @@
+@@ -11072,8 +11072,8 @@ public static final void gtk_tree_view_column_cell_get_size(int /*long*/ tree_co
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -21019,7 +21152,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_cell_set_cell_data(tree_column, tree_model, iter, is_expander, is_expanded);
-@@ -11082,8 +11082,8 @@
+@@ -11082,8 +11082,8 @@ public static final void gtk_tree_view_column_cell_set_cell_data(int /*long*/ tr
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -21030,7 +21163,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_clear(tree_column);
-@@ -11092,8 +11092,8 @@
+@@ -11092,8 +11092,8 @@ public static final void gtk_tree_view_column_clear(int /*long*/ tree_column) {
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -21041,7 +21174,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_get_cell_renderers(tree_column);
-@@ -11102,8 +11102,8 @@
+@@ -11102,8 +11102,8 @@ public static final int /*long*/ gtk_tree_view_column_get_cell_renderers(int /*l
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -21052,7 +21185,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_get_fixed_width(column);
-@@ -11112,8 +11112,8 @@
+@@ -11112,8 +11112,8 @@ public static final int gtk_tree_view_column_get_fixed_width(int /*long*/ column
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -21063,7 +21196,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_get_reorderable(column);
-@@ -11122,8 +11122,8 @@
+@@ -11122,8 +11122,8 @@ public static final boolean gtk_tree_view_column_get_reorderable(int /*long*/ co
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -21074,7 +21207,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_get_resizable(column);
-@@ -11132,8 +11132,8 @@
+@@ -11132,8 +11132,8 @@ public static final boolean gtk_tree_view_column_get_resizable(int /*long*/ colu
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -21085,7 +21218,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_get_sizing(tree_column);
-@@ -11142,8 +11142,8 @@
+@@ -11142,8 +11142,8 @@ public static final int gtk_tree_view_column_get_sizing(int /*long*/ tree_column
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -21096,7 +21229,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_get_spacing(tree_column);
-@@ -11152,8 +11152,8 @@
+@@ -11152,8 +11152,8 @@ public static final int gtk_tree_view_column_get_spacing(int /*long*/ tree_colum
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -21107,7 +21240,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_get_visible(column);
-@@ -11162,8 +11162,8 @@
+@@ -11162,8 +11162,8 @@ public static final boolean gtk_tree_view_column_get_visible(int /*long*/ column
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -21118,7 +21251,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_get_sort_indicator(tree_column);
-@@ -11172,8 +11172,8 @@
+@@ -11172,8 +11172,8 @@ public static final boolean gtk_tree_view_column_get_sort_indicator(int /*long*/
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -21129,7 +21262,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_get_sort_order(tree_column);
-@@ -11182,8 +11182,8 @@
+@@ -11182,8 +11182,8 @@ public static final int gtk_tree_view_column_get_sort_order(int /*long*/ tree_co
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -21140,7 +21273,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_get_width(column);
-@@ -11191,8 +11191,8 @@
+@@ -11191,8 +11191,8 @@ public static final int gtk_tree_view_column_get_width(int /*long*/ column) {
lock.unlock();
}
}
@@ -21151,7 +21284,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_column_new();
-@@ -11205,8 +11205,8 @@
+@@ -11205,8 +11205,8 @@ public static final int /*long*/ gtk_tree_view_column_new() {
* @param cell_renderer cast=(GtkCellRenderer *)
* @param expand cast=(gboolean)
*/
@@ -21162,7 +21295,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_pack_start(tree_column, cell_renderer, expand);
-@@ -11219,8 +11219,8 @@
+@@ -11219,8 +11219,8 @@ public static final void gtk_tree_view_column_pack_start(int /*long*/ tree_colum
* @param cell_renderer cast=(GtkCellRenderer *)
* @param expand cast=(gboolean)
*/
@@ -21173,7 +21306,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_pack_end(tree_column, cell_renderer, expand);
-@@ -11229,8 +11229,8 @@
+@@ -11229,8 +11229,8 @@ public static final void gtk_tree_view_column_pack_end(int /*long*/ tree_column,
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -21184,7 +21317,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_alignment(tree_column, xalign);
-@@ -11245,8 +11245,8 @@
+@@ -11245,8 +11245,8 @@ public static final void gtk_tree_view_column_set_alignment(int /*long*/ tree_co
* @param func_data cast=(gpointer)
* @param destroy cast=(GtkDestroyNotify)
*/
@@ -21195,7 +21328,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_cell_data_func(tree_column, cell_renderer, func, func_data, destroy);
-@@ -11258,8 +11258,8 @@
+@@ -11258,8 +11258,8 @@ public static final void gtk_tree_view_column_set_cell_data_func(int /*long*/ tr
* @param column cast=(GtkTreeViewColumn *)
* @param clickable cast=(gboolean)
*/
@@ -21206,7 +21339,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_clickable(column, clickable);
-@@ -11271,8 +11271,8 @@
+@@ -11271,8 +11271,8 @@ public static final void gtk_tree_view_column_set_clickable(int /*long*/ column,
* @param column cast=(GtkTreeViewColumn *)
* @param fixed_width cast=(gint)
*/
@@ -21217,7 +21350,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_fixed_width(column, fixed_width);
-@@ -11284,8 +11284,8 @@
+@@ -11284,8 +11284,8 @@ public static final void gtk_tree_view_column_set_fixed_width(int /*long*/ colum
* @param tree_column cast=(GtkTreeViewColumn *)
* @param min_width cast=(gint)
*/
@@ -21228,7 +21361,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_min_width(tree_column, min_width);
-@@ -11297,8 +11297,8 @@
+@@ -11297,8 +11297,8 @@ public static final void gtk_tree_view_column_set_min_width(int /*long*/ tree_co
* @param column cast=(GtkTreeViewColumn *)
* @param reorderable cast=(gboolean)
*/
@@ -21239,7 +21372,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_reorderable(column, reorderable);
-@@ -11310,8 +11310,8 @@
+@@ -11310,8 +11310,8 @@ public static final void gtk_tree_view_column_set_reorderable(int /*long*/ colum
* @param column cast=(GtkTreeViewColumn *)
* @param resizable cast=(gboolean)
*/
@@ -21250,7 +21383,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_resizable(column, resizable);
-@@ -11323,8 +11323,8 @@
+@@ -11323,8 +11323,8 @@ public static final void gtk_tree_view_column_set_resizable(int /*long*/ column,
* @param column cast=(GtkTreeViewColumn *)
* @param type cast=(GtkTreeViewColumnSizing)
*/
@@ -21261,7 +21394,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_sizing(column, type);
-@@ -11336,8 +11336,8 @@
+@@ -11336,8 +11336,8 @@ public static final void gtk_tree_view_column_set_sizing(int /*long*/ column, in
* @param tree_column cast=(GtkTreeViewColumn *)
* @param setting cast=(gboolean)
*/
@@ -21272,7 +21405,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_sort_indicator(tree_column, setting);
-@@ -11349,8 +11349,8 @@
+@@ -11349,8 +11349,8 @@ public static final void gtk_tree_view_column_set_sort_indicator(int /*long*/ tr
* @param tree_column cast=(GtkTreeViewColumn *)
* @param order cast=(GtkSortType)
*/
@@ -21283,7 +21416,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_sort_order(tree_column, order);
-@@ -11362,8 +11362,8 @@
+@@ -11362,8 +11362,8 @@ public static final void gtk_tree_view_column_set_sort_order(int /*long*/ tree_c
* @param tree_column cast=(GtkTreeViewColumn *)
* @param title cast=(const gchar *)
*/
@@ -21294,7 +21427,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_title(tree_column, title);
-@@ -11372,8 +11372,8 @@
+@@ -11372,8 +11372,8 @@ public static final void gtk_tree_view_column_set_title(int /*long*/ tree_column
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -21305,7 +21438,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_visible(tree_column, visible);
-@@ -11385,8 +11385,8 @@
+@@ -11385,8 +11385,8 @@ public static final void gtk_tree_view_column_set_visible (int /*long*/ tree_col
* @param tree_column cast=(GtkTreeViewColumn *)
* @param widget cast=(GtkWidget *)
*/
@@ -21316,7 +21449,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_column_set_widget(tree_column, widget);
-@@ -11398,8 +11398,8 @@
+@@ -11398,8 +11398,8 @@ public static final void gtk_tree_view_column_set_widget(int /*long*/ tree_colum
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
@@ -21327,7 +21460,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_set_drag_dest_row(view, path, pos);
-@@ -11408,8 +11408,8 @@
+@@ -11408,8 +11408,8 @@ public static final void gtk_tree_view_set_drag_dest_row(int /*long*/ view, int
}
}
/** @param view cast=(GtkTreeView *) */
@@ -21338,7 +21471,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_set_enable_search(view, enable_search);
-@@ -11422,8 +11422,8 @@
+@@ -11422,8 +11422,8 @@ public static final void gtk_tree_view_set_enable_search (int /*long*/ view, boo
* @param path cast=(GtkTreePath *)
* @param open_all cast=(gboolean)
*/
@@ -21349,7 +21482,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_expand_row(view, path, open_all);
-@@ -11437,8 +11437,8 @@
+@@ -11437,8 +11437,8 @@ public static final boolean gtk_tree_view_expand_row(int /*long*/ view, int /*lo
* @param column cast=(GtkTreeViewColumn *)
* @param rect cast=(GdkRectangle *)
*/
@@ -21360,7 +21493,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_get_background_area(tree_view, path, column, rect);
-@@ -11447,8 +11447,8 @@
+@@ -11447,8 +11447,8 @@ public static final void gtk_tree_view_get_background_area(int /*long*/ tree_vie
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -21371,7 +21504,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_get_bin_window(tree_view);
-@@ -11462,8 +11462,8 @@
+@@ -11462,8 +11462,8 @@ public static final int /*long*/ gtk_tree_view_get_bin_window(int /*long*/ tree_
* @param column cast=(GtkTreeViewColumn *)
* @param rect cast=(GdkRectangle *),flags=no_in
*/
@@ -21382,7 +21515,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_get_cell_area(tree_view, path, column, rect);
-@@ -11472,8 +11472,8 @@
+@@ -11472,8 +11472,8 @@ public static final void gtk_tree_view_get_cell_area(int /*long*/ tree_view, int
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -21393,7 +21526,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_get_expander_column(tree_view);
-@@ -11485,8 +11485,8 @@
+@@ -11485,8 +11485,8 @@ public static final int /*long*/gtk_tree_view_get_expander_column(int /*long*/ t
* @param tree_view cast=(GtkTreeView *)
* @param n cast=(gint)
*/
@@ -21404,7 +21537,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_get_column(tree_view, n);
-@@ -11495,8 +11495,8 @@
+@@ -11495,8 +11495,8 @@ public static final int /*long*/ gtk_tree_view_get_column(int /*long*/ tree_view
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -21415,7 +21548,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_get_columns(tree_view);
-@@ -11509,8 +11509,8 @@
+@@ -11509,8 +11509,8 @@ public static final int /*long*/ gtk_tree_view_get_columns(int /*long*/ tree_vie
* @param path cast=(GtkTreePath **)
* @param focus_column cast=(GtkTreeViewColumn **)
*/
@@ -21426,7 +21559,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_get_cursor(tree_view, path, focus_column);
-@@ -11519,8 +11519,8 @@
+@@ -11519,8 +11519,8 @@ public static final void gtk_tree_view_get_cursor(int /*long*/ tree_view, int /*
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -21437,7 +21570,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_get_headers_visible(tree_view);
-@@ -11537,8 +11537,8 @@
+@@ -11537,8 +11537,8 @@ public static final boolean gtk_tree_view_get_headers_visible(int /*long*/ tree_
* @param cell_x cast=(gint *)
* @param cell_y cast=(gint *)
*/
@@ -21448,7 +21581,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_get_path_at_pos(tree_view, x, y, path, column, cell_x, cell_y);
-@@ -11547,8 +11547,8 @@
+@@ -11547,8 +11547,8 @@ public static final boolean gtk_tree_view_get_path_at_pos(int /*long*/ tree_view
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -21459,7 +21592,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_get_rules_hint(tree_view);
-@@ -11557,8 +11557,8 @@
+@@ -11557,8 +11557,8 @@ public static final boolean gtk_tree_view_get_rules_hint(int /*long*/ tree_view)
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -21470,7 +21603,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_get_selection(tree_view);
-@@ -11570,8 +11570,8 @@
+@@ -11570,8 +11570,8 @@ public static final int /*long*/ gtk_tree_view_get_selection(int /*long*/ tree_v
* @param tree_view cast=(GtkTreeView *)
* @param visible_rect flags=no_in
*/
@@ -21481,7 +21614,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_get_visible_rect(tree_view, visible_rect);
-@@ -11584,8 +11584,8 @@
+@@ -11584,8 +11584,8 @@ public static final void gtk_tree_view_get_visible_rect(int /*long*/ tree_view,
* @param column cast=(GtkTreeViewColumn *)
* @param position cast=(gint)
*/
@@ -21492,7 +21625,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_insert_column(tree_view, column, position);
-@@ -11598,8 +11598,8 @@
+@@ -11598,8 +11598,8 @@ public static final int gtk_tree_view_insert_column(int /*long*/ tree_view, int
* @param column cast=(GtkTreeViewColumn *)
* @param base_column cast=(GtkTreeViewColumn *)
*/
@@ -21503,7 +21636,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_move_column_after(tree_view, column, base_column);
-@@ -11608,8 +11608,8 @@
+@@ -11608,8 +11608,8 @@ public static final void gtk_tree_view_move_column_after(int /*long*/ tree_view,
}
}
/** @param model cast=(GtkTreeModel *) */
@@ -21514,7 +21647,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_new_with_model(model);
-@@ -11621,8 +11621,8 @@
+@@ -11621,8 +11621,8 @@ public static final int /*long*/ gtk_tree_view_new_with_model(int /*long*/ model
* @param tree_view cast=(GtkTreeView *)
* @param column cast=(GtkTreeViewColumn *)
*/
@@ -21525,7 +21658,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_remove_column(tree_view, column);
-@@ -11634,8 +11634,8 @@
+@@ -11634,8 +11634,8 @@ public static final void gtk_tree_view_remove_column(int /*long*/ tree_view, int
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
@@ -21536,7 +21669,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_tree_view_row_expanded(view, path);
-@@ -11651,8 +11651,8 @@
+@@ -11651,8 +11651,8 @@ public static final boolean gtk_tree_view_row_expanded(int /*long*/ view, int /*
* @param row_aligh cast=(gfloat)
* @param column_align cast=(gfloat)
*/
@@ -21547,7 +21680,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_scroll_to_cell(tree_view, path, column, use_align, row_aligh, column_align);
-@@ -11665,8 +11665,8 @@
+@@ -11665,8 +11665,8 @@ public static final void gtk_tree_view_scroll_to_cell(int /*long*/ tree_view, in
* @param tree_x cast=(gint)
* @param tree_y cast=(gint)
*/
@@ -21558,7 +21691,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_scroll_to_point(tree_view, tree_x, tree_y);
-@@ -11679,8 +11679,8 @@
+@@ -11679,8 +11679,8 @@ public static final void gtk_tree_view_scroll_to_point (int /*long*/ tree_view,
* @param path cast=(GtkTreePath *)
* @param focus_column cast=(GtkTreeViewColumn *)
*/
@@ -21569,7 +21702,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_set_cursor(tree_view, path, focus_column, start_editing);
-@@ -11692,8 +11692,8 @@
+@@ -11692,8 +11692,8 @@ public static final void gtk_tree_view_set_cursor(int /*long*/ tree_view, int /*
* @method flags=dynamic
* @param tree_view cast=(GtkTreeView*)
*/
@@ -21580,7 +21713,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_set_grid_lines(tree_view, grid_lines);
-@@ -11705,8 +11705,8 @@
+@@ -11705,8 +11705,8 @@ public static final void gtk_tree_view_set_grid_lines(int /*long*/ tree_view, in
* @param tree_view cast=(GtkTreeView *)
* @param visible cast=(gboolean)
*/
@@ -21591,7 +21724,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_set_headers_visible(tree_view, visible);
-@@ -11718,8 +11718,8 @@
+@@ -11718,8 +11718,8 @@ public static final void gtk_tree_view_set_headers_visible(int /*long*/ tree_vie
* @param tree_view cast=(GtkTreeView *)
* @param model cast=(GtkTreeModel *)
*/
@@ -21602,7 +21735,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_set_model(tree_view, model);
-@@ -11728,8 +11728,8 @@
+@@ -11728,8 +11728,8 @@ public static final void gtk_tree_view_set_model(int /*long*/ tree_view, int /*l
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -21613,7 +21746,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_set_rules_hint(tree_view, setting);
-@@ -11741,8 +11741,8 @@
+@@ -11741,8 +11741,8 @@ public static final void gtk_tree_view_set_rules_hint(int /*long*/ tree_view, bo
* @param tree_view cast=(GtkTreeView *)
* @param column cast=(gint)
*/
@@ -21624,7 +21757,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_set_search_column(tree_view, column);
-@@ -11757,8 +11757,8 @@
+@@ -11757,8 +11757,8 @@ public static final void gtk_tree_view_set_search_column(int /*long*/ tree_view,
* @param wx cast=(gint *)
* @param wy cast=(gint *)
*/
@@ -21635,7 +21768,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_tree_to_widget_coords(tree_view, tx, ty, wx, wy);
-@@ -11767,8 +11767,8 @@
+@@ -11767,8 +11767,8 @@ public static final void gtk_tree_view_tree_to_widget_coords(int /*long*/ tree_v
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -21646,7 +21779,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_unset_rows_drag_dest(tree_view);
-@@ -11777,8 +11777,8 @@
+@@ -11777,8 +11777,8 @@ public static final void gtk_tree_view_unset_rows_drag_dest(int /*long*/ tree_vi
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -21657,7 +21790,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_tree_view_widget_to_tree_coords(tree_view, wx, wy, tx, ty);
-@@ -11790,8 +11790,8 @@
+@@ -11790,8 +11790,8 @@ public static final void gtk_tree_view_widget_to_tree_coords(int /*long*/ tree_v
* @param homogeneous cast=(gboolean)
* @param spacing cast=(gint)
*/
@@ -21668,7 +21801,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_vbox_new(homogeneous, spacing);
-@@ -11800,8 +11800,8 @@
+@@ -11800,8 +11800,8 @@ public static final int /*long*/ gtk_vbox_new(boolean homogeneous, int spacing)
}
}
/** @param viewport cast=(GtkViewport *) */
@@ -21679,7 +21812,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_viewport_get_shadow_type(viewport);
-@@ -11813,8 +11813,8 @@
+@@ -11813,8 +11813,8 @@ public static final int gtk_viewport_get_shadow_type(int /*long*/ viewport) {
* @param viewport cast=(GtkViewport *)
* @param type cast=(GtkShadowType)
*/
@@ -21690,7 +21823,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_viewport_set_shadow_type(viewport, type);
-@@ -11823,8 +11823,8 @@
+@@ -11823,8 +11823,8 @@ public static final void gtk_viewport_set_shadow_type(int /*long*/ viewport, int
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -21701,7 +21834,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_vscale_new(adjustment);
-@@ -11833,8 +11833,8 @@
+@@ -11833,8 +11833,8 @@ public static final int /*long*/ gtk_vscale_new(int /*long*/ adjustment) {
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -21712,7 +21845,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_vscrollbar_new(adjustment);
-@@ -11842,8 +11842,8 @@
+@@ -11842,8 +11842,8 @@ public static final int /*long*/ gtk_vscrollbar_new(int /*long*/ adjustment) {
lock.unlock();
}
}
@@ -21723,7 +21856,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_vseparator_new();
-@@ -11858,8 +11858,8 @@
+@@ -11858,8 +11858,8 @@ public static final int /*long*/ gtk_vseparator_new() {
* @param accel_key cast=(guint)
* @param accel_mods cast=(GdkModifierType)
*/
@@ -21734,7 +21867,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_add_accelerator(widget, accel_signal, accel_group, accel_key, accel_mods, accel_flags);
-@@ -11871,8 +11871,8 @@
+@@ -11871,8 +11871,8 @@ public static final void gtk_widget_add_accelerator(int /*long*/ widget, byte[]
* @param widget cast=(GtkWidget *)
* @param events cast=(gint)
*/
@@ -21745,7 +21878,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_add_events(widget, events);
-@@ -11881,8 +11881,8 @@
+@@ -11881,8 +11881,8 @@ public static final void gtk_widget_add_events(int /*long*/ widget, int events)
}
}
/** @param widget cast=(GtkWidget *) */
@@ -21756,7 +21889,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_child_focus(widget, direction);
-@@ -11894,8 +11894,8 @@
+@@ -11894,8 +11894,8 @@ public static final boolean gtk_widget_child_focus(int /*long*/ widget, int dire
* @param widget cast=(GtkWidget *)
* @param text cast=(const gchar *)
*/
@@ -21767,7 +21900,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_create_pango_layout(widget, text);
-@@ -11907,8 +11907,8 @@
+@@ -11907,8 +11907,8 @@ public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ wid
* @param widget cast=(GtkWidget *)
* @param text cast=(const gchar *)
*/
@@ -21778,7 +21911,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_create_pango_layout(widget, text);
-@@ -11917,8 +11917,8 @@
+@@ -11917,8 +11917,8 @@ public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ wid
}
}
/** @param widget cast=(GtkWidget *) */
@@ -21789,7 +21922,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_destroy(widget);
-@@ -11930,8 +11930,8 @@
+@@ -11930,8 +11930,8 @@ public static final void gtk_widget_destroy(int /*long*/ widget) {
* @param widget cast=(GtkWidget *)
* @param event cast=(GdkEvent *)
*/
@@ -21800,7 +21933,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_event(widget, event);
-@@ -11940,8 +11940,8 @@
+@@ -11940,8 +11940,8 @@ public static final boolean gtk_widget_event(int /*long*/ widget, int /*long*/ e
}
}
/** @param widget cast=(GtkWidget *) */
@@ -21811,7 +21944,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_get_accessible(widget);
-@@ -11950,8 +11950,8 @@
+@@ -11950,8 +11950,8 @@ public static final int /*long*/ gtk_widget_get_accessible (int /*long*/ widget)
}
}
/** @param widget cast=(GtkWidget *) */
@@ -21822,7 +21955,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_get_child_visible(widget);
-@@ -11968,8 +11968,8 @@
+@@ -11968,8 +11968,8 @@ public static final int gtk_widget_get_default_direction() {
lock.unlock();
}
}
@@ -21833,7 +21966,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_get_default_style();
-@@ -11978,8 +11978,8 @@
+@@ -11978,8 +11978,8 @@ public static final int /*long*/ gtk_widget_get_default_style() {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -21844,7 +21977,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_get_direction(widget);
-@@ -11988,8 +11988,8 @@
+@@ -11988,8 +11988,8 @@ public static final int gtk_widget_get_direction(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -21855,7 +21988,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_get_events(widget);
-@@ -11998,8 +11998,8 @@
+@@ -11998,8 +11998,8 @@ public static final int gtk_widget_get_events(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -21866,7 +21999,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_get_modifier_style(widget);
-@@ -12008,8 +12008,8 @@
+@@ -12008,8 +12008,8 @@ public static final int /*long*/ gtk_widget_get_modifier_style(int /*long*/ widg
}
}
/** @param widget cast=(GtkWidget *) */
@@ -21877,7 +22010,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_get_pango_context(widget);
-@@ -12018,8 +12018,8 @@
+@@ -12018,8 +12018,8 @@ public static final int /*long*/ gtk_widget_get_pango_context(int /*long*/ widge
}
}
/** @param widget cast=(GtkWidget *) */
@@ -21888,7 +22021,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_get_parent(widget);
-@@ -12028,8 +12028,8 @@
+@@ -12028,8 +12028,8 @@ public static final int /*long*/ gtk_widget_get_parent(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -21899,7 +22032,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_get_style(widget);
-@@ -12042,8 +12042,8 @@
+@@ -12042,8 +12042,8 @@ public static final int /*long*/ gtk_widget_get_style(int /*long*/ widget) {
* @param width cast=(gint *)
* @param height cast=(gint *)
*/
@@ -21910,7 +22043,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_get_size_request(widget, width, height);
-@@ -12052,8 +12052,8 @@
+@@ -12052,8 +12052,8 @@ public static final void gtk_widget_get_size_request(int /*long*/ widget, int []
}
}
/** @param widget cast=(GtkWidget *) */
@@ -21921,7 +22054,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_get_toplevel(widget);
-@@ -12062,8 +12062,8 @@
+@@ -12062,8 +12062,8 @@ public static final int /*long*/ gtk_widget_get_toplevel (int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -21932,7 +22065,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_grab_focus(widget);
-@@ -12072,8 +12072,8 @@
+@@ -12072,8 +12072,8 @@ public static final void gtk_widget_grab_focus(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -21943,7 +22076,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_hide(widget);
-@@ -12085,8 +12085,8 @@
+@@ -12085,8 +12085,8 @@ public static final void gtk_widget_hide(int /*long*/ widget) {
* @method flags=dynamic
* @param widget cast=(GtkWidget *)
*/
@@ -21954,7 +22087,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_is_composited(widget);
-@@ -12095,8 +12095,8 @@
+@@ -12095,8 +12095,8 @@ public static final boolean gtk_widget_is_composited(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -21965,7 +22098,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_is_focus(widget);
-@@ -12105,8 +12105,8 @@
+@@ -12105,8 +12105,8 @@ public static final boolean gtk_widget_is_focus(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -21976,7 +22109,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_map(widget);
-@@ -12118,8 +12118,8 @@
+@@ -12118,8 +12118,8 @@ public static final void gtk_widget_map(int /*long*/ widget) {
* @param widget cast=(GtkWidget *)
* @param group_cycling cast=(gboolean)
*/
@@ -21987,7 +22120,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_mnemonic_activate(widget, group_cycling);
-@@ -12132,8 +12132,8 @@
+@@ -12132,8 +12132,8 @@ public static final boolean gtk_widget_mnemonic_activate(int /*long*/ widget, bo
* @param state cast=(GtkStateType)
* @param color cast=(GdkColor *),flags=no_out
*/
@@ -21998,7 +22131,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_modify_base(widget, state, color);
-@@ -12146,8 +12146,8 @@
+@@ -12146,8 +12146,8 @@ public static final void gtk_widget_modify_base(int /*long*/ widget, int state,
* @param state cast=(GtkStateType)
* @param color cast=(GdkColor *),flags=no_out
*/
@@ -22009,7 +22142,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_modify_bg(widget, state, color);
-@@ -12160,8 +12160,8 @@
+@@ -12160,8 +12160,8 @@ public static final void gtk_widget_modify_bg(int /*long*/ widget, int state, Gd
* @param state cast=(GtkStateType)
* @param color cast=(GdkColor *),flags=no_out
*/
@@ -22020,7 +22153,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_modify_fg(widget, state, color);
-@@ -12173,8 +12173,8 @@
+@@ -12173,8 +12173,8 @@ public static final void gtk_widget_modify_fg(int /*long*/ widget, int state, Gd
* @param widget cast=(GtkWidget *)
* @param pango_font_descr cast=(PangoFontDescription *)
*/
@@ -22031,7 +22164,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_modify_font(widget, pango_font_descr);
-@@ -12186,8 +12186,8 @@
+@@ -12186,8 +12186,8 @@ public static final void gtk_widget_modify_font(int /*long*/ widget, int /*long*
* @param widget cast=(GtkWidget *)
* @param style cast=(GtkRcStyle *)
*/
@@ -22042,7 +22175,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_modify_style(widget, style);
-@@ -12200,8 +12200,8 @@
+@@ -12200,8 +12200,8 @@ public static final void gtk_widget_modify_style(int /*long*/ widget, int /*long
* @param state cast=(GtkStateType)
* @param color cast=(GdkColor *),flags=no_out
*/
@@ -22053,7 +22186,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_modify_text(widget, state, color);
-@@ -12210,8 +12210,8 @@
+@@ -12210,8 +12210,8 @@ public static final void gtk_widget_modify_text(int /*long*/ widget, int state,
}
}
/** @param widget cast=(GtkWidget *) */
@@ -22064,7 +22197,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_queue_resize(widget);
-@@ -12220,8 +12220,8 @@
+@@ -12220,8 +12220,8 @@ public static final void gtk_widget_queue_resize(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -22075,7 +22208,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_realize(widget);
-@@ -12235,8 +12235,8 @@
+@@ -12235,8 +12235,8 @@ public static final void gtk_widget_realize(int /*long*/ widget) {
* @param accel_key cast=(guint)
* @param accel_mods cast=(GdkModifierType)
*/
@@ -22086,7 +22219,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_remove_accelerator(widget, accel_group, accel_key, accel_mods);
-@@ -12248,8 +12248,8 @@
+@@ -12248,8 +12248,8 @@ public static final void gtk_widget_remove_accelerator(int /*long*/ widget, int
* @param widget cast=(GtkWidget *)
* @param new_parent cast=(GtkWidget *)
*/
@@ -22097,7 +22230,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_reparent(widget, new_parent);
-@@ -12261,8 +12261,8 @@
+@@ -12261,8 +12261,8 @@ public static final void gtk_widget_reparent(int /*long*/ widget, int /*long*/ n
* @param widget cast=(GtkWidget *)
* @param event cast=(GdkEvent *)
*/
@@ -22108,7 +22241,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_send_expose(widget, event);
-@@ -12271,8 +12271,8 @@
+@@ -12271,8 +12271,8 @@ public static final int gtk_widget_send_expose(int /*long*/ widget, int /*long*/
}
}
/** @param widget cast=(GtkWidget *) */
@@ -22119,7 +22252,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_set_app_paintable(widget, app_paintable);
-@@ -12294,8 +12294,8 @@
+@@ -12294,8 +12294,8 @@ public static final void gtk_widget_set_default_direction(int dir) {
* @param widget cast=(GtkWidget *)
* @param dir cast=(GtkTextDirection)
*/
@@ -22130,7 +22263,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_set_direction(widget, dir);
-@@ -12307,8 +12307,8 @@
+@@ -12307,8 +12307,8 @@ public static final void gtk_widget_set_direction(int /*long*/ widget, int dir)
* @param widget cast=(GtkWidget *)
* @param double_buffered cast=(gboolean)
*/
@@ -22141,7 +22274,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_set_double_buffered(widget, double_buffered);
-@@ -12320,8 +12320,8 @@
+@@ -12320,8 +12320,8 @@ public static final void gtk_widget_set_double_buffered(int /*long*/ widget, boo
* @param widget cast=(GtkWidget *)
* @param name cast=(const char *)
*/
@@ -22152,7 +22285,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_set_name(widget, name);
-@@ -12333,8 +12333,8 @@
+@@ -12333,8 +12333,8 @@ public static final void gtk_widget_set_name(int /*long*/ widget, byte[] name) {
* @param widget cast=(GtkWidget *)
* @param redraw cast=(gboolean)
*/
@@ -22163,7 +22296,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_set_redraw_on_allocate(widget, redraw);
-@@ -12346,8 +12346,8 @@
+@@ -12346,8 +12346,8 @@ public static final void gtk_widget_set_redraw_on_allocate(int /*long*/ widget,
* @param widget cast=(GtkWidget *)
* @param sensitive cast=(gboolean)
*/
@@ -22174,7 +22307,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_set_sensitive(widget, sensitive);
-@@ -12360,8 +12360,8 @@
+@@ -12360,8 +12360,8 @@ public static final void gtk_widget_set_sensitive(int /*long*/ widget, boolean s
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -22185,7 +22318,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_set_size_request(widget, width, height);
-@@ -12373,8 +12373,8 @@
+@@ -12373,8 +12373,8 @@ public static final void gtk_widget_set_size_request(int /*long*/ widget, int wi
* @param widget cast=(GtkWidget *)
* @param state cast=(GtkStateType)
*/
@@ -22196,7 +22329,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_set_state(widget, state);
-@@ -12386,8 +12386,8 @@
+@@ -12386,8 +12386,8 @@ public static final void gtk_widget_set_state(int /*long*/ widget, int state) {
* @param widget cast=(GtkWidget *)
* @param style cast=(GtkStyle *)
*/
@@ -22207,7 +22340,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_set_style(widget, style);
-@@ -12401,8 +12401,8 @@
+@@ -12401,8 +12401,8 @@ public static final void gtk_widget_set_style(int /*long*/ widget, int /*long*/
* @param offset_x cast=(gint)
* @param offset_y cast=(gint)
*/
@@ -22218,7 +22351,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_shape_combine_mask(widget, shape_mask, offset_x, offset_y);
-@@ -12411,8 +12411,8 @@
+@@ -12411,8 +12411,8 @@ public static final void gtk_widget_shape_combine_mask(int /*long*/ widget, int
}
}
/** @param widget cast=(GtkWidget *) */
@@ -22229,7 +22362,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_show(widget);
-@@ -12421,8 +12421,8 @@
+@@ -12421,8 +12421,8 @@ public static final void gtk_widget_show(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -22240,7 +22373,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_show_now(widget);
-@@ -12434,8 +12434,8 @@
+@@ -12434,8 +12434,8 @@ public static final void gtk_widget_show_now(int /*long*/ widget) {
* @param widget cast=(GtkWidget *)
* @param allocation cast=(GtkAllocation *),flags=no_out
*/
@@ -22251,7 +22384,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_size_allocate(widget, allocation);
-@@ -12447,8 +12447,8 @@
+@@ -12447,8 +12447,8 @@ public static final void gtk_widget_size_allocate(int /*long*/ widget, GtkAlloca
* @param widget cast=(GtkWidget *)
* @param requisition cast=(GtkRequisition *),flags=no_in
*/
@@ -22262,7 +22395,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_size_request(widget, requisition);
-@@ -12461,8 +12461,8 @@
+@@ -12461,8 +12461,8 @@ public static final void gtk_widget_size_request(int /*long*/ widget, GtkRequisi
* @param property_name cast=(const gchar *)
* @param terminator cast=(const gchar *),flags=sentinel
*/
@@ -22273,7 +22406,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_style_get(widget, property_name, value, terminator);
-@@ -12475,8 +12475,8 @@
+@@ -12475,8 +12475,8 @@ public static final void gtk_widget_style_get(int /*long*/ widget, byte[] proper
* @param property_name cast=(const gchar *)
* @param terminator cast=(const gchar *),flags=sentinel
*/
@@ -22284,7 +22417,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_style_get(widget, property_name, value, terminator);
-@@ -12488,8 +12488,8 @@
+@@ -12488,8 +12488,8 @@ public static final void gtk_widget_style_get(int /*long*/ widget, byte[] proper
* @param src_widget cast=(GtkWidget *)
* @param dest_widget cast=(GtkWidget *)
*/
@@ -22295,7 +22428,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_widget_translate_coordinates(src_widget, dest_widget, src_x, src_y, dest_x, dest_y);
-@@ -12498,8 +12498,8 @@
+@@ -12498,8 +12498,8 @@ public static final boolean gtk_widget_translate_coordinates(int /*long*/ src_wi
}
}
/** @param widget cast=(GtkWidget *) */
@@ -22306,7 +22439,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_unrealize(widget);
-@@ -12508,8 +12508,8 @@
+@@ -12508,8 +12508,8 @@ public static final void gtk_widget_unrealize(int /*long*/ widget) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -22317,7 +22450,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_window_activate_default(window);
-@@ -12521,8 +12521,8 @@
+@@ -12521,8 +12521,8 @@ public static final boolean gtk_window_activate_default(int /*long*/ window) {
* @param window cast=(GtkWindow *)
* @param accel_group cast=(GtkAccelGroup *)
*/
@@ -22328,7 +22461,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_add_accel_group(window, accel_group);
-@@ -12531,8 +12531,8 @@
+@@ -12531,8 +12531,8 @@ public static final void gtk_window_add_accel_group(int /*long*/ window, int /*l
}
}
/** @param handle cast=(GtkWindow *) */
@@ -22339,7 +22472,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_deiconify(handle);
-@@ -12541,8 +12541,8 @@
+@@ -12541,8 +12541,8 @@ public static final void gtk_window_deiconify(int /*long*/ handle) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -22350,7 +22483,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_window_get_focus(window);
-@@ -12554,8 +12554,8 @@
+@@ -12554,8 +12554,8 @@ public static final int /*long*/ gtk_window_get_focus(int /*long*/ window) {
* @method flags=dynamic
* @param window cast=(GtkWindow *)
*/
@@ -22361,7 +22494,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_window_get_group(window);
-@@ -12564,8 +12564,8 @@
+@@ -12564,8 +12564,8 @@ public static final int /*long*/ gtk_window_get_group(int /*long*/ window) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -22372,7 +22505,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_window_get_icon_list(window);
-@@ -12574,8 +12574,8 @@
+@@ -12574,8 +12574,8 @@ public static final int /*long*/ gtk_window_get_icon_list(int /*long*/ window) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -22383,7 +22516,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_window_get_modal(window);
-@@ -12584,8 +12584,8 @@
+@@ -12584,8 +12584,8 @@ public static final boolean gtk_window_get_modal(int /*long*/ window) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -22394,7 +22527,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_window_get_mnemonic_modifier(window);
-@@ -12597,8 +12597,8 @@
+@@ -12597,8 +12597,8 @@ public static final int gtk_window_get_mnemonic_modifier(int /*long*/ window) {
* @method flags=dynamic
* @param window cast=(GtkWindow *)
*/
@@ -22405,7 +22538,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_window_get_opacity (window);
-@@ -12611,8 +12611,8 @@
+@@ -12611,8 +12611,8 @@ public static final double gtk_window_get_opacity (int /*long*/ window) {
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
@@ -22416,7 +22549,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_get_position(handle, x, y);
-@@ -12625,8 +12625,8 @@
+@@ -12625,8 +12625,8 @@ public static final void gtk_window_get_position(int /*long*/ handle, int[] x, i
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
@@ -22427,7 +22560,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_get_size(handle, x, y);
-@@ -12638,8 +12638,8 @@
+@@ -12638,8 +12638,8 @@ public static final void gtk_window_get_size(int /*long*/ handle, int[] x, int[]
* @param group cast=(GtkWindowGroup*)
* @param window cast=(GtkWindow*)
*/
@@ -22438,7 +22571,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_group_add_window(group, window);
-@@ -12651,8 +12651,8 @@
+@@ -12651,8 +12651,8 @@ public static final void gtk_window_group_add_window(int /*long*/ group, int /*l
* @param group cast=(GtkWindowGroup*)
* @param window cast=(GtkWindow*)
*/
@@ -22449,7 +22582,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_group_remove_window(group, window);
-@@ -12660,8 +12660,8 @@
+@@ -12660,8 +12660,8 @@ public static final void gtk_window_group_remove_window(int /*long*/ group, int
lock.unlock();
}
}
@@ -22460,7 +22593,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_window_group_new();
-@@ -12670,8 +12670,8 @@
+@@ -12670,8 +12670,8 @@ public static final int /*long*/ gtk_window_group_new() {
}
}
/** @param handle cast=(GtkWindow *) */
@@ -22471,7 +22604,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_iconify(handle);
-@@ -12679,8 +12679,8 @@
+@@ -12679,8 +12679,8 @@ public static final void gtk_window_iconify(int /*long*/ handle) {
lock.unlock();
}
}
@@ -22482,7 +22615,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_window_list_toplevels ();
-@@ -12689,8 +12689,8 @@
+@@ -12689,8 +12689,8 @@ public static final int /*long*/ gtk_window_list_toplevels () {
}
}
/** @param handle cast=(GtkWindow *) */
@@ -22493,7 +22626,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_maximize(handle);
-@@ -12699,8 +12699,8 @@
+@@ -12699,8 +12699,8 @@ public static final void gtk_window_maximize(int /*long*/ handle) {
}
}
/** @param handle cast=(GtkWindow *) */
@@ -22504,7 +22637,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_fullscreen(handle);
-@@ -12709,8 +12709,8 @@
+@@ -12709,8 +12709,8 @@ public static final void gtk_window_fullscreen(int /*long*/ handle) {
}
}
/** @param handle cast=(GtkWindow *) */
@@ -22515,7 +22648,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_unfullscreen(handle);
-@@ -12723,8 +12723,8 @@
+@@ -12723,8 +12723,8 @@ public static final void gtk_window_unfullscreen(int /*long*/ handle) {
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -22526,7 +22659,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_move(handle, x, y);
-@@ -12733,8 +12733,8 @@
+@@ -12733,8 +12733,8 @@ public static final void gtk_window_move(int /*long*/ handle, int x, int y) {
}
}
/** @param type cast=(GtkWindowType) */
@@ -22537,7 +22670,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _gtk_window_new(type);
-@@ -12743,8 +12743,8 @@
+@@ -12743,8 +12743,8 @@ public static final int /*long*/ gtk_window_new(int type) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -22548,7 +22681,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_present(window);
-@@ -12756,8 +12756,8 @@
+@@ -12756,8 +12756,8 @@ public static final void gtk_window_present(int /*long*/ window) {
* @param window cast=(GtkWindow *)
* @param accel_group cast=(GtkAccelGroup *)
*/
@@ -22559,7 +22692,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_remove_accel_group(window, accel_group);
-@@ -12770,8 +12770,8 @@
+@@ -12770,8 +12770,8 @@ public static final void gtk_window_remove_accel_group(int /*long*/ window, int
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -22570,7 +22703,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_resize(handle, x, y);
-@@ -12783,8 +12783,8 @@
+@@ -12783,8 +12783,8 @@ public static final void gtk_window_resize(int /*long*/ handle, int x, int y) {
* @param window cast=(GtkWindow *)
* @param widget cast=(GtkWidget *)
*/
@@ -22581,7 +22714,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_default(window, widget);
-@@ -12796,8 +12796,8 @@
+@@ -12796,8 +12796,8 @@ public static final void gtk_window_set_default(int /*long*/ window, int /*long*
* @param window cast=(GtkWindow *)
* @param setting cast=(gboolean)
*/
@@ -22592,7 +22725,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_destroy_with_parent(window, setting);
-@@ -12810,8 +12810,8 @@
+@@ -12810,8 +12810,8 @@ public static final void gtk_window_set_destroy_with_parent(int /*long*/ window,
* @param window cast=(GtkWindow *)
* @param setting cast=(gboolean)
*/
@@ -22603,7 +22736,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_keep_below(window, setting);
-@@ -12824,8 +12824,8 @@
+@@ -12824,8 +12824,8 @@ public static final void gtk_window_set_keep_below(int /*long*/ window, boolean
* @param geometry_widget cast=(GtkWidget *)
* @param geometry flags=no_out
*/
@@ -22614,7 +22747,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_geometry_hints(window, geometry_widget, geometry, geom_mask);
-@@ -12837,8 +12837,8 @@
+@@ -12837,8 +12837,8 @@ public static final void gtk_window_set_geometry_hints(int /*long*/ window, int
* @param window cast=(GtkWindow *)
* @param list cast=(GList *)
*/
@@ -22625,7 +22758,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_icon_list(window, list);
-@@ -12850,8 +12850,8 @@
+@@ -12850,8 +12850,8 @@ public static final void gtk_window_set_icon_list(int /*long*/ window, int /*lon
* @param window cast=(GtkWindow *)
* @param modal cast=(gboolean)
*/
@@ -22636,7 +22769,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_modal(window, modal);
-@@ -12863,8 +12863,8 @@
+@@ -12863,8 +12863,8 @@ public static final void gtk_window_set_modal(int /*long*/ window, boolean modal
* @method flags=dynamic
* @param window cast=(GtkWindow *)
*/
@@ -22647,7 +22780,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_opacity(window, opacity);
-@@ -12877,8 +12877,8 @@
+@@ -12877,8 +12877,8 @@ public static final void gtk_window_set_opacity(int /*long*/ window, double opac
* @param widget cast=(GtkWidget *)
* @param tip_text cast=(const gchar *)
*/
@@ -22658,7 +22791,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_set_tooltip_text(widget, tip_text);
-@@ -12890,8 +12890,8 @@
+@@ -12890,8 +12890,8 @@ public static final void gtk_widget_set_tooltip_text(int /*long*/ widget, byte[]
* @param widget cast=(GtkWidget *)
* @param parent_window cast=(GdkWindow *)
*/
@@ -22669,7 +22802,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_widget_set_parent_window(widget, parent_window);
-@@ -12903,8 +12903,8 @@
+@@ -12903,8 +12903,8 @@ public static final void gtk_widget_set_parent_window(int /*long*/ widget, int /
* @param window cast=(GtkWindow *)
* @param resizable cast=(gboolean)
*/
@@ -22680,7 +22813,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_resizable(window, resizable);
-@@ -12916,8 +12916,8 @@
+@@ -12916,8 +12916,8 @@ public static final void gtk_window_set_resizable(int /*long*/ window, boolean r
* @param window cast=(GtkWindow *)
* @param title cast=(const gchar *)
*/
@@ -22691,7 +22824,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_title(window, title);
-@@ -12930,8 +12930,8 @@
+@@ -12930,8 +12930,8 @@ public static final void gtk_window_set_title(int /*long*/ window, byte[] title)
* @param window cast=(GtkWindow *)
* @param skips_taskbar cast=(gboolean)
*/
@@ -22702,7 +22835,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_skip_taskbar_hint(window, skips_taskbar);
-@@ -12940,8 +12940,8 @@
+@@ -12940,8 +12940,8 @@ public static final void gtk_window_set_skip_taskbar_hint(int /*long*/ window, b
}
}
/** @param window cast=(GtkWindow *) */
@@ -22713,7 +22846,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_type_hint(window, hint);
-@@ -12953,8 +12953,8 @@
+@@ -12953,8 +12953,8 @@ public static final void gtk_window_set_type_hint(int /*long*/ window, int hint)
* @param window cast=(GtkWindow *)
* @param parent cast=(GtkWindow *)
*/
@@ -22724,7 +22857,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_set_transient_for(window, parent);
-@@ -12963,8 +12963,8 @@
+@@ -12963,8 +12963,8 @@ public static final void gtk_window_set_transient_for(int /*long*/ window, int /
}
}
/** @param handle cast=(GtkWindow *) */
@@ -22735,7 +22868,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_gtk_window_unmaximize(handle);
-@@ -12977,256 +12977,256 @@
+@@ -12977,256 +12977,256 @@ public static final void gtk_window_unmaximize(int /*long*/ handle) {
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
@@ -23041,7 +23174,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_background_new(red, green, blue);
-@@ -13235,8 +13235,8 @@
+@@ -13235,8 +13235,8 @@ public static final int /*long*/ pango_attr_background_new (short red, short gre
}
}
/** @param desc cast=(const PangoFontDescription *) */
@@ -23052,7 +23185,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_font_desc_new(desc);
-@@ -13244,8 +13244,8 @@
+@@ -13244,8 +13244,8 @@ public static final int /*long*/ pango_attr_font_desc_new(int /*long*/ desc) {
lock.unlock();
}
}
@@ -23063,7 +23196,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_foreground_new(red, green, blue);
-@@ -13253,8 +13253,8 @@
+@@ -13253,8 +13253,8 @@ public static final int /*long*/ pango_attr_foreground_new (short red, short gre
lock.unlock();
}
}
@@ -23074,7 +23207,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_rise_new(rise);
-@@ -13266,8 +13266,8 @@
+@@ -13266,8 +13266,8 @@ public static final int /*long*/ pango_attr_rise_new(int rise) {
* @param ink_rect flags=no_out
* @param logical_rect flags=no_out
*/
@@ -23085,7 +23218,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_shape_new(ink_rect, logical_rect);
-@@ -13279,8 +13279,8 @@
+@@ -13279,8 +13279,8 @@ public static final int /*long*/ pango_attr_shape_new(PangoRectangle ink_rect, P
* @param list cast=(PangoAttrList *)
* @param attr cast=(PangoAttribute *)
*/
@@ -23096,7 +23229,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_attr_list_insert(list, attr);
-@@ -13292,8 +13292,8 @@
+@@ -13292,8 +13292,8 @@ public static final void pango_attr_list_insert(int /*long*/ list, int /*long*/
* @param list cast=(PangoAttrList *)
* @param attr cast=(PangoAttribute *)
*/
@@ -23107,7 +23240,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_attr_list_change(list, attr);
-@@ -13302,8 +13302,8 @@
+@@ -13302,8 +13302,8 @@ public static final void pango_attr_list_change(int /*long*/ list, int /*long*/
}
}
/** @param list cast=(PangoAttrList *) */
@@ -23118,7 +23251,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_list_get_iterator(list);
-@@ -13312,8 +13312,8 @@
+@@ -13312,8 +13312,8 @@ public static final int /*long*/ pango_attr_list_get_iterator(int /*long*/ list)
}
}
/** @param iterator cast=(PangoAttrIterator *) */
@@ -23129,7 +23262,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_iterator_next(iterator);
-@@ -13322,8 +13322,8 @@
+@@ -13322,8 +13322,8 @@ public static final boolean pango_attr_iterator_next(int /*long*/ iterator) {
}
}
/** @param iterator cast=(PangoAttrIterator *) */
@@ -23140,7 +23273,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_attr_iterator_range(iterator, start, end);
-@@ -13335,8 +13335,8 @@
+@@ -13335,8 +13335,8 @@ public static final void pango_attr_iterator_range(int /*long*/ iterator, int[]
* @param iterator cast=(PangoAttrIterator *)
* @param type cast=(PangoAttrType)
*/
@@ -23151,7 +23284,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_iterator_get(iterator, type);
-@@ -13345,8 +13345,8 @@
+@@ -13345,8 +13345,8 @@ public static final int /*long*/ pango_attr_iterator_get(int /*long*/ iterator,
}
}
/** @param iterator cast=(PangoAttrIterator *) */
@@ -23162,7 +23295,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_iterator_get_attrs(iterator);
-@@ -13356,8 +13356,8 @@
+@@ -13356,8 +13356,8 @@ public static final int /*long*/ pango_attr_iterator_get_attrs(int /*long*/ iter
}
/** @param iterator cast=(PangoAttrIterator *) */
@@ -23173,7 +23306,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_attr_iterator_destroy(iterator);
-@@ -13365,8 +13365,8 @@
+@@ -13365,8 +13365,8 @@ public static final void pango_attr_iterator_destroy(int /*long*/ iterator) {
lock.unlock();
}
}
@@ -23184,7 +23317,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_list_new();
-@@ -13375,8 +13375,8 @@
+@@ -13375,8 +13375,8 @@ public static final int /*long*/ pango_attr_list_new() {
}
}
/** @param list cast=(PangoAttrList *) */
@@ -23195,7 +23328,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_attr_list_unref(list);
-@@ -13385,8 +13385,8 @@
+@@ -13385,8 +13385,8 @@ public static final void pango_attr_list_unref(int /*long*/ list) {
}
}
/** @method flags=dynamic */
@@ -23206,7 +23339,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_strikethrough_color_new(red, green, blue);
-@@ -13394,8 +13394,8 @@
+@@ -13394,8 +13394,8 @@ public static final int /*long*/ pango_attr_strikethrough_color_new(short red, s
lock.unlock();
}
}
@@ -23217,7 +23350,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_strikethrough_new(strikethrough);
-@@ -13404,8 +13404,8 @@
+@@ -13404,8 +13404,8 @@ public static final int /*long*/ pango_attr_strikethrough_new(boolean strikethro
}
}
/** @method flags=dynamic */
@@ -23228,7 +23361,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_underline_color_new(red, green, blue);
-@@ -13413,8 +13413,8 @@
+@@ -13413,8 +13413,8 @@ public static final int /*long*/ pango_attr_underline_color_new(short red, short
lock.unlock();
}
}
@@ -23239,7 +23372,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_underline_new(underline);
-@@ -13422,8 +13422,8 @@
+@@ -13422,8 +13422,8 @@ public static final int /*long*/ pango_attr_underline_new(int underline) {
lock.unlock();
}
}
@@ -23250,7 +23383,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_attr_weight_new(weight);
-@@ -13432,8 +13432,8 @@
+@@ -13432,8 +13432,8 @@ public static final int /*long*/ pango_attr_weight_new(int weight) {
}
}
/** @method flags=dynamic */
@@ -23261,7 +23394,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_cairo_font_map_get_default();
-@@ -13442,8 +13442,8 @@
+@@ -13442,8 +13442,8 @@ public static final int /*long*/ pango_cairo_font_map_get_default() {
}
}
/** @method flags=dynamic */
@@ -23272,7 +23405,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_cairo_font_map_new();
-@@ -13452,8 +13452,8 @@
+@@ -13452,8 +13452,8 @@ public static final int /*long*/ pango_cairo_font_map_new() {
}
}
/** @method flags=dynamic */
@@ -23283,7 +23416,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_cairo_font_map_create_context(fontmap);
-@@ -13462,8 +13462,8 @@
+@@ -13462,8 +13462,8 @@ public static final int /*long*/ pango_cairo_font_map_create_context(int /*long*
}
}
/** @method flags=dynamic */
@@ -23294,7 +23427,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_cairo_create_layout(cairo);
-@@ -13475,8 +13475,8 @@
+@@ -13475,8 +13475,8 @@ public static final int /*long*/ pango_cairo_create_layout(int /*long*/ cairo) {
* @method flags=dynamic
* @param context cast=(PangoContext *)
*/
@@ -23305,7 +23438,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_cairo_context_get_font_options(context);
-@@ -13488,8 +13488,8 @@
+@@ -13488,8 +13488,8 @@ public static final int /*long*/ pango_cairo_context_get_font_options(int /*long
* @method flags=dynamic
* @param context cast=(PangoContext *)
*/
@@ -23316,7 +23449,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_cairo_context_set_font_options(context, options);
-@@ -13498,8 +13498,8 @@
+@@ -13498,8 +13498,8 @@ public static final void pango_cairo_context_set_font_options(int /*long*/ conte
}
}
/** @method flags=dynamic */
@@ -23327,7 +23460,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_cairo_font_map_set_resolution(fontmap, dpi);
-@@ -13508,8 +13508,8 @@
+@@ -13508,8 +13508,8 @@ public static final void pango_cairo_font_map_set_resolution(int /*long*/ fontma
}
}
/** @method flags=dynamic */
@@ -23338,7 +23471,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_cairo_layout_path(cairo, layout);
-@@ -13518,8 +13518,8 @@
+@@ -13518,8 +13518,8 @@ public static final void pango_cairo_layout_path(int /*long*/ cairo, int /*long*
}
}
/** @method flags=dynamic */
@@ -23349,7 +23482,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_cairo_show_layout(cairo, layout);
-@@ -13528,8 +13528,8 @@
+@@ -13528,8 +13528,8 @@ public static final void pango_cairo_show_layout(int /*long*/ cairo, int /*long*
}
}
/** @param context cast=(PangoContext *) */
@@ -23360,7 +23493,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_context_get_base_dir(context);
-@@ -13538,8 +13538,8 @@
+@@ -13538,8 +13538,8 @@ public static final int pango_context_get_base_dir(int /*long*/ context) {
}
}
/** @param context cast=(PangoContext *) */
@@ -23371,7 +23504,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_context_get_language(context);
-@@ -13552,8 +13552,8 @@
+@@ -13552,8 +13552,8 @@ public static final int /*long*/ pango_context_get_language(int /*long*/ context
* @param desc cast=(const PangoFontDescription *)
* @param language cast=(PangoLanguage *)
*/
@@ -23382,7 +23515,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_context_get_metrics(context, desc, language);
-@@ -13566,8 +13566,8 @@
+@@ -13566,8 +13566,8 @@ public static final int /*long*/ pango_context_get_metrics(int /*long*/ context,
* @param families cast=(PangoFontFamily ***)
* @param n_families cast=(int *)
*/
@@ -23393,7 +23526,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_context_list_families(context, families, n_families);
-@@ -13576,8 +13576,8 @@
+@@ -13576,8 +13576,8 @@ public static final void pango_context_list_families(int /*long*/ context, int /
}
}
/** @param context cast=(PangoContext *) */
@@ -23404,7 +23537,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_context_set_base_dir(context, direction);
-@@ -13589,8 +13589,8 @@
+@@ -13589,8 +13589,8 @@ public static final void pango_context_set_base_dir(int /*long*/ context, int di
* @param context cast=(PangoContext *)
* @param language cast=(PangoLanguage *)
*/
@@ -23415,7 +23548,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_context_set_language(context, language);
-@@ -13599,8 +13599,8 @@
+@@ -13599,8 +13599,8 @@ public static final void pango_context_set_language(int /*long*/ context, int /*
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -23426,7 +23559,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_description_copy(desc);
-@@ -13609,8 +13609,8 @@
+@@ -13609,8 +13609,8 @@ public static final int /*long*/ pango_font_description_copy(int /*long*/ desc)
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -23437,7 +23570,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_font_description_free(desc);
-@@ -13619,8 +13619,8 @@
+@@ -13619,8 +13619,8 @@ public static final void pango_font_description_free(int /*long*/ desc) {
}
}
/** @param str cast=(const char *),flags=no_out critical */
@@ -23448,7 +23581,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_description_from_string(str);
-@@ -13629,8 +13629,8 @@
+@@ -13629,8 +13629,8 @@ public static final int /*long*/ pango_font_description_from_string(byte[] str)
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -23459,7 +23592,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_description_get_family(desc);
-@@ -13639,8 +13639,8 @@
+@@ -13639,8 +13639,8 @@ public static final int /*long*/ pango_font_description_get_family(int /*long*/
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -23470,7 +23603,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_description_get_size(desc);
-@@ -13649,8 +13649,8 @@
+@@ -13649,8 +13649,8 @@ public static final int pango_font_description_get_size(int /*long*/ desc) {
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -23481,7 +23614,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_description_get_style(desc);
-@@ -13659,8 +13659,8 @@
+@@ -13659,8 +13659,8 @@ public static final int pango_font_description_get_style(int /*long*/ desc) {
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -23492,7 +23625,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_description_get_weight(desc);
-@@ -13668,8 +13668,8 @@
+@@ -13668,8 +13668,8 @@ public static final int pango_font_description_get_weight(int /*long*/ desc) {
lock.unlock();
}
}
@@ -23503,7 +23636,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_description_new();
-@@ -13681,8 +13681,8 @@
+@@ -13681,8 +13681,8 @@ public static final int /*long*/ pango_font_description_new() {
* @param desc cast=(PangoFontDescription *)
* @param family cast=(const char *),flags=no_out critical
*/
@@ -23514,7 +23647,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_font_description_set_family(desc, family);
-@@ -13694,8 +13694,8 @@
+@@ -13694,8 +13694,8 @@ public static final void pango_font_description_set_family(int /*long*/ desc, by
* @param desc cast=(PangoFontDescription *)
* @param size cast=(gint)
*/
@@ -23525,7 +23658,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_font_description_set_size(desc, size);
-@@ -13707,8 +13707,8 @@
+@@ -13707,8 +13707,8 @@ public static final void pango_font_description_set_size(int /*long*/ desc, int
* @param desc cast=(PangoFontDescription *)
* @param stretch cast=(PangoStretch)
*/
@@ -23536,7 +23669,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_font_description_set_stretch(desc, stretch);
-@@ -13720,8 +13720,8 @@
+@@ -13720,8 +13720,8 @@ public static final void pango_font_description_set_stretch(int /*long*/ desc, i
* @param desc cast=(PangoFontDescription *)
* @param weight cast=(PangoStyle)
*/
@@ -23547,7 +23680,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_font_description_set_style(desc, weight);
-@@ -13733,8 +13733,8 @@
+@@ -13733,8 +13733,8 @@ public static final void pango_font_description_set_style(int /*long*/ desc, int
* @param desc cast=(PangoFontDescription *)
* @param weight cast=(PangoWeight)
*/
@@ -23558,7 +23691,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_font_description_set_weight(desc, weight);
-@@ -13743,8 +13743,8 @@
+@@ -13743,8 +13743,8 @@ public static final void pango_font_description_set_weight(int /*long*/ desc, in
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -23569,7 +23702,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_description_to_string(desc);
-@@ -13753,8 +13753,8 @@
+@@ -13753,8 +13753,8 @@ public static final int /*long*/ pango_font_description_to_string(int /*long*/ d
}
}
/** @param face cast=(PangoFontFace *) */
@@ -23580,7 +23713,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_face_describe(face);
-@@ -13763,8 +13763,8 @@
+@@ -13763,8 +13763,8 @@ public static final int /*long*/ pango_font_face_describe(int /*long*/ face) {
}
}
/** @param family cast=(PangoFontFamily *) */
@@ -23591,7 +23724,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_family_get_name(family);
-@@ -13777,8 +13777,8 @@
+@@ -13777,8 +13777,8 @@ public static final int /*long*/ pango_font_family_get_name(int /*long*/ family)
* @param faces cast=(PangoFontFace ***)
* @param n_faces cast=(int *)
*/
@@ -23602,7 +23735,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_font_family_list_faces(family, faces, n_faces);
-@@ -13790,8 +13790,8 @@
+@@ -13790,8 +13790,8 @@ public static final void pango_font_family_list_faces(int /*long*/ family, int /
* @param font cast=(PangoFont *)
* @param language cast=(PangoLanguage *)
*/
@@ -23613,7 +23746,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_get_metrics(font, language);
-@@ -13800,8 +13800,8 @@
+@@ -13800,8 +13800,8 @@ public static final int /*long*/ pango_font_get_metrics(int /*long*/ font, int /
}
}
/** @param metrics cast=(PangoFontMetrics *) */
@@ -23624,7 +23757,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_metrics_get_approximate_char_width(metrics);
-@@ -13810,8 +13810,8 @@
+@@ -13810,8 +13810,8 @@ public static final int pango_font_metrics_get_approximate_char_width(int /*long
}
}
/** @param metrics cast=(PangoFontMetrics *) */
@@ -23635,7 +23768,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_metrics_get_ascent(metrics);
-@@ -13820,8 +13820,8 @@
+@@ -13820,8 +13820,8 @@ public static final int pango_font_metrics_get_ascent(int /*long*/ metrics) {
}
}
/** @param metrics cast=(PangoFontMetrics *) */
@@ -23646,7 +23779,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_metrics_get_descent(metrics);
-@@ -13830,8 +13830,8 @@
+@@ -13830,8 +13830,8 @@ public static final int pango_font_metrics_get_descent(int /*long*/ metrics) {
}
}
/** @method flags=dynamic */
@@ -23657,7 +23790,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_metrics_get_underline_thickness(metrics);
-@@ -13840,8 +13840,8 @@
+@@ -13840,8 +13840,8 @@ public static final int pango_font_metrics_get_underline_thickness(int /*long*/
}
}
/** @method flags=dynamic */
@@ -23668,7 +23801,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_metrics_get_underline_position(metrics);
-@@ -13850,8 +13850,8 @@
+@@ -13850,8 +13850,8 @@ public static final int pango_font_metrics_get_underline_position(int /*long*/ m
}
}
/** @method flags=dynamic */
@@ -23679,7 +23812,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_metrics_get_strikethrough_thickness(metrics);
-@@ -13860,8 +13860,8 @@
+@@ -13860,8 +13860,8 @@ public static final int pango_font_metrics_get_strikethrough_thickness(int /*lon
}
}
/** @method flags=dynamic */
@@ -23690,7 +23823,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_font_metrics_get_strikethrough_position(metrics);
-@@ -13870,8 +13870,8 @@
+@@ -13870,8 +13870,8 @@ public static final int pango_font_metrics_get_strikethrough_position(int /*long
}
}
/** @param metrics cast=(PangoFontMetrics *) */
@@ -23701,7 +23834,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_font_metrics_unref(metrics);
-@@ -13880,8 +13880,8 @@
+@@ -13880,8 +13880,8 @@ public static final void pango_font_metrics_unref(int /*long*/ metrics) {
}
}
/** @param language cast=(const char *),flags=no_out */
@@ -23712,7 +23845,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_language_from_string(language);
-@@ -13890,8 +13890,8 @@
+@@ -13890,8 +13890,8 @@ public static final int /*long*/ pango_language_from_string(byte[] language) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -23723,7 +23856,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_context_changed(layout);
-@@ -13900,8 +13900,8 @@
+@@ -13900,8 +13900,8 @@ public static final void pango_layout_context_changed(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout*) */
@@ -23734,7 +23867,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_alignment(layout);
-@@ -13910,8 +13910,8 @@
+@@ -13910,8 +13910,8 @@ public static final int pango_layout_get_alignment(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -23745,7 +23878,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_context(layout);
-@@ -13920,8 +13920,8 @@
+@@ -13920,8 +13920,8 @@ public static final int /*long*/ pango_layout_get_context(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -23756,7 +23889,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_attributes(layout);
-@@ -13930,8 +13930,8 @@
+@@ -13930,8 +13930,8 @@ public static final int /*long*/ pango_layout_get_attributes(int /*long*/ layout
}
}
/** @param layout cast=(PangoLayout*) */
@@ -23767,7 +23900,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_indent(layout);
-@@ -13940,8 +13940,8 @@
+@@ -13940,8 +13940,8 @@ public static final int pango_layout_get_indent(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout*) */
@@ -23778,7 +23911,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_iter(layout);
-@@ -13950,8 +13950,8 @@
+@@ -13950,8 +13950,8 @@ public static final int /*long*/ pango_layout_get_iter(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout*) */
@@ -23789,7 +23922,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_justify(layout);
-@@ -13960,8 +13960,8 @@
+@@ -13960,8 +13960,8 @@ public static final boolean pango_layout_get_justify(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -23800,7 +23933,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_line(layout, line);
-@@ -13970,8 +13970,8 @@
+@@ -13970,8 +13970,8 @@ public static final int /*long*/ pango_layout_get_line(int /*long*/ layout, int
}
}
/** @param layout cast=(PangoLayout*) */
@@ -23811,7 +23944,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_line_count(layout);
-@@ -13984,8 +13984,8 @@
+@@ -13984,8 +13984,8 @@ public static final int pango_layout_get_line_count(int /*long*/ layout) {
* @param attrs cast=(PangoLogAttr **)
* @param n_attrs cast=(int *)
*/
@@ -23822,7 +23955,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_get_log_attrs(layout, attrs, n_attrs);
-@@ -13998,8 +13998,8 @@
+@@ -13998,8 +13998,8 @@ public static final void pango_layout_get_log_attrs(int /*long*/ layout, int /*l
* @param width cast=(int *)
* @param height cast=(int *)
*/
@@ -23833,7 +23966,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_get_size(layout, width, height);
-@@ -14008,8 +14008,8 @@
+@@ -14008,8 +14008,8 @@ public static final void pango_layout_get_size(int /*long*/ layout, int[] width,
}
}
/** @param layout cast=(PangoLayout*) */
@@ -23844,7 +23977,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_spacing(layout);
-@@ -14018,8 +14018,8 @@
+@@ -14018,8 +14018,8 @@ public static final int pango_layout_get_spacing(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout*) */
@@ -23855,7 +23988,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_tabs(layout);
-@@ -14028,8 +14028,8 @@
+@@ -14028,8 +14028,8 @@ public static final int /*long*/ pango_layout_get_tabs(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -23866,7 +23999,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_text(layout);
-@@ -14038,8 +14038,8 @@
+@@ -14038,8 +14038,8 @@ public static final int /*long*/ pango_layout_get_text(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -23877,7 +24010,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_get_width(layout);
-@@ -14051,8 +14051,8 @@
+@@ -14051,8 +14051,8 @@ public static final int pango_layout_get_width(int /*long*/ layout) {
* @param layout cast=(PangoLayout*)
* @param pos flags=no_in
*/
@@ -23888,7 +24021,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_index_to_pos(layout, index, pos);
-@@ -14061,8 +14061,8 @@
+@@ -14061,8 +14061,8 @@ public static final void pango_layout_index_to_pos(int /*long*/ layout, int inde
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -23899,7 +24032,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_iter_free(iter);
-@@ -14075,8 +14075,8 @@
+@@ -14075,8 +14075,8 @@ public static final void pango_layout_iter_free(int /*long*/ iter) {
* @param ink_rect flags=no_in
* @param logical_rect flags=no_in
*/
@@ -23910,7 +24043,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_iter_get_line_extents(iter, ink_rect, logical_rect);
-@@ -14085,8 +14085,8 @@
+@@ -14085,8 +14085,8 @@ public static final void pango_layout_iter_get_line_extents(int /*long*/ iter, P
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -23921,7 +24054,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_iter_get_index(iter);
-@@ -14095,8 +14095,8 @@
+@@ -14095,8 +14095,8 @@ public static final int pango_layout_iter_get_index(int /*long*/ iter) {
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -23932,7 +24065,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_iter_get_run(iter);
-@@ -14105,8 +14105,8 @@
+@@ -14105,8 +14105,8 @@ public static final int /*long*/ pango_layout_iter_get_run(int /*long*/ iter) {
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -23943,7 +24076,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_iter_next_line(iter);
-@@ -14115,8 +14115,8 @@
+@@ -14115,8 +14115,8 @@ public static final boolean pango_layout_iter_next_line(int /*long*/ iter) {
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -23954,7 +24087,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_iter_next_run(iter);
-@@ -14129,8 +14129,8 @@
+@@ -14129,8 +14129,8 @@ public static final boolean pango_layout_iter_next_run(int /*long*/ iter) {
* @param ink_rect cast=(PangoRectangle *),flags=no_in
* @param logical_rect cast=(PangoRectangle *),flags=no_in
*/
@@ -23965,7 +24098,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_line_get_extents(line, ink_rect, logical_rect);
-@@ -14143,8 +14143,8 @@
+@@ -14143,8 +14143,8 @@ public static final void pango_layout_line_get_extents(int /*long*/ line, PangoR
* @param index_ cast=(int *)
* @param trailing cast=(int *)
*/
@@ -23976,7 +24109,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_line_x_to_index(line, x_pos, index_, trailing);
-@@ -14153,8 +14153,8 @@
+@@ -14153,8 +14153,8 @@ public static final boolean pango_layout_line_x_to_index(int /*long*/ line, int
}
}
/** @param context cast=(PangoContext *) */
@@ -23987,7 +24120,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_new(context);
-@@ -14163,8 +14163,8 @@
+@@ -14163,8 +14163,8 @@ public static final int /*long*/ pango_layout_new(int /*long*/ context) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -23998,7 +24131,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_alignment(layout, alignment);
-@@ -14176,8 +14176,8 @@
+@@ -14176,8 +14176,8 @@ public static final void pango_layout_set_alignment (int /*long*/ layout, int al
* @param layout cast=(PangoLayout *)
* @param attrs cast=(PangoAttrList *)
*/
@@ -24009,7 +24142,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_attributes(layout, attrs);
-@@ -14186,8 +14186,8 @@
+@@ -14186,8 +14186,8 @@ public static final void pango_layout_set_attributes(int /*long*/ layout, int /*
}
}
/** @method flags=dynamic */
@@ -24020,7 +24153,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_auto_dir(layout, auto_dir);
-@@ -14199,8 +14199,8 @@
+@@ -14199,8 +14199,8 @@ public static final void pango_layout_set_auto_dir(int /*long*/ layout, boolean
* @param context cast=(PangoLayout *)
* @param descr cast=(PangoFontDescription *)
*/
@@ -24031,7 +24164,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_font_description(context, descr);
-@@ -14209,8 +14209,8 @@
+@@ -14209,8 +14209,8 @@ public static final void pango_layout_set_font_description(int /*long*/ context,
}
}
/** @param layout cast=(PangoLayout*) */
@@ -24042,7 +24175,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_indent(layout, indent);
-@@ -14219,8 +14219,8 @@
+@@ -14219,8 +14219,8 @@ public static final void pango_layout_set_indent(int /*long*/ layout, int indent
}
}
/** @param layout cast=(PangoLayout*) */
@@ -24053,7 +24186,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_justify(layout, justify);
-@@ -14232,8 +14232,8 @@
+@@ -14232,8 +14232,8 @@ public static final void pango_layout_set_justify(int /*long*/ layout, boolean j
* @param context cast=(PangoLayout *)
* @param setting cast=(gboolean)
*/
@@ -24064,7 +24197,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_single_paragraph_mode(context, setting);
-@@ -14242,8 +14242,8 @@
+@@ -14242,8 +14242,8 @@ public static final void pango_layout_set_single_paragraph_mode(int /*long*/ con
}
}
/** @param layout cast=(PangoLayout *) */
@@ -24075,7 +24208,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_spacing(layout, spacing);
-@@ -14255,8 +14255,8 @@
+@@ -14255,8 +14255,8 @@ public static final void pango_layout_set_spacing(int /*long*/ layout, int spaci
* @param layout cast=(PangoLayout *)
* @param tabs cast=(PangoTabArray *)
*/
@@ -24086,7 +24219,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_tabs(layout, tabs);
-@@ -14269,8 +14269,8 @@
+@@ -14269,8 +14269,8 @@ public static final void pango_layout_set_tabs(int /*long*/ layout, int /*long*/
* @param text cast=(const char *),flags=no_out critical
* @param length cast=(int)
*/
@@ -24097,7 +24230,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_text(layout, text, length);
-@@ -14279,8 +14279,8 @@
+@@ -14279,8 +14279,8 @@ public static final void pango_layout_set_text(int /*long*/ layout, byte[] text,
}
}
/** @param layout cast=(PangoLayout *) */
@@ -24108,7 +24241,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_width(layout, width);
-@@ -14289,8 +14289,8 @@
+@@ -14289,8 +14289,8 @@ public static final void pango_layout_set_width(int /*long*/ layout, int width)
}
}
/** @param layout cast=(PangoLayout *) */
@@ -24119,7 +24252,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_layout_set_wrap(layout, wrap);
-@@ -14303,8 +14303,8 @@
+@@ -14303,8 +14303,8 @@ public static final void pango_layout_set_wrap (int /*long*/ layout, int wrap) {
* @param index cast=(int *)
* @param trailing cast=(int *)
*/
@@ -24130,7 +24263,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_layout_xy_to_index(layout, x, y, index, trailing);
-@@ -14313,8 +14313,8 @@
+@@ -14313,8 +14313,8 @@ public static final boolean pango_layout_xy_to_index(int /*long*/ layout, int x,
}
}
/** @param tab_array cast=(PangoTabArray *) */
@@ -24141,7 +24274,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_tab_array_get_size(tab_array);
-@@ -14327,8 +14327,8 @@
+@@ -14327,8 +14327,8 @@ public static final int pango_tab_array_get_size(int /*long*/ tab_array) {
* @param alignments cast=(PangoTabAlign **)
* @param locations cast=(int **)
*/
@@ -24152,7 +24285,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_tab_array_get_tabs(tab_array, alignments, locations);
-@@ -14337,8 +14337,8 @@
+@@ -14337,8 +14337,8 @@ public static final void pango_tab_array_get_tabs(int /*long*/ tab_array, int /*
}
}
/** @param tab_array cast=(PangoTabArray *) */
@@ -24163,7 +24296,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_tab_array_free(tab_array);
-@@ -14350,8 +14350,8 @@
+@@ -14350,8 +14350,8 @@ public static final void pango_tab_array_free(int /*long*/ tab_array) {
* @param initial_size cast=(gint)
* @param positions_in_pixels cast=(gboolean)
*/
@@ -24174,7 +24307,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _pango_tab_array_new(initial_size, positions_in_pixels);
-@@ -14365,8 +14365,8 @@
+@@ -14365,8 +14365,8 @@ public static final int /*long*/ pango_tab_array_new(int initial_size, boolean p
* @param alignment cast=(PangoTabAlign)
* @param location cast=(gint)
*/
@@ -24185,7 +24318,7 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_pango_tab_array_set_tab(tab_array, tab_index, alignment, location);
-@@ -14380,8 +14380,8 @@
+@@ -14380,8 +14380,8 @@ public static final void pango_tab_array_set_tab(int /*long*/ tab_array, int tab
* @param relationship cast=(AtkRelationType)
* @param target cast=(AtkObject *)
*/
@@ -24196,10 +24329,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _atk_object_add_relationship(object, relationship, target);
-diff -urN x86/org/eclipse/swt/internal/gtk/PangoAttribute.java x86_64/org/eclipse/swt/internal/gtk/PangoAttribute.java
---- x86/org/eclipse/swt/internal/gtk/PangoAttribute.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/PangoAttribute.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,7 +17,7 @@
+diff --git a/org/eclipse/swt/internal/gtk/PangoAttribute.java b/org/eclipse/swt/internal/gtk/PangoAttribute.java
+index f218643..e7ffd49 100644
+--- a/org/eclipse/swt/internal/gtk/PangoAttribute.java
++++ b/org/eclipse/swt/internal/gtk/PangoAttribute.java
+@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class PangoAttribute {
/** @field cast=(const PangoAttrClass *) */
@@ -24208,10 +24342,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/PangoAttribute.java x86_64/org/eclips
public int start_index;
public int end_index;
public static final int sizeof = OS.PangoAttribute_sizeof();
-diff -urN x86/org/eclipse/swt/internal/gtk/PangoItem.java x86_64/org/eclipse/swt/internal/gtk/PangoItem.java
---- x86/org/eclipse/swt/internal/gtk/PangoItem.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/PangoItem.java 2009-09-17 08:48:24.000000000 -0400
-@@ -19,16 +19,16 @@
+diff --git a/org/eclipse/swt/internal/gtk/PangoItem.java b/org/eclipse/swt/internal/gtk/PangoItem.java
+index c0f5b01..2cee5a8 100644
+--- a/org/eclipse/swt/internal/gtk/PangoItem.java
++++ b/org/eclipse/swt/internal/gtk/PangoItem.java
+@@ -19,16 +19,16 @@ public class PangoItem {
public int length;
public int num_chars;
/** @field accessor=analysis.shape_engine,cast=(PangoEngineShape *) */
@@ -24233,10 +24368,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/PangoItem.java x86_64/org/eclipse/swt
+ public long /*int*/ analysis_extra_attrs;
public static final int sizeof = OS.PangoItem_sizeof();
}
-diff -urN x86/org/eclipse/swt/internal/gtk/PangoLayoutLine.java x86_64/org/eclipse/swt/internal/gtk/PangoLayoutLine.java
---- x86/org/eclipse/swt/internal/gtk/PangoLayoutLine.java 2008-09-10 18:29:30.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/PangoLayoutLine.java 2009-09-17 08:48:24.000000000 -0400
-@@ -16,11 +16,11 @@
+diff --git a/org/eclipse/swt/internal/gtk/PangoLayoutLine.java b/org/eclipse/swt/internal/gtk/PangoLayoutLine.java
+index d1517c6..b50c9c1 100644
+--- a/org/eclipse/swt/internal/gtk/PangoLayoutLine.java
++++ b/org/eclipse/swt/internal/gtk/PangoLayoutLine.java
+@@ -16,11 +16,11 @@ package org.eclipse.swt.internal.gtk;
public class PangoLayoutLine {
/** @field cast=(PangoLayout *) */
@@ -24250,10 +24386,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/PangoLayoutLine.java x86_64/org/eclip
// public boolean is_paragraph_start;
// public byte resolved_dir;
public static final int sizeof = OS.PangoLayoutLine_sizeof();
-diff -urN x86/org/eclipse/swt/internal/gtk/PangoLayoutRun.java x86_64/org/eclipse/swt/internal/gtk/PangoLayoutRun.java
---- x86/org/eclipse/swt/internal/gtk/PangoLayoutRun.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/PangoLayoutRun.java 2009-09-17 08:48:24.000000000 -0400
-@@ -16,8 +16,8 @@
+diff --git a/org/eclipse/swt/internal/gtk/PangoLayoutRun.java b/org/eclipse/swt/internal/gtk/PangoLayoutRun.java
+index b032b6a..121bb50 100644
+--- a/org/eclipse/swt/internal/gtk/PangoLayoutRun.java
++++ b/org/eclipse/swt/internal/gtk/PangoLayoutRun.java
+@@ -16,8 +16,8 @@ package org.eclipse.swt.internal.gtk;
public class PangoLayoutRun {
/** @field cast=(PangoItem *) */
@@ -24264,10 +24401,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/PangoLayoutRun.java x86_64/org/eclips
+ public long /*int*/ glyphs;
public static final int sizeof = OS.PangoLayoutRun_sizeof();
}
-diff -urN x86/org/eclipse/swt/internal/gtk/XAnyEvent.java x86_64/org/eclipse/swt/internal/gtk/XAnyEvent.java
---- x86/org/eclipse/swt/internal/gtk/XAnyEvent.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/XAnyEvent.java 2009-09-17 08:48:24.000000000 -0400
-@@ -12,11 +12,11 @@
+diff --git a/org/eclipse/swt/internal/gtk/XAnyEvent.java b/org/eclipse/swt/internal/gtk/XAnyEvent.java
+index 9fc6482..f13f486 100644
+--- a/org/eclipse/swt/internal/gtk/XAnyEvent.java
++++ b/org/eclipse/swt/internal/gtk/XAnyEvent.java
+@@ -12,11 +12,11 @@ package org.eclipse.swt.internal.gtk;
public abstract class XAnyEvent extends XEvent {
@@ -24282,10 +24420,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/XAnyEvent.java x86_64/org/eclipse/swt
+ public long /*int*/ window;
public static final int sizeof = OS.XAnyEvent_sizeof();
}
-diff -urN x86/org/eclipse/swt/internal/gtk/XClientMessageEvent.java x86_64/org/eclipse/swt/internal/gtk/XClientMessageEvent.java
---- x86/org/eclipse/swt/internal/gtk/XClientMessageEvent.java 2009-05-29 17:30:10.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/XClientMessageEvent.java 2009-09-17 08:48:24.000000000 -0400
-@@ -13,16 +13,16 @@
+diff --git a/org/eclipse/swt/internal/gtk/XClientMessageEvent.java b/org/eclipse/swt/internal/gtk/XClientMessageEvent.java
+index b1428fd..8983ab4 100644
+--- a/org/eclipse/swt/internal/gtk/XClientMessageEvent.java
++++ b/org/eclipse/swt/internal/gtk/XClientMessageEvent.java
+@@ -13,16 +13,16 @@ package org.eclipse.swt.internal.gtk;
public class XClientMessageEvent {
public int type;
@@ -24307,10 +24446,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/XClientMessageEvent.java x86_64/org/e
+ public long /*int*/[] data = new long /*int*/[5];
public static final int sizeof = OS.XClientMessageEvent_sizeof();
}
-diff -urN x86/org/eclipse/swt/internal/gtk/XCrossingEvent.java x86_64/org/eclipse/swt/internal/gtk/XCrossingEvent.java
---- x86/org/eclipse/swt/internal/gtk/XCrossingEvent.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/XCrossingEvent.java 2009-09-17 08:48:24.000000000 -0400
-@@ -13,9 +13,9 @@
+diff --git a/org/eclipse/swt/internal/gtk/XCrossingEvent.java b/org/eclipse/swt/internal/gtk/XCrossingEvent.java
+index b8631b9..1aded65 100644
+--- a/org/eclipse/swt/internal/gtk/XCrossingEvent.java
++++ b/org/eclipse/swt/internal/gtk/XCrossingEvent.java
+@@ -13,9 +13,9 @@ package org.eclipse.swt.internal.gtk;
public class XCrossingEvent extends XAnyEvent {
/** @field cast=(Window) */
@@ -24322,10 +24462,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/XCrossingEvent.java x86_64/org/eclips
/** @field cast=(Time) */
public int time;
public int x;
-diff -urN x86/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java x86_64/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java
---- x86/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java 2006-05-09 15:46:50.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java 2009-09-17 08:48:24.000000000 -0400
-@@ -13,17 +13,17 @@
+diff --git a/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java b/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java
+index 9509633..6277565 100644
+--- a/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java
++++ b/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java
+@@ -13,17 +13,17 @@ package org.eclipse.swt.internal.gtk;
public class XRenderPictureAttributes {
public boolean repeat;
@@ -24346,10 +24487,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java x86_64/
public boolean component_alpha;
public static final int sizeof = OS.XRenderPictureAttributes_sizeof();
}
-diff -urN x86/org/eclipse/swt/internal/gtk/XWindowChanges.java x86_64/org/eclipse/swt/internal/gtk/XWindowChanges.java
---- x86/org/eclipse/swt/internal/gtk/XWindowChanges.java 2009-05-29 17:30:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/XWindowChanges.java 2009-09-17 08:48:24.000000000 -0400
-@@ -17,7 +17,7 @@
+diff --git a/org/eclipse/swt/internal/gtk/XWindowChanges.java b/org/eclipse/swt/internal/gtk/XWindowChanges.java
+index b748c34..df24fb9 100644
+--- a/org/eclipse/swt/internal/gtk/XWindowChanges.java
++++ b/org/eclipse/swt/internal/gtk/XWindowChanges.java
+@@ -17,7 +17,7 @@ public class XWindowChanges {
public int width;
public int height;
public int border_width;
@@ -24358,4373 +24500,11 @@ diff -urN x86/org/eclipse/swt/internal/gtk/XWindowChanges.java x86_64/org/eclips
public int stack_mode;
public static final int sizeof = OS.XWindowChanges_sizeof();
}
-diff -urN x86/org/eclipse/swt/internal/Library.java x86_64/org/eclipse/swt/internal/Library.java
---- x86/org/eclipse/swt/internal/Library.java 2009-09-09 15:57:44.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/Library.java 2009-09-17 08:48:24.000000000 -0400
-@@ -39,7 +39,7 @@
- static final String SEPARATOR;
-
- /* 64-bit support */
-- static /*final*/ boolean IS_64 = 0x1FFFFFFFFL == (int /*long*/)0x1FFFFFFFFL;
-+ static /*final*/ boolean IS_64 = 0x1FFFFFFFFL == (long /*int*/)0x1FFFFFFFFL;
- static final String SUFFIX_64 = "-64"; //$NON-NLS-1$
- static final String SWTDIR_32 = "swtlib-32"; //$NON-NLS-1$
- static final String SWTDIR_64 = "swtlib-64"; //$NON-NLS-1$
-diff -urN x86/org/eclipse/swt/internal/LONG.java x86_64/org/eclipse/swt/internal/LONG.java
---- x86/org/eclipse/swt/internal/LONG.java 2009-05-29 17:30:14.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/LONG.java 2009-09-17 08:48:24.000000000 -0400
-@@ -12,9 +12,9 @@
-
- /** @jniclass flags=no_gen */
- public class LONG {
-- public int /*long*/ value;
-+ public long /*int*/ value;
-
-- public LONG (int /*long*/ value) {
-+ public LONG (long /*int*/ value) {
- this.value = value;
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java x86_64/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java
---- x86/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java 2009-05-29 17:30:32.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java 2009-09-17 08:48:20.000000000 -0400
-@@ -13,10 +13,10 @@
- /** @jniclass flags=cpp */
- public class GREVersionRange {
- /** @field cast=(const char *) */
-- public int /*long*/ lower;
-+ public long /*int*/ lower;
- public boolean lowerInclusive;
- /** @field cast=(const char *) */
-- public int /*long*/ upper;
-+ public long /*int*/ upper;
- public boolean upperInclusive;
- public static final int sizeof = XPCOMInit.GREVersionRange_sizeof();
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java x86_64/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java
---- x86/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java 2008-09-10 18:29:32.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java 2009-09-17 08:48:20.000000000 -0400
-@@ -40,8 +40,8 @@
- * @param properties cast=(const GREProperty *)
- * @param buffer cast=(char *)
- */
--public static final native int _GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, int /*long*/ properties, int propertiesLength, int /*long*/ buffer, int buflen);
--public static final int GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, int /*long*/ properties, int propertiesLength, int /*long*/ buffer, int buflen) {
-+public static final native int _GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, long /*int*/ properties, int propertiesLength, long /*int*/ buffer, int buflen);
-+public static final int GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, long /*int*/ properties, int propertiesLength, long /*int*/ buffer, int buflen) {
- lock.lock();
- try {
- return _GRE_GetGREPathWithProperties(versions, versionsLength, properties, propertiesLength, buffer, buflen);
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java x86_64/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java
---- x86/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java 2009-04-01 14:55:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java 2009-09-17 08:48:20.000000000 -0400
-@@ -12,7 +12,7 @@
-
- public class nsDynamicFunctionLoad {
- /** @field cast=(const char *) */
-- public int /*long*/ functionName;
-+ public long /*int*/ functionName;
- /** @field cast=(NSFuncPtr *) */
-- public int /*long*/ function;
-+ public long /*int*/ function;
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsEmbedString.java x86_64/org/eclipse/swt/internal/mozilla/nsEmbedString.java
---- x86/org/eclipse/swt/internal/mozilla/nsEmbedString.java 2006-05-09 14:54:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsEmbedString.java 2009-09-17 08:48:20.000000000 -0400
-@@ -28,7 +28,7 @@
- package org.eclipse.swt.internal.mozilla;
-
- public class nsEmbedString {
-- int /*long*/ handle;
-+ long /*int*/ handle;
-
- public nsEmbedString() {
- handle = XPCOM.nsEmbedString_new();
-@@ -42,14 +42,14 @@
- }
- }
-
--public int /*long*/ getAddress() {
-+public long /*int*/ getAddress() {
- return handle;
- }
-
- public String toString() {
- if (handle == 0) return null;
- int length = XPCOM.nsEmbedString_Length(handle);
-- int /*long*/ buffer = XPCOM.nsEmbedString_get(handle);
-+ long /*int*/ buffer = XPCOM.nsEmbedString_get(handle);
- char[] dest = new char[length];
- XPCOM.memmove(dest, buffer, length * 2);
- return new String(dest);
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIAppShell.java x86_64/org/eclipse/swt/internal/mozilla/nsIAppShell.java
---- x86/org/eclipse/swt/internal/mozilla/nsIAppShell.java 2008-10-22 16:19:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIAppShell.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,11 +37,11 @@
- public static final nsID NS_IAPPSHELL_IID =
- new nsID(NS_IAPPSHELL_IID_STR);
-
-- public nsIAppShell(int /*long*/ address) {
-+ public nsIAppShell(long /*int*/ address) {
- super(address);
- }
-
-- public int Create(int /*long*/ argc, int /*long*/[] argv) {
-+ public int Create(long /*int*/ argc, long /*int*/[] argv) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), argc, argv);
- }
-
-@@ -57,15 +57,15 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
- }
-
-- public int ListenToEventQueue(int /*long*/ aQueue, int aListen) {
-+ public int ListenToEventQueue(long /*int*/ aQueue, int aListen) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aQueue, aListen);
- }
-
-- public int GetNativeEvent(int /*long*/ aRealEvent, int /*long*/[] aEvent) {
-+ public int GetNativeEvent(long /*int*/ aRealEvent, long /*int*/[] aEvent) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aRealEvent, aEvent);
- }
-
-- public int DispatchNativeEvent(int aRealEvent, int /*long*/ aEvent) {
-+ public int DispatchNativeEvent(int aRealEvent, long /*int*/ aEvent) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aRealEvent, aEvent);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java x86_64/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java
---- x86/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java 2008-03-04 12:13:06.000000000 -0500
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IAUTHINFORMATION_IID =
- new nsID(NS_IAUTHINFORMATION_IID_STR);
-
-- public nsIAuthInformation(int /*long*/ address) {
-+ public nsIAuthInformation(long /*int*/ address) {
- super(address);
- }
-
-@@ -53,35 +53,35 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aFlags);
- }
-
-- public int GetRealm(int /*long*/ aRealm) {
-+ public int GetRealm(long /*int*/ aRealm) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aRealm);
- }
-
-- public int GetAuthenticationScheme(int /*long*/ aAuthenticationScheme) {
-+ public int GetAuthenticationScheme(long /*int*/ aAuthenticationScheme) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aAuthenticationScheme);
- }
-
-- public int GetUsername(int /*long*/ aUsername) {
-+ public int GetUsername(long /*int*/ aUsername) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aUsername);
- }
-
-- public int SetUsername(int /*long*/ aUsername) {
-+ public int SetUsername(long /*int*/ aUsername) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aUsername);
- }
-
-- public int GetPassword(int /*long*/ aPassword) {
-+ public int GetPassword(long /*int*/ aPassword) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aPassword);
- }
-
-- public int SetPassword(int /*long*/ aPassword) {
-+ public int SetPassword(long /*int*/ aPassword) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aPassword);
- }
-
-- public int GetDomain(int /*long*/ aDomain) {
-+ public int GetDomain(long /*int*/ aDomain) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aDomain);
- }
-
-- public int SetDomain(int /*long*/ aDomain) {
-+ public int SetDomain(long /*int*/ aDomain) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDomain);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java x86_64/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java
---- x86/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java 2009-08-19 16:24:48.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,11 +37,11 @@
- public static final nsID NS_IBADCERTLISTENER2_IID =
- new nsID(NS_IBADCERTLISTENER2_IID_STR);
-
-- public nsIBadCertListener2(int /*long*/ address) {
-+ public nsIBadCertListener2(long /*int*/ address) {
- super(address);
- }
-
-- public int NotifyCertProblem(int /*long*/ socketInfo, int /*long*/ status, int /*long*/ targetSite, int[] _retval) {
-+ public int NotifyCertProblem(long /*int*/ socketInfo, long /*int*/ status, long /*int*/ targetSite, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), socketInfo, status, targetSite, _retval);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java x86_64/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
---- x86/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java 2008-10-22 16:19:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,11 +37,11 @@
- public static final nsID NS_IBASEWINDOW_IID =
- new nsID(NS_IBASEWINDOW_IID_STR);
-
-- public nsIBaseWindow(int /*long*/ address) {
-+ public nsIBaseWindow(long /*int*/ address) {
- super(address);
- }
-
-- public int InitWindow(int /*long*/ parentNativeWindow, int /*long*/ parentWidget, int x, int y, int cx, int cy) {
-+ public int InitWindow(long /*int*/ parentNativeWindow, long /*int*/ parentWidget, int x, int y, int cx, int cy) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parentNativeWindow, parentWidget, x, y, cx, cy);
- }
-
-@@ -81,19 +81,19 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), force);
- }
-
-- public int GetParentWidget(int /*long*/[] aParentWidget) {
-+ public int GetParentWidget(long /*int*/[] aParentWidget) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aParentWidget);
- }
-
-- public int SetParentWidget(int /*long*/ aParentWidget) {
-+ public int SetParentWidget(long /*int*/ aParentWidget) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aParentWidget);
- }
-
-- public int GetParentNativeWindow(int /*long*/[] aParentNativeWindow) {
-+ public int GetParentNativeWindow(long /*int*/[] aParentNativeWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aParentNativeWindow);
- }
-
-- public int SetParentNativeWindow(int /*long*/ aParentNativeWindow) {
-+ public int SetParentNativeWindow(long /*int*/ aParentNativeWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentNativeWindow);
- }
-
-@@ -121,7 +121,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aBlurSuppression);
- }
-
-- public int GetMainWidget(int /*long*/[] aMainWidget) {
-+ public int GetMainWidget(long /*int*/[] aMainWidget) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aMainWidget);
- }
-
-@@ -129,7 +129,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress());
- }
-
-- public int GetTitle(int /*long*/[] aTitle) {
-+ public int GetTitle(long /*int*/[] aTitle) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aTitle);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsICancelable.java x86_64/org/eclipse/swt/internal/mozilla/nsICancelable.java
---- x86/org/eclipse/swt/internal/mozilla/nsICancelable.java 2006-10-26 11:24:38.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsICancelable.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_ICANCELABLE_IID =
- new nsID(NS_ICANCELABLE_IID_STR);
-
-- public nsICancelable(int /*long*/ address) {
-+ public nsICancelable(long /*int*/ address) {
- super(address);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsICategoryManager.java x86_64/org/eclipse/swt/internal/mozilla/nsICategoryManager.java
---- x86/org/eclipse/swt/internal/mozilla/nsICategoryManager.java 2008-10-22 16:19:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsICategoryManager.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,15 +37,15 @@
- public static final nsID NS_ICATEGORYMANAGER_IID =
- new nsID(NS_ICATEGORYMANAGER_IID_STR);
-
-- public nsICategoryManager(int /*long*/ address) {
-+ public nsICategoryManager(long /*int*/ address) {
- super(address);
- }
-
-- public int GetCategoryEntry(byte[] aCategory, byte[] aEntry, int /*long*/[] _retval) {
-+ public int GetCategoryEntry(byte[] aCategory, byte[] aEntry, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCategory, aEntry, _retval);
- }
-
-- public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, int /*long*/[] _retval) {
-+ public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCategory, aEntry, aValue, aPersist, aReplace, _retval);
- }
-
-@@ -57,11 +57,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aCategory);
- }
-
-- public int EnumerateCategory(byte[] aCategory, int /*long*/[] _retval) {
-+ public int EnumerateCategory(byte[] aCategory, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCategory, _retval);
- }
-
-- public int EnumerateCategories(int /*long*/[] _retval) {
-+ public int EnumerateCategories(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java x86_64/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java
---- x86/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java 2009-08-19 16:24:48.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,31 +37,31 @@
- public static final nsID NS_ICERTIFICATEDIALOGS_IID =
- new nsID(NS_ICERTIFICATEDIALOGS_IID_STR);
-
-- public nsICertificateDialogs(int /*long*/ address) {
-+ public nsICertificateDialogs(long /*int*/ address) {
- super(address);
- }
-
-- public int ConfirmDownloadCACert(int /*long*/ ctx, int /*long*/ cert, int[] trust, int[] _retval) {
-+ public int ConfirmDownloadCACert(long /*int*/ ctx, long /*int*/ cert, int[] trust, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), ctx, cert, trust, _retval);
- }
-
-- public int NotifyCACertExists(int /*long*/ ctx) {
-+ public int NotifyCACertExists(long /*int*/ ctx) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), ctx);
- }
-
-- public int SetPKCS12FilePassword(int /*long*/ ctx, int /*long*/ password, int[] _retval) {
-+ public int SetPKCS12FilePassword(long /*int*/ ctx, long /*int*/ password, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ctx, password, _retval);
- }
-
-- public int GetPKCS12FilePassword(int /*long*/ ctx, int /*long*/ password, int[] _retval) {
-+ public int GetPKCS12FilePassword(long /*int*/ ctx, long /*int*/ password, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), ctx, password, _retval);
- }
-
-- public int ViewCert(int /*long*/ ctx, int /*long*/ cert) {
-+ public int ViewCert(long /*int*/ ctx, long /*int*/ cert) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), ctx, cert);
- }
-
-- public int CrlImportStatusDialog(int /*long*/ ctx, int /*long*/ crl) {
-+ public int CrlImportStatusDialog(long /*int*/ ctx, long /*int*/ crl) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), ctx, crl);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java x86_64/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java
---- x86/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java 2009-08-19 16:24:46.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_ICERTOVERRIDESERVICE_IID =
- new nsID(NS_ICERTOVERRIDESERVICE_IID_STR);
-
-- public nsICertOverrideService(int /*long*/ address) {
-+ public nsICertOverrideService(long /*int*/ address) {
- super(address);
- }
-
-@@ -47,27 +47,27 @@
-
- public static final int ERROR_TIME = 4;
-
-- public int RememberValidityOverride(int /*long*/ aHostName, int aPort, int /*long*/ aCert, int aOverrideBits, int aTemporary) {
-+ public int RememberValidityOverride(long /*int*/ aHostName, int aPort, long /*int*/ aCert, int aOverrideBits, int aTemporary) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aHostName, aPort, aCert, aOverrideBits, aTemporary);
- }
-
-- public int HasMatchingOverride(int /*long*/ aHostName, int aPort, int /*long*/ aCert, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
-+ public int HasMatchingOverride(long /*int*/ aHostName, int aPort, long /*int*/ aCert, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aHostName, aPort, aCert, aOverrideBits, aIsTemporary, _retval);
- }
-
-- public int GetValidityOverride(int /*long*/ aHostName, int aPort, int /*long*/ aHashAlg, int /*long*/ aFingerprint, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
-+ public int GetValidityOverride(long /*int*/ aHostName, int aPort, long /*int*/ aHashAlg, long /*int*/ aFingerprint, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aHostName, aPort, aHashAlg, aFingerprint, aOverrideBits, aIsTemporary, _retval);
- }
-
-- public int ClearValidityOverride(int /*long*/ aHostName, int aPort) {
-+ public int ClearValidityOverride(long /*int*/ aHostName, int aPort) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHostName, aPort);
- }
-
-- public int GetAllOverrideHostsWithPorts(int[] aCount, int /*long*/[] aHostsWithPortsArray) {
-+ public int GetAllOverrideHostsWithPorts(int[] aCount, long /*int*/[] aHostsWithPortsArray) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCount, aHostsWithPortsArray);
- }
-
-- public int IsCertUsedForOverrides(int /*long*/ aCert, int aCheckTemporaries, int aCheckPermanents, int[] _retval) {
-+ public int IsCertUsedForOverrides(long /*int*/ aCert, int aCheckTemporaries, int aCheckPermanents, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCert, aCheckTemporaries, aCheckPermanents, _retval);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIChannel.java x86_64/org/eclipse/swt/internal/mozilla/nsIChannel.java
---- x86/org/eclipse/swt/internal/mozilla/nsIChannel.java 2008-03-04 12:13:06.000000000 -0500
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIChannel.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,55 +37,55 @@
- public static final nsID NS_ICHANNEL_IID =
- new nsID(NS_ICHANNEL_IID_STR);
-
-- public nsIChannel(int /*long*/ address) {
-+ public nsIChannel(long /*int*/ address) {
- super(address);
- }
-
-- public int GetOriginalURI(int /*long*/[] aOriginalURI) {
-+ public int GetOriginalURI(long /*int*/[] aOriginalURI) {
- return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 1, getAddress(), aOriginalURI);
- }
-
-- public int SetOriginalURI(int /*long*/ aOriginalURI) {
-+ public int SetOriginalURI(long /*int*/ aOriginalURI) {
- return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 2, getAddress(), aOriginalURI);
- }
-
-- public int GetURI(int /*long*/[] aURI) {
-+ public int GetURI(long /*int*/[] aURI) {
- return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 3, getAddress(), aURI);
- }
-
-- public int GetOwner(int /*long*/[] aOwner) {
-+ public int GetOwner(long /*int*/[] aOwner) {
- return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 4, getAddress(), aOwner);
- }
-
-- public int SetOwner(int /*long*/ aOwner) {
-+ public int SetOwner(long /*int*/ aOwner) {
- return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 5, getAddress(), aOwner);
- }
-
-- public int GetNotificationCallbacks(int /*long*/[] aNotificationCallbacks) {
-+ public int GetNotificationCallbacks(long /*int*/[] aNotificationCallbacks) {
- return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 6, getAddress(), aNotificationCallbacks);
- }
-
-- public int SetNotificationCallbacks(int /*long*/ aNotificationCallbacks) {
-+ public int SetNotificationCallbacks(long /*int*/ aNotificationCallbacks) {
- return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 7, getAddress(), aNotificationCallbacks);
- }
-
-- public int GetSecurityInfo(int /*long*/[] aSecurityInfo) {
-+ public int GetSecurityInfo(long /*int*/[] aSecurityInfo) {
- return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 8, getAddress(), aSecurityInfo);
- }
-
-- public int GetContentType(int /*long*/ aContentType) {
-+ public int GetContentType(long /*int*/ aContentType) {
- return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 9, getAddress(), aContentType);
- }
-
-- public int SetContentType(int /*long*/ aContentType) {
-+ public int SetContentType(long /*int*/ aContentType) {
- return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 10, getAddress(), aContentType);
- }
-
-- public int GetContentCharset(int /*long*/ aContentCharset) {
-+ public int GetContentCharset(long /*int*/ aContentCharset) {
- return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 11, getAddress(), aContentCharset);
- }
-
-- public int SetContentCharset(int /*long*/ aContentCharset) {
-+ public int SetContentCharset(long /*int*/ aContentCharset) {
- return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 12, getAddress(), aContentCharset);
- }
-
-@@ -97,11 +97,11 @@
- return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 14, getAddress(), aContentLength);
- }
-
-- public int Open(int /*long*/[] _retval) {
-+ public int Open(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 15, getAddress(), _retval);
- }
-
-- public int AsyncOpen(int /*long*/ aListener, int /*long*/ aContext) {
-+ public int AsyncOpen(long /*int*/ aListener, long /*int*/ aContext) {
- return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 16, getAddress(), aListener, aContext);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIClassInfo.java x86_64/org/eclipse/swt/internal/mozilla/nsIClassInfo.java
---- x86/org/eclipse/swt/internal/mozilla/nsIClassInfo.java 2008-12-02 11:18:44.000000000 -0500
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIClassInfo.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,27 +37,27 @@
- public static final nsID NS_ICLASSINFO_IID =
- new nsID(NS_ICLASSINFO_IID_STR);
-
-- public nsIClassInfo(int /*long*/ address) {
-+ public nsIClassInfo(long /*int*/ address) {
- super(address);
- }
-
-- public int GetInterfaces(int[] count, int /*long*/[] array) {
-+ public int GetInterfaces(int[] count, long /*int*/[] array) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), count, array);
- }
-
-- public int GetHelperForLanguage(int language, int /*long*/[] _retval) {
-+ public int GetHelperForLanguage(int language, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), language, _retval);
- }
-
-- public int GetContractID(int /*long*/[] aContractID) {
-+ public int GetContractID(long /*int*/[] aContractID) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContractID);
- }
-
-- public int GetClassDescription(int /*long*/[] aClassDescription) {
-+ public int GetClassDescription(long /*int*/[] aClassDescription) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClassDescription);
- }
-
-- public int GetClassID(int /*long*/ aClassID) {
-+ public int GetClassID(long /*int*/ aClassID) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClassID);
- }
-
-@@ -85,7 +85,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aFlags);
- }
-
-- public int GetClassIDNoAlloc(int /*long*/ aClassIDNoAlloc) {
-+ public int GetClassIDNoAlloc(long /*int*/ aClassIDNoAlloc) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aClassIDNoAlloc);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIComponentManager.java x86_64/org/eclipse/swt/internal/mozilla/nsIComponentManager.java
---- x86/org/eclipse/swt/internal/mozilla/nsIComponentManager.java 2006-05-09 14:54:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIComponentManager.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,23 +37,23 @@
- public static final nsID NS_ICOMPONENTMANAGER_IID =
- new nsID(NS_ICOMPONENTMANAGER_IID_STR);
-
-- public nsIComponentManager(int /*long*/ address) {
-+ public nsIComponentManager(long /*int*/ address) {
- super(address);
- }
-
-- public int GetClassObject(nsID aClass, nsID aIID, int /*long*/[] result) {
-+ public int GetClassObject(nsID aClass, nsID aIID, long /*int*/[] result) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result);
- }
-
-- public int GetClassObjectByContractID(byte[] aContractID, nsID aIID, int /*long*/[] result) {
-+ public int GetClassObjectByContractID(byte[] aContractID, nsID aIID, long /*int*/[] result) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);
- }
-
-- public int CreateInstance(nsID aClass, int /*long*/ aDelegate, nsID aIID, int /*long*/[] result) {
-+ public int CreateInstance(nsID aClass, long /*int*/ aDelegate, nsID aIID, long /*int*/[] result) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aDelegate, aIID, result);
- }
-
-- public int CreateInstanceByContractID(byte[] aContractID, int /*long*/ aDelegate, nsID aIID, int /*long*/[] result) {
-+ public int CreateInstanceByContractID(byte[] aContractID, long /*int*/ aDelegate, nsID aIID, long /*int*/[] result) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContractID, aDelegate, aIID, result);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java x86_64/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java
---- x86/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java 2008-10-22 16:19:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,31 +37,31 @@
- public static final nsID NS_ICOMPONENTREGISTRAR_IID =
- new nsID(NS_ICOMPONENTREGISTRAR_IID_STR);
-
-- public nsIComponentRegistrar(int /*long*/ address) {
-+ public nsIComponentRegistrar(long /*int*/ address) {
- super(address);
- }
-
-- public int AutoRegister(int /*long*/ aSpec) {
-+ public int AutoRegister(long /*int*/ aSpec) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);
- }
-
-- public int AutoUnregister(int /*long*/ aSpec) {
-+ public int AutoUnregister(long /*int*/ aSpec) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);
- }
-
-- public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFactory) {
-+ public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, long /*int*/ aFactory) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aClassName, aContractID, aFactory);
- }
-
-- public int UnregisterFactory(nsID aClass, int /*long*/ aFactory) {
-+ public int UnregisterFactory(nsID aClass, long /*int*/ aFactory) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClass, aFactory);
- }
-
-- public int RegisterFactoryLocation(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFile, byte[] aLoaderStr, byte[] aType) {
-+ public int RegisterFactoryLocation(nsID aClass, byte[] aClassName, byte[] aContractID, long /*int*/ aFile, byte[] aLoaderStr, byte[] aType) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClass, aClassName, aContractID, aFile, aLoaderStr, aType);
- }
-
-- public int UnregisterFactoryLocation(nsID aClass, int /*long*/ aFile) {
-+ public int UnregisterFactoryLocation(nsID aClass, long /*int*/ aFile) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aClass, aFile);
- }
-
-@@ -73,19 +73,19 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aContractID, _retval);
- }
-
-- public int EnumerateCIDs(int /*long*/[] _retval) {
-+ public int EnumerateCIDs(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
- }
-
-- public int EnumerateContractIDs(int /*long*/[] _retval) {
-+ public int EnumerateContractIDs(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval);
- }
-
-- public int CIDToContractID(nsID aClass, int /*long*/[] _retval) {
-+ public int CIDToContractID(nsID aClass, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aClass, _retval);
- }
-
-- public int ContractIDToCID(byte[] aContractID, int /*long*/ _retval) {
-+ public int ContractIDToCID(byte[] aContractID, long /*int*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aContractID, _retval);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java x86_64/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java
---- x86/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java 2006-05-09 14:54:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_ICONTEXTMENULISTENER_IID =
- new nsID(NS_ICONTEXTMENULISTENER_IID_STR);
-
-- public nsIContextMenuListener(int /*long*/ address) {
-+ public nsIContextMenuListener(long /*int*/ address) {
- super(address);
- }
-
-@@ -53,7 +53,7 @@
-
- public static final int CONTEXT_INPUT = 16;
-
-- public int OnShowContextMenu(int aContextFlags, int /*long*/ aEvent, int /*long*/ aNode) {
-+ public int OnShowContextMenu(int aContextFlags, long /*int*/ aEvent, long /*int*/ aNode) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aContextFlags, aEvent, aNode);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookie.java x86_64/org/eclipse/swt/internal/mozilla/nsICookie.java
---- x86/org/eclipse/swt/internal/mozilla/nsICookie.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsICookie.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,15 +37,15 @@
- public static final nsID NS_ICOOKIE_IID =
- new nsID(NS_ICOOKIE_IID_STR);
-
-- public nsICookie(int /*long*/ address) {
-+ public nsICookie(long /*int*/ address) {
- super(address);
- }
-
-- public int GetName(int /*long*/ aName) {
-+ public int GetName(long /*int*/ aName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);
- }
-
-- public int GetValue(int /*long*/ aValue) {
-+ public int GetValue(long /*int*/ aValue) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aValue);
- }
-
-@@ -53,11 +53,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aIsDomain);
- }
-
-- public int GetHost(int /*long*/ aHost) {
-+ public int GetHost(long /*int*/ aHost) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHost);
- }
-
-- public int GetPath(int /*long*/ aPath) {
-+ public int GetPath(long /*int*/ aPath) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPath);
- }
-
-@@ -79,7 +79,7 @@
-
- public static final int STATUS_REJECTED = 4;
-
-- public int GetStatus(int /*long*/ aStatus) {
-+ public int GetStatus(long /*int*/ aStatus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStatus);
- }
-
-@@ -95,7 +95,7 @@
-
- public static final int POLICY_NO_II = 5;
-
-- public int GetPolicy(int /*long*/ aPolicy) {
-+ public int GetPolicy(long /*int*/ aPolicy) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPolicy);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookieManager.java x86_64/org/eclipse/swt/internal/mozilla/nsICookieManager.java
---- x86/org/eclipse/swt/internal/mozilla/nsICookieManager.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsICookieManager.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_ICOOKIEMANAGER_IID =
- new nsID(NS_ICOOKIEMANAGER_IID_STR);
-
-- public nsICookieManager(int /*long*/ address) {
-+ public nsICookieManager(long /*int*/ address) {
- super(address);
- }
-
-@@ -45,11 +45,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
- }
-
-- public int GetEnumerator(int /*long*/[] aEnumerator) {
-+ public int GetEnumerator(long /*int*/[] aEnumerator) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEnumerator);
- }
-
-- public int Remove(int /*long*/ aDomain, int /*long*/ aName, int /*long*/ aPath, int aBlocked) {
-+ public int Remove(long /*int*/ aDomain, long /*int*/ aName, long /*int*/ aPath, int aBlocked) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDomain, aName, aPath, aBlocked);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java x86_64/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java
---- x86/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java 2009-02-27 16:59:42.000000000 -0500
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,23 +37,23 @@
- public static final nsID NS_ICOOKIESERVICE_IID =
- new nsID(NS_ICOOKIESERVICE_IID_STR);
-
-- public nsICookieService_1_9(int /*long*/ address) {
-+ public nsICookieService_1_9(long /*int*/ address) {
- super(address);
- }
-
-- public int GetCookieString(int /*long*/ aURI, int /*long*/ aChannel, int /*long*/[] _retval) {
-+ public int GetCookieString(long /*int*/ aURI, long /*int*/ aChannel, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval);
- }
-
-- public int GetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aChannel, int /*long*/[] _retval) {
-+ public int GetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aChannel, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval);
- }
-
-- public int SetCookieString(int /*long*/ aURI, int /*long*/ aPrompt, byte[] aCookie, int /*long*/ aChannel) {
-+ public int SetCookieString(long /*int*/ aURI, long /*int*/ aPrompt, byte[] aCookie, long /*int*/ aChannel) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel);
- }
-
-- public int SetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aPrompt, byte[] aCookie, byte[] aServerTime, int /*long*/ aChannel) {
-+ public int SetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aPrompt, byte[] aCookie, byte[] aServerTime, long /*int*/ aChannel) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookieService.java x86_64/org/eclipse/swt/internal/mozilla/nsICookieService.java
---- x86/org/eclipse/swt/internal/mozilla/nsICookieService.java 2009-02-27 16:59:42.000000000 -0500
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsICookieService.java 2009-09-17 08:48:20.000000000 -0400
-@@ -38,23 +38,23 @@
- public static final nsID NS_ICOOKIESERVICE_IID =
- new nsID(NS_ICOOKIESERVICE_IID_STR);
-
-- public nsICookieService(int /*long*/ address) {
-+ public nsICookieService(long /*int*/ address) {
- super(address);
- }
-
-- public int GetCookieString(int /*long*/ aURI, int /*long*/ aChannel, int /*long*/[] _retval) {
-+ public int GetCookieString(long /*int*/ aURI, long /*int*/ aChannel, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval);
- }
-
-- public int GetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aChannel, int /*long*/[] _retval) {
-+ public int GetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aChannel, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval);
- }
-
-- public int SetCookieString(int /*long*/ aURI, int /*long*/ aPrompt, byte[] aCookie, int /*long*/ aChannel) {
-+ public int SetCookieString(long /*int*/ aURI, long /*int*/ aPrompt, byte[] aCookie, long /*int*/ aChannel) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel);
- }
-
-- public int SetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aPrompt, byte[] aCookie, byte[] aServerTime, int /*long*/ aChannel) {
-+ public int SetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aPrompt, byte[] aCookie, byte[] aServerTime, long /*int*/ aChannel) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDataType.java x86_64/org/eclipse/swt/internal/mozilla/nsIDataType.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDataType.java 2008-12-02 11:18:44.000000000 -0500
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDataType.java 2009-09-17 08:48:20.000000000 -0400
-@@ -11,7 +11,7 @@
- public static final nsID NS_IDATATYPE_IID =
- new nsID(NS_IDATATYPE_IID_STR);
-
-- public nsIDataType(int /*long*/ address) {
-+ public nsIDataType(long /*int*/ address) {
- super(address);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IDIRECTORYSERVICE_IID =
- new nsID(NS_IDIRECTORYSERVICE_IID_STR);
-
-- public nsIDirectoryService(int /*long*/ address) {
-+ public nsIDirectoryService(long /*int*/ address) {
- super(address);
- }
-
-@@ -45,11 +45,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
- }
-
-- public int RegisterProvider(int /*long*/ prov) {
-+ public int RegisterProvider(long /*int*/ prov) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prov);
- }
-
-- public int UnregisterProvider(int /*long*/ prov) {
-+ public int UnregisterProvider(long /*int*/ prov) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prov);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java 2007-03-02 11:13:26.000000000 -0500
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,11 +37,11 @@
- public static final nsID NS_IDIRECTORYSERVICEPROVIDER2_IID =
- new nsID(NS_IDIRECTORYSERVICEPROVIDER2_IID_STRING);
-
-- public nsIDirectoryServiceProvider2(int /*long*/ address) {
-+ public nsIDirectoryServiceProvider2(long /*int*/ address) {
- super(address);
- }
-
-- public int GetFiles(byte[] prop, int /*long*/[] _retval) {
-+ public int GetFiles(byte[] prop, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIDirectoryServiceProvider.LAST_METHOD_ID + 1, getAddress(), prop, _retval);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,11 +37,11 @@
- public static final nsID NS_IDIRECTORYSERVICEPROVIDER_IID =
- new nsID(NS_IDIRECTORYSERVICEPROVIDER_IID_STR);
-
-- public nsIDirectoryServiceProvider(int /*long*/ address) {
-+ public nsIDirectoryServiceProvider(long /*int*/ address) {
- super(address);
- }
-
-- public int GetFile(byte[] prop, int[] persistent, int /*long*/[] _retval) {
-+ public int GetFile(byte[] prop, int[] persistent, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, persistent, _retval);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsID.java x86_64/org/eclipse/swt/internal/mozilla/nsID.java
---- x86/org/eclipse/swt/internal/mozilla/nsID.java 2008-09-10 18:29:30.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsID.java 2009-09-17 08:48:20.000000000 -0400
-@@ -44,9 +44,9 @@
- }
-
- public boolean Equals(nsID other) {
-- int /*long*/ ptr = XPCOM.nsID_new ();
-+ long /*int*/ ptr = XPCOM.nsID_new ();
- XPCOM.memmove (ptr, this, nsID.sizeof);
-- int /*long*/ otherPtr = XPCOM.nsID_new ();
-+ long /*int*/ otherPtr = XPCOM.nsID_new ();
- XPCOM.memmove (otherPtr, other, nsID.sizeof);
- boolean result = XPCOM.nsID_Equals (ptr, otherPtr) != 0;
- XPCOM.nsID_delete (ptr);
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,15 +37,15 @@
- public static final nsID NS_IDOCSHELL_IID =
- new nsID(NS_IDOCSHELL_IID_STR);
-
-- public nsIDocShell_1_8(int /*long*/ address) {
-+ public nsIDocShell_1_8(long /*int*/ address) {
- super(address);
- }
-
-- public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {
-+ public int LoadURI(long /*int*/ uri, long /*int*/ loadInfo, int aLoadFlags, int firstParty) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);
- }
-
-- public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {
-+ public int LoadStream(long /*int*/ aStream, long /*int*/ aURI, long /*int*/ aContentType, long /*int*/ aContentCharset, long /*int*/ aLoadInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);
- }
-
-@@ -55,11 +55,11 @@
-
- public static final int INTERNAL_LOAD_FLAGS_DONT_SEND_REFERRER = 2;
-
-- public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aFlags, char[] aWindowTarget, byte[] aTypeHint, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {
-+ public int InternalLoad(long /*int*/ aURI, long /*int*/ aReferrer, long /*int*/ aOwner, int aFlags, char[] aWindowTarget, byte[] aTypeHint, long /*int*/ aPostDataStream, long /*int*/ aHeadersStream, int aLoadFlags, long /*int*/ aSHEntry, int firstParty, long /*int*/[] aDocShell, long /*int*/[] aRequest) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aFlags, aWindowTarget, aTypeHint, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);
- }
-
-- public int CreateLoadInfo(int /*long*/[] loadInfo) {
-+ public int CreateLoadInfo(long /*int*/[] loadInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);
- }
-
-@@ -67,7 +67,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
- }
-
-- public int SetCurrentURI(int /*long*/ aURI) {
-+ public int SetCurrentURI(long /*int*/ aURI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);
- }
-
-@@ -75,35 +75,35 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), isUnload);
- }
-
-- public int GetPresContext(int /*long*/[] aPresContext) {
-+ public int GetPresContext(long /*int*/[] aPresContext) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);
- }
-
-- public int GetPresShell(int /*long*/[] aPresShell) {
-+ public int GetPresShell(long /*int*/[] aPresShell) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);
- }
-
-- public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {
-+ public int GetEldestPresShell(long /*int*/[] aEldestPresShell) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);
- }
-
-- public int GetContentViewer(int /*long*/[] aContentViewer) {
-+ public int GetContentViewer(long /*int*/[] aContentViewer) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);
- }
-
-- public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {
-+ public int GetChromeEventHandler(long /*int*/[] aChromeEventHandler) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);
- }
-
-- public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {
-+ public int SetChromeEventHandler(long /*int*/ aChromeEventHandler) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);
- }
-
-- public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {
-+ public int GetDocumentCharsetInfo(long /*int*/[] aDocumentCharsetInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aDocumentCharsetInfo);
- }
-
-- public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {
-+ public int SetDocumentCharsetInfo(long /*int*/ aDocumentCharsetInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aDocumentCharsetInfo);
- }
-
-@@ -151,7 +151,7 @@
-
- public static final int ENUMERATE_BACKWARDS = 1;
-
-- public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {
-+ public int GetDocShellEnumerator(int aItemType, int aDirection, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aItemType, aDirection, _retval);
- }
-
-@@ -255,11 +255,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), aIsExecutingOnLoadHandler);
- }
-
-- public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {
-+ public int GetLayoutHistoryState(long /*int*/[] aLayoutHistoryState) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 47, getAddress(), aLayoutHistoryState);
- }
-
-- public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {
-+ public int SetLayoutHistoryState(long /*int*/ aLayoutHistoryState) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aLayoutHistoryState);
- }
-
-@@ -267,11 +267,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aShouldSaveLayoutState);
- }
-
-- public int GetSecurityUI(int /*long*/[] aSecurityUI) {
-+ public int GetSecurityUI(long /*int*/[] aSecurityUI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aSecurityUI);
- }
-
-- public int SetSecurityUI(int /*long*/ aSecurityUI) {
-+ public int SetSecurityUI(long /*int*/ aSecurityUI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 51, getAddress(), aSecurityUI);
- }
-
-@@ -283,7 +283,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 53, getAddress());
- }
-
-- public int BeginRestore(int /*long*/ viewer, int top) {
-+ public int BeginRestore(long /*int*/ viewer, int top) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 54, getAddress(), viewer, top);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDocShell.java x86_64/org/eclipse/swt/internal/mozilla/nsIDocShell.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDocShell.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDocShell.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,23 +37,23 @@
- public static final nsID NS_IDOCSHELL_IID =
- new nsID(NS_IDOCSHELL_IID_STR);
-
-- public nsIDocShell(int /*long*/ address) {
-+ public nsIDocShell(long /*int*/ address) {
- super(address);
- }
-
-- public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {
-+ public int LoadURI(long /*int*/ uri, long /*int*/ loadInfo, int aLoadFlags, int firstParty) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);
- }
-
-- public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {
-+ public int LoadStream(long /*int*/ aStream, long /*int*/ aURI, long /*int*/ aContentType, long /*int*/ aContentCharset, long /*int*/ aLoadInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);
- }
-
-- public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aInheritOwner, char[] aWindowTarget, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {
-+ public int InternalLoad(long /*int*/ aURI, long /*int*/ aReferrer, long /*int*/ aOwner, int aInheritOwner, char[] aWindowTarget, long /*int*/ aPostDataStream, long /*int*/ aHeadersStream, int aLoadFlags, long /*int*/ aSHEntry, int firstParty, long /*int*/[] aDocShell, long /*int*/[] aRequest) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aInheritOwner, aWindowTarget, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);
- }
-
-- public int CreateLoadInfo(int /*long*/[] loadInfo) {
-+ public int CreateLoadInfo(long /*int*/[] loadInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);
- }
-
-@@ -61,7 +61,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
- }
-
-- public int SetCurrentURI(int /*long*/ aURI) {
-+ public int SetCurrentURI(long /*int*/ aURI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);
- }
-
-@@ -69,43 +69,43 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress());
- }
-
-- public int GetPresContext(int /*long*/[] aPresContext) {
-+ public int GetPresContext(long /*int*/[] aPresContext) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);
- }
-
-- public int GetPresShell(int /*long*/[] aPresShell) {
-+ public int GetPresShell(long /*int*/[] aPresShell) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);
- }
-
-- public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {
-+ public int GetEldestPresShell(long /*int*/[] aEldestPresShell) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);
- }
-
-- public int GetContentViewer(int /*long*/[] aContentViewer) {
-+ public int GetContentViewer(long /*int*/[] aContentViewer) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);
- }
-
-- public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {
-+ public int GetChromeEventHandler(long /*int*/[] aChromeEventHandler) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);
- }
-
-- public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {
-+ public int SetChromeEventHandler(long /*int*/ aChromeEventHandler) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);
- }
-
-- public int GetParentURIContentListener(int /*long*/[] aParentURIContentListener) {
-+ public int GetParentURIContentListener(long /*int*/[] aParentURIContentListener) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentURIContentListener);
- }
-
-- public int SetParentURIContentListener(int /*long*/ aParentURIContentListener) {
-+ public int SetParentURIContentListener(long /*int*/ aParentURIContentListener) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aParentURIContentListener);
- }
-
-- public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {
-+ public int GetDocumentCharsetInfo(long /*int*/[] aDocumentCharsetInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aDocumentCharsetInfo);
- }
-
-- public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {
-+ public int SetDocumentCharsetInfo(long /*int*/ aDocumentCharsetInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocumentCharsetInfo);
- }
-
-@@ -153,7 +153,7 @@
-
- public static final int ENUMERATE_BACKWARDS = 1;
-
-- public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {
-+ public int GetDocShellEnumerator(int aItemType, int aDirection, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aItemType, aDirection, _retval);
- }
-
-@@ -255,11 +255,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aIsExecutingOnLoadHandler);
- }
-
-- public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {
-+ public int GetLayoutHistoryState(long /*int*/[] aLayoutHistoryState) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aLayoutHistoryState);
- }
-
-- public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {
-+ public int SetLayoutHistoryState(long /*int*/ aLayoutHistoryState) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aLayoutHistoryState);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java 2008-10-22 16:17:02.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IDOMEVENT_IID =
- new nsID(NS_IDOMEVENT_IID_STR);
-
-- public nsIDOMEvent(int /*long*/ address) {
-+ public nsIDOMEvent(long /*int*/ address) {
- super(address);
- }
-
-@@ -47,15 +47,15 @@
-
- public static final int BUBBLING_PHASE = 3;
-
-- public int GetType(int /*long*/ aType) {
-+ public int GetType(long /*int*/ aType) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aType);
- }
-
-- public int GetTarget(int /*long*/[] aTarget) {
-+ public int GetTarget(long /*int*/[] aTarget) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aTarget);
- }
-
-- public int GetCurrentTarget(int /*long*/[] aCurrentTarget) {
-+ public int GetCurrentTarget(long /*int*/[] aCurrentTarget) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aCurrentTarget);
- }
-
-@@ -71,7 +71,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCancelable);
- }
-
-- public int GetTimeStamp(int /*long*/[] aTimeStamp) {
-+ public int GetTimeStamp(long /*int*/[] aTimeStamp) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTimeStamp);
- }
-
-@@ -83,7 +83,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress());
- }
-
-- public int InitEvent(int /*long*/ eventTypeArg, int canBubbleArg, int cancelableArg) {
-+ public int InitEvent(long /*int*/ eventTypeArg, int canBubbleArg, int cancelableArg) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), eventTypeArg, canBubbleArg, cancelableArg);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,19 +37,19 @@
- public static final nsID NS_IDOMEVENTTARGET_IID =
- new nsID(NS_IDOMEVENTTARGET_IID_STR);
-
-- public nsIDOMEventTarget(int /*long*/ address) {
-+ public nsIDOMEventTarget(long /*int*/ address) {
- super(address);
- }
-
-- public int AddEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
-+ public int AddEventListener(long /*int*/ type, long /*int*/ listener, int useCapture) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), type, listener, useCapture);
- }
-
-- public int RemoveEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
-+ public int RemoveEventListener(long /*int*/ type, long /*int*/ listener, int useCapture) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), type, listener, useCapture);
- }
-
-- public int DispatchEvent(int /*long*/ evt, int[] _retval) {
-+ public int DispatchEvent(long /*int*/ evt, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), evt, _retval);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IDOMKEYEVENT_IID =
- new nsID(NS_IDOMKEYEVENT_IID_STR);
-
-- public nsIDOMKeyEvent(int /*long*/ address) {
-+ public nsIDOMKeyEvent(long /*int*/ address) {
- super(address);
- }
-
-@@ -293,7 +293,7 @@
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aMetaKey);
- }
-
-- public int InitKeyEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, int keyCodeArg, int charCodeArg) {
-+ public int InitKeyEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, int keyCodeArg, int charCodeArg) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, keyCodeArg, charCodeArg);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java 2008-10-22 16:17:02.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IDOMMOUSEEVENT_IID =
- new nsID(NS_IDOMMOUSEEVENT_IID_STR);
-
-- public nsIDOMMouseEvent(int /*long*/ address) {
-+ public nsIDOMMouseEvent(long /*int*/ address) {
- super(address);
- }
-
-@@ -77,11 +77,11 @@
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 9, getAddress(), aButton);
- }
-
-- public int GetRelatedTarget(int /*long*/[] aRelatedTarget) {
-+ public int GetRelatedTarget(long /*int*/[] aRelatedTarget) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 10, getAddress(), aRelatedTarget);
- }
-
-- public int InitMouseEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, int /*long*/ relatedTargetArg) {
-+ public int InitMouseEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, long /*int*/ relatedTargetArg) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 11, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java 2007-08-23 15:58:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,15 +37,15 @@
- public static final nsID NS_IDOMSERIALIZER_IID =
- new nsID(NS_IDOMSERIALIZER_IID_STR);
-
-- public nsIDOMSerializer_1_7(int /*long*/ address) {
-+ public nsIDOMSerializer_1_7(long /*int*/ address) {
- super(address);
- }
-
-- public int SerializeToString(int /*long*/ root, int /*long*/ _retval) {
-+ public int SerializeToString(long /*int*/ root, long /*int*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), root, _retval);
- }
-
-- public int SerializeToStream(int /*long*/ root, int /*long*/ stream, int /*long*/ charset) {
-+ public int SerializeToStream(long /*int*/ root, long /*int*/ stream, long /*int*/ charset) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), root, stream, charset);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java 2007-08-23 15:58:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,15 +37,15 @@
- public static final nsID NS_IDOMSERIALIZER_IID =
- new nsID(NS_IDOMSERIALIZER_IID_STR);
-
-- public nsIDOMSerializer(int /*long*/ address) {
-+ public nsIDOMSerializer(long /*int*/ address) {
- super(address);
- }
-
-- public int SerializeToString(int /*long*/ root, int /*long*/[] _retval) {
-+ public int SerializeToString(long /*int*/ root, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), root, _retval);
- }
-
-- public int SerializeToStream(int /*long*/ root, int /*long*/ stream, byte[] charset) {
-+ public int SerializeToStream(long /*int*/ root, long /*int*/ stream, byte[] charset) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), root, stream, charset);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,11 +37,11 @@
- public static final nsID NS_IDOMUIEVENT_IID =
- new nsID(NS_IDOMUIEVENT_IID_STR);
-
-- public nsIDOMUIEvent(int /*long*/ address) {
-+ public nsIDOMUIEvent(long /*int*/ address) {
- super(address);
- }
-
-- public int GetView(int /*long*/[] aView) {
-+ public int GetView(long /*int*/[] aView) {
- return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 1, getAddress(), aView);
- }
-
-@@ -49,7 +49,7 @@
- return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 2, getAddress(), aDetail);
- }
-
-- public int InitUIEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg) {
-+ public int InitUIEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int detailArg) {
- return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 3, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java 2008-10-22 16:17:02.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IDOMWINDOWCOLLECTION_IID =
- new nsID(NS_IDOMWINDOWCOLLECTION_IID_STR);
-
-- public nsIDOMWindowCollection(int /*long*/ address) {
-+ public nsIDOMWindowCollection(long /*int*/ address) {
- super(address);
- }
-
-@@ -45,11 +45,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLength);
- }
-
-- public int Item(int index, int /*long*/[] _retval) {
-+ public int Item(int index, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), index, _retval);
- }
-
-- public int NamedItem(int /*long*/ name, int /*long*/[] _retval) {
-+ public int NamedItem(long /*int*/ name, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), name, _retval);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java 2006-05-09 14:54:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,35 +37,35 @@
- public static final nsID NS_IDOMWINDOW_IID =
- new nsID(NS_IDOMWINDOW_IID_STR);
-
-- public nsIDOMWindow(int /*long*/ address) {
-+ public nsIDOMWindow(long /*int*/ address) {
- super(address);
- }
-
-- public int GetDocument(int /*long*/[] aDocument) {
-+ public int GetDocument(long /*int*/[] aDocument) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aDocument);
- }
-
-- public int GetParent(int /*long*/[] aParent) {
-+ public int GetParent(long /*int*/[] aParent) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aParent);
- }
-
-- public int GetTop(int /*long*/[] aTop) {
-+ public int GetTop(long /*int*/[] aTop) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aTop);
- }
-
-- public int GetScrollbars(int /*long*/[] aScrollbars) {
-+ public int GetScrollbars(long /*int*/[] aScrollbars) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aScrollbars);
- }
-
-- public int GetFrames(int /*long*/[] aFrames) {
-+ public int GetFrames(long /*int*/[] aFrames) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aFrames);
- }
-
-- public int GetName(int /*long*/ aName) {
-+ public int GetName(long /*int*/ aName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aName);
- }
-
-- public int SetName(int /*long*/ aName) {
-+ public int SetName(long /*int*/ aName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aName);
- }
-
-@@ -93,7 +93,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), xScrollDif, yScrollDif);
- }
-
-- public int GetSelection(int /*long*/[] _retval) {
-+ public int GetSelection(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), _retval);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java 2006-10-26 11:24:38.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,11 +37,11 @@
- public static final nsID NS_IDOWNLOAD_IID =
- new nsID(NS_IDOWNLOAD_IID_STR);
-
-- public nsIDownload_1_8(int /*long*/ address) {
-+ public nsIDownload_1_8(long /*int*/ address) {
- super(address);
- }
-
-- public int GetTargetFile(int /*long*/[] aTargetFile) {
-+ public int GetTargetFile(long /*int*/[] aTargetFile) {
- return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 1, getAddress(), aTargetFile);
- }
-
-@@ -49,27 +49,27 @@
- return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 2, getAddress(), aPercentComplete);
- }
-
-- public int GetAmountTransferred(int /*long*/ aAmountTransferred) {
-+ public int GetAmountTransferred(long /*int*/ aAmountTransferred) {
- return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 3, getAddress(), aAmountTransferred);
- }
-
-- public int GetSize(int /*long*/ aSize) {
-+ public int GetSize(long /*int*/ aSize) {
- return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 4, getAddress(), aSize);
- }
-
-- public int GetSource(int /*long*/[] aSource) {
-+ public int GetSource(long /*int*/[] aSource) {
- return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 5, getAddress(), aSource);
- }
-
-- public int GetTarget(int /*long*/[] aTarget) {
-+ public int GetTarget(long /*int*/[] aTarget) {
- return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 6, getAddress(), aTarget);
- }
-
-- public int GetCancelable(int /*long*/[] aCancelable) {
-+ public int GetCancelable(long /*int*/[] aCancelable) {
- return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 7, getAddress(), aCancelable);
- }
-
-- public int GetDisplayName(int /*long*/[] aDisplayName) {
-+ public int GetDisplayName(long /*int*/[] aDisplayName) {
- return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 8, getAddress(), aDisplayName);
- }
-
-@@ -77,7 +77,7 @@
- return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 9, getAddress(), aStartTime);
- }
-
-- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
-+ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
- return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 10, getAddress(), aMIMEInfo);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDownload.java x86_64/org/eclipse/swt/internal/mozilla/nsIDownload.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDownload.java 2006-05-09 14:54:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDownload.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,23 +37,23 @@
- public static final nsID NS_IDOWNLOAD_IID =
- new nsID(NS_IDOWNLOAD_IID_STR);
-
-- public nsIDownload(int /*long*/ address) {
-+ public nsIDownload(long /*int*/ address) {
- super(address);
- }
-
-- public int Init(int /*long*/ aSource, int /*long*/ aTarget, char[] aDisplayName, int /*long*/ aMIMEInfo, long startTime, int /*long*/ aPersist) {
-+ public int Init(long /*int*/ aSource, long /*int*/ aTarget, char[] aDisplayName, long /*int*/ aMIMEInfo, long startTime, long /*int*/ aPersist) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aPersist);
- }
-
-- public int GetSource(int /*long*/[] aSource) {
-+ public int GetSource(long /*int*/[] aSource) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource);
- }
-
-- public int GetTarget(int /*long*/[] aTarget) {
-+ public int GetTarget(long /*int*/[] aTarget) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aTarget);
- }
-
-- public int GetPersist(int /*long*/[] aPersist) {
-+ public int GetPersist(long /*int*/[] aPersist) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPersist);
- }
-
-@@ -61,7 +61,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPercentComplete);
- }
-
-- public int GetDisplayName(int /*long*/[] aDisplayName) {
-+ public int GetDisplayName(long /*int*/[] aDisplayName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDisplayName);
- }
-
-@@ -73,23 +73,23 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStartTime);
- }
-
-- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
-+ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aMIMEInfo);
- }
-
-- public int GetListener(int /*long*/[] aListener) {
-+ public int GetListener(long /*int*/[] aListener) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aListener);
- }
-
-- public int SetListener(int /*long*/ aListener) {
-+ public int SetListener(long /*int*/ aListener) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aListener);
- }
-
-- public int GetObserver(int /*long*/[] aObserver) {
-+ public int GetObserver(long /*int*/[] aObserver) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aObserver);
- }
-
-- public int SetObserver(int /*long*/ aObserver) {
-+ public int SetObserver(long /*int*/ aObserver) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aObserver);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java x86_64/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
---- x86/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java 2008-10-22 16:17:02.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IEMBEDDINGSITEWINDOW_IID =
- new nsID(NS_IEMBEDDINGSITEWINDOW_IID_STR);
-
-- public nsIEmbeddingSiteWindow(int /*long*/ address) {
-+ public nsIEmbeddingSiteWindow(long /*int*/ address) {
- super(address);
- }
-
-@@ -67,7 +67,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aVisibility);
- }
-
-- public int GetTitle(int /*long*/[] aTitle) {
-+ public int GetTitle(long /*int*/[] aTitle) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aTitle);
- }
-
-@@ -75,7 +75,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTitle);
- }
-
-- public int GetSiteWindow(int /*long*/[] aSiteWindow) {
-+ public int GetSiteWindow(long /*int*/[] aSiteWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aSiteWindow);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFactory.java x86_64/org/eclipse/swt/internal/mozilla/nsIFactory.java
---- x86/org/eclipse/swt/internal/mozilla/nsIFactory.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIFactory.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,11 +37,11 @@
- public static final nsID NS_IFACTORY_IID =
- new nsID(NS_IFACTORY_IID_STR);
-
-- public nsIFactory(int /*long*/ address) {
-+ public nsIFactory(long /*int*/ address) {
- super(address);
- }
-
-- public int CreateInstance(int /*long*/ aOuter, nsID iid, int /*long*/[] result) {
-+ public int CreateInstance(long /*int*/ aOuter, nsID iid, long /*int*/[] result) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aOuter, iid, result);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFile.java x86_64/org/eclipse/swt/internal/mozilla/nsIFile.java
---- x86/org/eclipse/swt/internal/mozilla/nsIFile.java 2008-10-22 16:17:02.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIFile.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IFILE_IID =
- new nsID(NS_IFILE_IID_STR);
-
-- public nsIFile(int /*long*/ address) {
-+ public nsIFile(long /*int*/ address) {
- super(address);
- }
-
-@@ -45,11 +45,11 @@
-
- public static final int DIRECTORY_TYPE = 1;
-
-- public int Append(int /*long*/ node) {
-+ public int Append(long /*int*/ node) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), node);
- }
-
-- public int AppendNative(int /*long*/ node) {
-+ public int AppendNative(long /*int*/ node) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), node);
- }
-
-@@ -61,43 +61,43 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), type, permissions);
- }
-
-- public int GetLeafName(int /*long*/ aLeafName) {
-+ public int GetLeafName(long /*int*/ aLeafName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLeafName);
- }
-
-- public int SetLeafName(int /*long*/ aLeafName) {
-+ public int SetLeafName(long /*int*/ aLeafName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLeafName);
- }
-
-- public int GetNativeLeafName(int /*long*/ aNativeLeafName) {
-+ public int GetNativeLeafName(long /*int*/ aNativeLeafName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNativeLeafName);
- }
-
-- public int SetNativeLeafName(int /*long*/ aNativeLeafName) {
-+ public int SetNativeLeafName(long /*int*/ aNativeLeafName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNativeLeafName);
- }
-
-- public int CopyTo(int /*long*/ newParentDir, int /*long*/ newName) {
-+ public int CopyTo(long /*int*/ newParentDir, long /*int*/ newName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), newParentDir, newName);
- }
-
-- public int CopyToNative(int /*long*/ newParentDir, int /*long*/ newName) {
-+ public int CopyToNative(long /*int*/ newParentDir, long /*int*/ newName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), newParentDir, newName);
- }
-
-- public int CopyToFollowingLinks(int /*long*/ newParentDir, int /*long*/ newName) {
-+ public int CopyToFollowingLinks(long /*int*/ newParentDir, long /*int*/ newName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), newParentDir, newName);
- }
-
-- public int CopyToFollowingLinksNative(int /*long*/ newParentDir, int /*long*/ newName) {
-+ public int CopyToFollowingLinksNative(long /*int*/ newParentDir, long /*int*/ newName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), newParentDir, newName);
- }
-
-- public int MoveTo(int /*long*/ newParentDir, int /*long*/ newName) {
-+ public int MoveTo(long /*int*/ newParentDir, long /*int*/ newName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), newParentDir, newName);
- }
-
-- public int MoveToNative(int /*long*/ newParentDir, int /*long*/ newName) {
-+ public int MoveToNative(long /*int*/ newParentDir, long /*int*/ newName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), newParentDir, newName);
- }
-
-@@ -149,19 +149,19 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aFileSizeOfLink);
- }
-
-- public int GetTarget(int /*long*/ aTarget) {
-+ public int GetTarget(long /*int*/ aTarget) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aTarget);
- }
-
-- public int GetNativeTarget(int /*long*/ aNativeTarget) {
-+ public int GetNativeTarget(long /*int*/ aNativeTarget) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aNativeTarget);
- }
-
-- public int GetPath(int /*long*/ aPath) {
-+ public int GetPath(long /*int*/ aPath) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aPath);
- }
-
-- public int GetNativePath(int /*long*/ aNativePath) {
-+ public int GetNativePath(long /*int*/ aNativePath) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aNativePath);
- }
-
-@@ -205,23 +205,23 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), type, permissions);
- }
-
-- public int Clone(int /*long*/[] _retval) {
-+ public int Clone(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), _retval);
- }
-
-- public int Equals(int /*long*/ inFile, int[] _retval) {
-+ public int Equals(long /*int*/ inFile, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), inFile, _retval);
- }
-
-- public int Contains(int /*long*/ inFile, int recur, int[] _retval) {
-+ public int Contains(long /*int*/ inFile, int recur, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), inFile, recur, _retval);
- }
-
-- public int GetParent(int /*long*/[] aParent) {
-+ public int GetParent(long /*int*/[] aParent) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aParent);
- }
-
-- public int GetDirectoryEntries(int /*long*/[] aDirectoryEntries) {
-+ public int GetDirectoryEntries(long /*int*/[] aDirectoryEntries) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), aDirectoryEntries);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
---- x86/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IFILEPICKER_IID =
- new nsID(NS_IFILEPICKER_IID_STR);
-
-- public nsIFilePicker_1_8(int /*long*/ address) {
-+ public nsIFilePicker_1_8(long /*int*/ address) {
- super(address);
- }
-
-@@ -56,7 +56,7 @@
- public static final int filterXUL = 32;
- public static final int filterApps = 64;
-
-- public int Init(int /*long*/ parent, int /*long*/ title, int mode) {
-+ public int Init(long /*int*/ parent, long /*int*/ title, int mode) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode);
- }
-
-@@ -64,23 +64,23 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), filterMask);
- }
-
-- public int AppendFilter(int /*long*/ title, int /*long*/ filter) {
-+ public int AppendFilter(long /*int*/ title, long /*int*/ filter) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter);
- }
-
-- public int GetDefaultString(int /*long*/ aDefaultString) {
-+ public int GetDefaultString(long /*int*/ aDefaultString) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString);
- }
-
-- public int SetDefaultString(int /*long*/ aDefaultString) {
-+ public int SetDefaultString(long /*int*/ aDefaultString) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString);
- }
-
-- public int GetDefaultExtension(int /*long*/ aDefaultExtension) {
-+ public int GetDefaultExtension(long /*int*/ aDefaultExtension) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension);
- }
-
-- public int SetDefaultExtension(int /*long*/ aDefaultExtension) {
-+ public int SetDefaultExtension(long /*int*/ aDefaultExtension) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aDefaultExtension);
- }
-
-@@ -92,27 +92,27 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex);
- }
-
-- public int GetDisplayDirectory(int /*long*/[] aDisplayDirectory) {
-+ public int GetDisplayDirectory(long /*int*/[] aDisplayDirectory) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aDisplayDirectory);
- }
-
-- public int SetDisplayDirectory(int /*long*/ aDisplayDirectory) {
-+ public int SetDisplayDirectory(long /*int*/ aDisplayDirectory) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDisplayDirectory);
- }
-
-- public int GetFile(int /*long*/[] aFile) {
-+ public int GetFile(long /*int*/[] aFile) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aFile);
- }
-
-- public int GetFileURL(int /*long*/[] aFileURL) {
-+ public int GetFileURL(long /*int*/[] aFileURL) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aFileURL);
- }
-
-- public int GetFiles(int /*long*/[] aFiles) {
-+ public int GetFiles(long /*int*/[] aFiles) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aFiles);
- }
-
-- public int Show(int /*long*/ _retval) {
-+ public int Show(long /*int*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), _retval);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFilePicker.java x86_64/org/eclipse/swt/internal/mozilla/nsIFilePicker.java
---- x86/org/eclipse/swt/internal/mozilla/nsIFilePicker.java 2006-05-09 14:54:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIFilePicker.java 2009-09-17 08:48:20.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IFILEPICKER_IID =
- new nsID(NS_IFILEPICKER_IID_STR);
-
-- public nsIFilePicker(int /*long*/ address) {
-+ public nsIFilePicker(long /*int*/ address) {
- super(address);
- }
-
-@@ -56,7 +56,7 @@
- public static final int filterXUL = 32;
- public static final int filterApps = 64;
-
-- public int Init(int /*long*/ parent, char[] title, int mode) {
-+ public int Init(long /*int*/ parent, char[] title, int mode) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode);
- }
-
-@@ -68,7 +68,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter);
- }
-
-- public int GetDefaultString(int /*long*/[] aDefaultString) {
-+ public int GetDefaultString(long /*int*/[] aDefaultString) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString);
- }
-
-@@ -76,7 +76,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString);
- }
-
-- public int GetDefaultExtension(int /*long*/[] aDefaultExtension) {
-+ public int GetDefaultExtension(long /*int*/[] aDefaultExtension) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension);
- }
-
-@@ -92,27 +92,27 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex);
- }
-
-- public int GetDisplayDirectory(int /*long*/[] aDisplayDirectory) {
-+ public int GetDisplayDirectory(long /*int*/[] aDisplayDirectory) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aDisplayDirectory);
- }
-
-- public int SetDisplayDirectory(int /*long*/ aDisplayDirectory) {
-+ public int SetDisplayDirectory(long /*int*/ aDisplayDirectory) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDisplayDirectory);
- }
-
-- public int GetFile(int /*long*/[] aFile) {
-+ public int GetFile(long /*int*/[] aFile) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aFile);
- }
-
-- public int GetFileURL(int /*long*/[] aFileURL) {
-+ public int GetFileURL(long /*int*/[] aFileURL) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aFileURL);
- }
-
-- public int GetFiles(int /*long*/[] aFiles) {
-+ public int GetFiles(long /*int*/[] aFiles) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aFiles);
- }
-
-- public int Show(int /*long*/ _retval) {
-+ public int Show(long /*int*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), _retval);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
---- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,31 +37,31 @@
- public static final nsID NS_IHELPERAPPLAUNCHER_IID =
- new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
-
-- public nsIHelperAppLauncher_1_8(int /*long*/ address) {
-+ public nsIHelperAppLauncher_1_8(long /*int*/ address) {
- super(address);
- }
-
-- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
-+ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
- }
-
-- public int GetSource(int /*long*/[] aSource) {
-+ public int GetSource(long /*int*/[] aSource) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);
- }
-
-- public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {
-+ public int GetSuggestedFileName(long /*int*/ aSuggestedFileName) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
- }
-
-- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
-+ public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
- }
-
-- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
-+ public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
- }
-
-- public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
-+ public int SetWebProgressListener(long /*int*/ aWebProgressListener) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
- }
-
-@@ -69,11 +69,11 @@
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
- }
-
-- public int GetTargetFile(int /*long*/[] aTargetFile) {
-+ public int GetTargetFile(long /*int*/[] aTargetFile) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
- }
-
-- public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {
-+ public int GetTimeDownloadStarted(long /*int*/ aTimeDownloadStarted) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTimeDownloadStarted);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
---- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,31 +37,31 @@
- public static final nsID NS_IHELPERAPPLAUNCHER_IID =
- new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
-
-- public nsIHelperAppLauncher_1_9(int /*long*/ address) {
-+ public nsIHelperAppLauncher_1_9(long /*int*/ address) {
- super(address);
- }
-
-- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
-+ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
- }
-
-- public int GetSource(int /*long*/[] aSource) {
-+ public int GetSource(long /*int*/[] aSource) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);
- }
-
-- public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {
-+ public int GetSuggestedFileName(long /*int*/ aSuggestedFileName) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
- }
-
-- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
-+ public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
- }
-
-- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
-+ public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
- }
-
-- public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
-+ public int SetWebProgressListener(long /*int*/ aWebProgressListener) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
- }
-
-@@ -69,7 +69,7 @@
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
- }
-
-- public int GetTargetFile(int /*long*/[] aTargetFile) {
-+ public int GetTargetFile(long /*int*/[] aTargetFile) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
- }
-
-@@ -77,7 +77,7 @@
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTargetFileIsExecutable);
- }
-
-- public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {
-+ public int GetTimeDownloadStarted(long /*int*/ aTimeDownloadStarted) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 10, getAddress(), aTimeDownloadStarted);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java
---- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java 2008-08-20 15:56:28.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IHELPERAPPLAUNCHERDIALOG_IID =
- new nsID(NS_IHELPERAPPLAUNCHERDIALOG_IID_STR);
-
-- public nsIHelperAppLauncherDialog_1_9(int /*long*/ address) {
-+ public nsIHelperAppLauncherDialog_1_9(long /*int*/ address) {
- super(address);
- }
-
-@@ -47,11 +47,11 @@
-
- public static final int REASON_TYPESNIFFED = 2;
-
-- public int Show(int /*long*/ aLauncher, int /*long*/ aWindowContext, int aReason) {
-+ public int Show(long /*int*/ aLauncher, long /*int*/ aWindowContext, int aReason) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLauncher, aWindowContext, aReason);
- }
-
-- public int PromptForSaveToFile(int /*long*/ aLauncher, int /*long*/ aWindowContext, char[] aDefaultFileName, char[] aSuggestedFileExtension, int aForcePrompt, int /*long*/[] _retval) {
-+ public int PromptForSaveToFile(long /*int*/ aLauncher, long /*int*/ aWindowContext, char[] aDefaultFileName, char[] aSuggestedFileExtension, int aForcePrompt, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aLauncher, aWindowContext, aDefaultFileName, aSuggestedFileExtension, aForcePrompt, _retval);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java
---- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java 2007-03-02 11:13:26.000000000 -0500
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,19 +37,19 @@
- public static final nsID NS_IHELPERAPPLAUNCHERDIALOG_IID =
- new nsID(NS_IHELPERAPPLAUNCHERDIALOG_IID_STR);
-
-- public nsIHelperAppLauncherDialog(int /*long*/ address) {
-+ public nsIHelperAppLauncherDialog(long /*int*/ address) {
- super(address);
- }
-
-- public int Show(int /*long*/ aLauncher, int /*long*/ aContext) {
-+ public int Show(long /*int*/ aLauncher, long /*int*/ aContext) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLauncher, aContext);
- }
-
-- public int PromptForSaveToFile(int /*long*/ aWindowContext, char[] aDefaultFile, char[] aSuggestedFileExtension, int /*long*/[] _retval) {
-+ public int PromptForSaveToFile(long /*int*/ aWindowContext, char[] aDefaultFile, char[] aSuggestedFileExtension, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWindowContext, aDefaultFile, aSuggestedFileExtension, _retval);
- }
-
-- public int ShowProgressDialog(int /*long*/ aLauncher, int /*long*/ aContext) {
-+ public int ShowProgressDialog(long /*int*/ aLauncher, long /*int*/ aContext) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aLauncher, aContext);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java
---- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java 2008-10-22 16:17:02.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,27 +37,27 @@
- public static final nsID NS_IHELPERAPPLAUNCHER_IID =
- new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
-
-- public nsIHelperAppLauncher(int /*long*/ address) {
-+ public nsIHelperAppLauncher(long /*int*/ address) {
- super(address);
- }
-
-- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
-+ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
- }
-
-- public int GetSource(int /*long*/[] aSource) {
-+ public int GetSource(long /*int*/[] aSource) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource);
- }
-
-- public int GetSuggestedFileName(int /*long*/[] aSuggestedFileName) {
-+ public int GetSuggestedFileName(long /*int*/[] aSuggestedFileName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
- }
-
-- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
-+ public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
- }
-
-- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
-+ public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
- }
-
-@@ -65,7 +65,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
- }
-
-- public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
-+ public int SetWebProgressListener(long /*int*/ aWebProgressListener) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aWebProgressListener);
- }
-
-@@ -73,7 +73,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
- }
-
-- public int GetDownloadInfo(int /*long*/[] aSourceUrl, long[] aTimeDownloadStarted, int /*long*/[] _retval) {
-+ public int GetDownloadInfo(long /*int*/[] aSourceUrl, long[] aTimeDownloadStarted, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSourceUrl, aTimeDownloadStarted, _retval);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIInputStream.java x86_64/org/eclipse/swt/internal/mozilla/nsIInputStream.java
---- x86/org/eclipse/swt/internal/mozilla/nsIInputStream.java 2008-10-22 16:17:02.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIInputStream.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IINPUTSTREAM_IID =
- new nsID(NS_IINPUTSTREAM_IID_STR);
-
-- public nsIInputStream(int /*long*/ address) {
-+ public nsIInputStream(long /*int*/ address) {
- super(address);
- }
-
-@@ -53,7 +53,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aBuf, aCount, _retval);
- }
-
-- public int ReadSegments(int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int[] _retval) {
-+ public int ReadSegments(long /*int*/ aWriter, long /*int*/ aClosure, int aCount, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aWriter, aClosure, aCount, _retval);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java x86_64/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java
---- x86/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java 2006-05-09 14:54:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,11 +37,11 @@
- public static final nsID NS_IINTERFACEREQUESTOR_IID =
- new nsID(NS_IINTERFACEREQUESTOR_IID_STR);
-
-- public nsIInterfaceRequestor(int /*long*/ address) {
-+ public nsIInterfaceRequestor(long /*int*/ address) {
- super(address);
- }
-
-- public int GetInterface(nsID uuid, int /*long*/[] result) {
-+ public int GetInterface(nsID uuid, long /*int*/[] result) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uuid, result);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIIOService.java x86_64/org/eclipse/swt/internal/mozilla/nsIIOService.java
---- x86/org/eclipse/swt/internal/mozilla/nsIIOService.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIIOService.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,11 +37,11 @@
- public static final nsID NS_IIOSERVICE_IID =
- new nsID(NS_IIOSERVICE_IID_STR);
-
-- public nsIIOService(int /*long*/ address) {
-+ public nsIIOService(long /*int*/ address) {
- super(address);
- }
-
-- public int GetProtocolHandler(byte[] aScheme, int /*long*/[] _retval) {
-+ public int GetProtocolHandler(byte[] aScheme, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aScheme, _retval);
- }
-
-@@ -49,19 +49,19 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aScheme, _retval);
- }
-
-- public int NewURI(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) {
-+ public int NewURI(long /*int*/ aSpec, byte[] aOriginCharset, long /*int*/ aBaseURI, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);
- }
-
-- public int NewFileURI(int /*long*/ aFile, int /*long*/[] _retval) {
-+ public int NewFileURI(long /*int*/ aFile, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFile, _retval);
- }
-
-- public int NewChannelFromURI(int /*long*/ aURI, int /*long*/[] _retval) {
-+ public int NewChannelFromURI(long /*int*/ aURI, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aURI, _retval);
- }
-
-- public int NewChannel(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) {
-+ public int NewChannel(long /*int*/ aSpec, byte[] aOriginCharset, long /*int*/ aBaseURI, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);
- }
-
-@@ -77,7 +77,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPort, aScheme, _retval);
- }
-
-- public int ExtractScheme(int /*long*/ urlString, int /*long*/ _retval) {
-+ public int ExtractScheme(long /*int*/ urlString, long /*int*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), urlString, _retval);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java x86_64/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java
---- x86/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IJSCONTEXTSTACK_IID =
- new nsID(NS_IJSCONTEXTSTACK_IID_STR);
-
-- public nsIJSContextStack(int /*long*/ address) {
-+ public nsIJSContextStack(long /*int*/ address) {
- super(address);
- }
-
-@@ -45,15 +45,15 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCount);
- }
-
-- public int Peek(int /*long*/[] _retval) {
-+ public int Peek(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
- }
-
-- public int Pop(int /*long*/[] _retval) {
-+ public int Pop(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
- }
-
-- public int Push(int /*long*/ cx) {
-+ public int Push(long /*int*/ cx) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), cx);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsILocalFile.java x86_64/org/eclipse/swt/internal/mozilla/nsILocalFile.java
---- x86/org/eclipse/swt/internal/mozilla/nsILocalFile.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsILocalFile.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,19 +37,19 @@
- public static final nsID NS_ILOCALFILE_IID =
- new nsID(NS_ILOCALFILE_IID_STR);
-
-- public nsILocalFile(int /*long*/ address) {
-+ public nsILocalFile(long /*int*/ address) {
- super(address);
- }
-
-- public int InitWithPath(int /*long*/ filePath) {
-+ public int InitWithPath(long /*int*/ filePath) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 1, getAddress(), filePath);
- }
-
-- public int InitWithNativePath(int /*long*/ filePath) {
-+ public int InitWithNativePath(long /*int*/ filePath) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 2, getAddress(), filePath);
- }
-
-- public int InitWithFile(int /*long*/ aFile) {
-+ public int InitWithFile(long /*int*/ aFile) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 3, getAddress(), aFile);
- }
-
-@@ -61,15 +61,15 @@
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 5, getAddress(), aFollowLinks);
- }
-
-- public int OpenNSPRFileDesc(int flags, int mode, int /*long*/[] _retval) {
-+ public int OpenNSPRFileDesc(int flags, int mode, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 6, getAddress(), flags, mode, _retval);
- }
-
-- public int OpenANSIFileDesc(byte[] mode, int /*long*/[] _retval) {
-+ public int OpenANSIFileDesc(byte[] mode, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 7, getAddress(), mode, _retval);
- }
-
-- public int Load(int /*long*/[] _retval) {
-+ public int Load(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 8, getAddress(), _retval);
- }
-
-@@ -77,19 +77,19 @@
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 9, getAddress(), aDiskSpaceAvailable);
- }
-
-- public int AppendRelativePath(int /*long*/ relativeFilePath) {
-+ public int AppendRelativePath(long /*int*/ relativeFilePath) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 10, getAddress(), relativeFilePath);
- }
-
-- public int AppendRelativeNativePath(int /*long*/ relativeFilePath) {
-+ public int AppendRelativeNativePath(long /*int*/ relativeFilePath) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 11, getAddress(), relativeFilePath);
- }
-
-- public int GetPersistentDescriptor(int /*long*/ aPersistentDescriptor) {
-+ public int GetPersistentDescriptor(long /*int*/ aPersistentDescriptor) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 12, getAddress(), aPersistentDescriptor);
- }
-
-- public int SetPersistentDescriptor(int /*long*/ aPersistentDescriptor) {
-+ public int SetPersistentDescriptor(long /*int*/ aPersistentDescriptor) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 13, getAddress(), aPersistentDescriptor);
- }
-
-@@ -101,11 +101,11 @@
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 15, getAddress());
- }
-
-- public int GetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ _retval) {
-+ public int GetRelativeDescriptor(long /*int*/ fromFile, long /*int*/ _retval) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 16, getAddress(), fromFile, _retval);
- }
-
-- public int SetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ relativeDesc) {
-+ public int SetRelativeDescriptor(long /*int*/ fromFile, long /*int*/ relativeDesc) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 17, getAddress(), fromFile, relativeDesc);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIMemory.java x86_64/org/eclipse/swt/internal/mozilla/nsIMemory.java
---- x86/org/eclipse/swt/internal/mozilla/nsIMemory.java 2008-12-15 10:17:00.000000000 -0500
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIMemory.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,19 +37,19 @@
- public static final nsID NS_IMEMORY_IID =
- new nsID(NS_IMEMORY_IID_STR);
-
-- public nsIMemory(int /*long*/ address) {
-+ public nsIMemory(long /*int*/ address) {
- super(address);
- }
-
-- public int /*long*/ Alloc(int size) {
-+ public long /*int*/ Alloc(int size) {
- return XPCOM.nsIMemory_Alloc(getAddress(), size);
- }
-
-- public int /*long*/ Realloc(int /*long*/ ptr, int newSize) {
-+ public long /*int*/ Realloc(long /*int*/ ptr, int newSize) {
- return XPCOM.nsIMemory_Realloc(getAddress(), ptr, newSize);
- }
-
-- public int Free(int /*long*/ ptr) {
-+ public int Free(long /*int*/ ptr) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ptr);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIObserverService.java x86_64/org/eclipse/swt/internal/mozilla/nsIObserverService.java
---- x86/org/eclipse/swt/internal/mozilla/nsIObserverService.java 2008-10-22 16:17:02.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIObserverService.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,23 +37,23 @@
- public static final nsID NS_IOBSERVERSERVICE_IID =
- new nsID(NS_IOBSERVERSERVICE_IID_STR);
-
-- public nsIObserverService(int /*long*/ address) {
-+ public nsIObserverService(long /*int*/ address) {
- super(address);
- }
-
-- public int AddObserver(int /*long*/ anObserver, byte[] aTopic, int ownsWeak) {
-+ public int AddObserver(long /*int*/ anObserver, byte[] aTopic, int ownsWeak) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), anObserver, aTopic, ownsWeak);
- }
-
-- public int RemoveObserver(int /*long*/ anObserver, byte[] aTopic) {
-+ public int RemoveObserver(long /*int*/ anObserver, byte[] aTopic) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), anObserver, aTopic);
- }
-
-- public int NotifyObservers(int /*long*/ aSubject, byte[] aTopic, char[] someData) {
-+ public int NotifyObservers(long /*int*/ aSubject, byte[] aTopic, char[] someData) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSubject, aTopic, someData);
- }
-
-- public int EnumerateObservers(byte[] aTopic, int /*long*/[] _retval) {
-+ public int EnumerateObservers(byte[] aTopic, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aTopic, _retval);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java x86_64/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
---- x86/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IPREFBRANCH_IID =
- new nsID(NS_IPREFBRANCH_IID_STR);
-
-- public nsIPrefBranch(int /*long*/ address) {
-+ public nsIPrefBranch(long /*int*/ address) {
- super(address);
- }
-
-@@ -49,7 +49,7 @@
-
- public static final int PREF_BOOL = 128;
-
-- public int GetRoot(int /*long*/[] aRoot) {
-+ public int GetRoot(long /*int*/[] aRoot) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aRoot);
- }
-
-@@ -65,7 +65,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPrefName, aValue);
- }
-
-- public int GetCharPref(byte[] aPrefName, int /*long*/[] _retval) {
-+ public int GetCharPref(byte[] aPrefName, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPrefName, _retval);
- }
-
-@@ -81,11 +81,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPrefName, aValue);
- }
-
-- public int GetComplexValue(byte[] aPrefName, nsID aType, int /*long*/[] aValue) {
-+ public int GetComplexValue(byte[] aPrefName, nsID aType, long /*int*/[] aValue) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPrefName, aType, aValue);
- }
-
-- public int SetComplexValue(byte[] aPrefName, nsID aType, int /*long*/ aValue) {
-+ public int SetComplexValue(byte[] aPrefName, nsID aType, long /*int*/ aValue) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPrefName, aType, aValue);
- }
-
-@@ -113,7 +113,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aStartingAt);
- }
-
-- public int GetChildList(byte[] aStartingAt, int[] aCount, int /*long*/[] aChildArray) {
-+ public int GetChildList(byte[] aStartingAt, int[] aCount, long /*int*/[] aChildArray) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aStartingAt, aCount, aChildArray);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java x86_64/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java
---- x86/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java 2006-05-09 14:54:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,11 +37,11 @@
- public static final nsID NS_IPREFLOCALIZEDSTRING_IID =
- new nsID(NS_IPREFLOCALIZEDSTRING_IID_STR);
-
-- public nsIPrefLocalizedString(int /*long*/ address) {
-+ public nsIPrefLocalizedString(long /*int*/ address) {
- super(address);
- }
-
-- public int GetData(int /*long*/[] aData) {
-+ public int GetData(long /*int*/[] aData) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aData);
- }
-
-@@ -49,7 +49,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData);
- }
-
-- public int ToString(int /*long*/[] _retval) {
-+ public int ToString(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrefService.java x86_64/org/eclipse/swt/internal/mozilla/nsIPrefService.java
---- x86/org/eclipse/swt/internal/mozilla/nsIPrefService.java 2006-05-09 14:54:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPrefService.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,11 +37,11 @@
- public static final nsID NS_IPREFSERVICE_IID =
- new nsID(NS_IPREFSERVICE_IID_STR);
-
-- public nsIPrefService(int /*long*/ address) {
-+ public nsIPrefService(long /*int*/ address) {
- super(address);
- }
-
-- public int ReadUserPrefs(int /*long*/ aFile) {
-+ public int ReadUserPrefs(long /*int*/ aFile) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aFile);
- }
-
-@@ -53,15 +53,15 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
- }
-
-- public int SavePrefFile(int /*long*/ aFile) {
-+ public int SavePrefFile(long /*int*/ aFile) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFile);
- }
-
-- public int GetBranch(byte[] aPrefRoot, int /*long*/[] _retval) {
-+ public int GetBranch(byte[] aPrefRoot, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPrefRoot, _retval);
- }
-
-- public int GetDefaultBranch(byte[] aPrefRoot, int /*long*/[] _retval) {
-+ public int GetDefaultBranch(byte[] aPrefRoot, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aPrefRoot, _retval);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrincipal.java x86_64/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
---- x86/org/eclipse/swt/internal/mozilla/nsIPrincipal.java 2009-04-08 14:54:52.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPrincipal.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IPRINCIPAL_IID =
- new nsID(NS_IPRINCIPAL_IID_STR);
-
-- public nsIPrincipal(int /*long*/ address) {
-+ public nsIPrincipal(long /*int*/ address) {
- super(address);
- }
-
-@@ -49,11 +49,11 @@
-
- public static final int ENABLE_GRANTED = 4;
-
-- public int GetPreferences(int /*long*/[] prefBranch, int /*long*/[] id, int /*long*/[] subjectName, int /*long*/[] grantedList, int /*long*/[] deniedList, int[] isTrusted) {
-+ public int GetPreferences(long /*int*/[] prefBranch, long /*int*/[] id, long /*int*/[] subjectName, long /*int*/[] grantedList, long /*int*/[] deniedList, int[] isTrusted) {
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 1, getAddress(), prefBranch, id, subjectName, grantedList, deniedList, isTrusted);
- }
-
-- public int Equals(int /*long*/ other, int[] _retval) {
-+ public int Equals(long /*int*/ other, int[] _retval) {
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 2, getAddress(), other, _retval);
- }
-
-@@ -61,19 +61,19 @@
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 3, getAddress(), aHashValue);
- }
-
-- public int GetJSPrincipals(int /*long*/ cx, int /*long*/[] _retval) {
-+ public int GetJSPrincipals(long /*int*/ cx, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 4, getAddress(), cx, _retval);
- }
-
-- public int GetSecurityPolicy(int /*long*/[] aSecurityPolicy) {
-+ public int GetSecurityPolicy(long /*int*/[] aSecurityPolicy) {
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 5, getAddress(), aSecurityPolicy);
- }
-
-- public int SetSecurityPolicy(int /*long*/ aSecurityPolicy) {
-+ public int SetSecurityPolicy(long /*int*/ aSecurityPolicy) {
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 6, getAddress(), aSecurityPolicy);
- }
-
-- public int CanEnableCapability(byte[] capability, int /*long*/ _retval) {
-+ public int CanEnableCapability(byte[] capability, long /*int*/ _retval) {
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 7, getAddress(), capability, _retval);
- }
-
-@@ -81,35 +81,35 @@
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 8, getAddress(), capability, canEnable);
- }
-
-- public int IsCapabilityEnabled(byte[] capability, int /*long*/ annotation, int[] _retval) {
-+ public int IsCapabilityEnabled(byte[] capability, long /*int*/ annotation, int[] _retval) {
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 9, getAddress(), capability, annotation, _retval);
- }
-
-- public int EnableCapability(byte[] capability, int /*long*/[] annotation) {
-+ public int EnableCapability(byte[] capability, long /*int*/[] annotation) {
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 10, getAddress(), capability, annotation);
- }
-
-- public int RevertCapability(byte[] capability, int /*long*/[] annotation) {
-+ public int RevertCapability(byte[] capability, long /*int*/[] annotation) {
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 11, getAddress(), capability, annotation);
- }
-
-- public int DisableCapability(byte[] capability, int /*long*/[] annotation) {
-+ public int DisableCapability(byte[] capability, long /*int*/[] annotation) {
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 12, getAddress(), capability, annotation);
- }
-
-- public int GetURI(int /*long*/[] aURI) {
-+ public int GetURI(long /*int*/[] aURI) {
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 13, getAddress(), aURI);
- }
-
-- public int GetDomain(int /*long*/[] aDomain) {
-+ public int GetDomain(long /*int*/[] aDomain) {
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 14, getAddress(), aDomain);
- }
-
-- public int SetDomain(int /*long*/ aDomain) {
-+ public int SetDomain(long /*int*/ aDomain) {
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 15, getAddress(), aDomain);
- }
-
-- public int GetOrigin(int /*long*/[] aOrigin) {
-+ public int GetOrigin(long /*int*/[] aOrigin) {
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 16, getAddress(), aOrigin);
- }
-
-@@ -117,27 +117,27 @@
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 17, getAddress(), aHasCertificate);
- }
-
-- public int GetFingerprint(int /*long*/ aFingerprint) {
-+ public int GetFingerprint(long /*int*/ aFingerprint) {
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 18, getAddress(), aFingerprint);
- }
-
-- public int GetPrettyName(int /*long*/ aPrettyName) {
-+ public int GetPrettyName(long /*int*/ aPrettyName) {
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 19, getAddress(), aPrettyName);
- }
-
-- public int Subsumes(int /*long*/ other, int[] _retval) {
-+ public int Subsumes(long /*int*/ other, int[] _retval) {
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 20, getAddress(), other, _retval);
- }
-
-- public int CheckMayLoad(int /*long*/ uri, int report) {
-+ public int CheckMayLoad(long /*int*/ uri, int report) {
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 21, getAddress(), uri, report);
- }
-
-- public int GetSubjectName(int /*long*/ aSubjectName) {
-+ public int GetSubjectName(long /*int*/ aSubjectName) {
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 22, getAddress(), aSubjectName);
- }
-
-- public int GetCertificate(int /*long*/[] aCertificate) {
-+ public int GetCertificate(long /*int*/[] aCertificate) {
- return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 23, getAddress(), aCertificate);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
---- x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,11 +37,11 @@
- public static final nsID NS_IPROGRESSDIALOG_IID =
- new nsID(NS_IPROGRESSDIALOG_IID_STR);
-
-- public nsIProgressDialog_1_8(int /*long*/ address) {
-+ public nsIProgressDialog_1_8(long /*int*/ address) {
- super(address);
- }
-
-- public int Open(int /*long*/ aParent) {
-+ public int Open(long /*int*/ aParent) {
- return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 1, getAddress(), aParent);
- }
-
-@@ -53,19 +53,19 @@
- return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
- }
-
-- public int GetObserver(int /*long*/[] aObserver) {
-+ public int GetObserver(long /*int*/[] aObserver) {
- return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 4, getAddress(), aObserver);
- }
-
-- public int SetObserver(int /*long*/ aObserver) {
-+ public int SetObserver(long /*int*/ aObserver) {
- return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 5, getAddress(), aObserver);
- }
-
-- public int GetDialog(int /*long*/[] aDialog) {
-+ public int GetDialog(long /*int*/[] aDialog) {
- return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 6, getAddress(), aDialog);
- }
-
-- public int SetDialog(int /*long*/ aDialog) {
-+ public int SetDialog(long /*int*/ aDialog) {
- return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 7, getAddress(), aDialog);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java x86_64/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
---- x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,11 +37,11 @@
- public static final nsID NS_IPROGRESSDIALOG_IID =
- new nsID(NS_IPROGRESSDIALOG_IID_STR);
-
-- public nsIProgressDialog(int /*long*/ address) {
-+ public nsIProgressDialog(long /*int*/ address) {
- super(address);
- }
-
-- public int Open(int /*long*/ aParent) {
-+ public int Open(long /*int*/ aParent) {
- return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 1, getAddress(), aParent);
- }
-
-@@ -53,11 +53,11 @@
- return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
- }
-
-- public int GetDialog(int /*long*/[] aDialog) {
-+ public int GetDialog(long /*int*/[] aDialog) {
- return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 4, getAddress(), aDialog);
- }
-
-- public int SetDialog(int /*long*/ aDialog) {
-+ public int SetDialog(long /*int*/ aDialog) {
- return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 5, getAddress(), aDialog);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPromptService2.java x86_64/org/eclipse/swt/internal/mozilla/nsIPromptService2.java
---- x86/org/eclipse/swt/internal/mozilla/nsIPromptService2.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPromptService2.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,15 +37,15 @@
- public static final nsID NS_IPROMPTSERVICE2_IID =
- new nsID(NS_IPROMPTSERVICE2_IID_STR);
-
-- public nsIPromptService2(int /*long*/ address) {
-+ public nsIPromptService2(long /*int*/ address) {
- super(address);
- }
-
-- public int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {
-+ public int PromptAuth(long /*int*/ aParent, long /*int*/ aChannel, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {
- return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 1, getAddress(), aParent, aChannel, level, authInfo, checkboxLabel, checkValue, _retval);
- }
-
-- public int AsyncPromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int /*long*/ aCallback, int /*long*/ aContext, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int /*long*/[] _retval) {
-+ public int AsyncPromptAuth(long /*int*/ aParent, long /*int*/ aChannel, long /*int*/ aCallback, long /*int*/ aContext, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 2, getAddress(), aParent, aChannel, aCallback, aContext, level, authInfo, checkboxLabel, checkValue, _retval);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPromptService.java x86_64/org/eclipse/swt/internal/mozilla/nsIPromptService.java
---- x86/org/eclipse/swt/internal/mozilla/nsIPromptService.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPromptService.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,23 +37,23 @@
- public static final nsID NS_IPROMPTSERVICE_IID =
- new nsID(NS_IPROMPTSERVICE_IID_STR);
-
-- public nsIPromptService(int /*long*/ address) {
-+ public nsIPromptService(long /*int*/ address) {
- super(address);
- }
-
-- public int Alert(int /*long*/ aParent, char[] aDialogTitle, char[] aText) {
-+ public int Alert(long /*int*/ aParent, char[] aDialogTitle, char[] aText) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aDialogTitle, aText);
- }
-
-- public int AlertCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) {
-+ public int AlertCheck(long /*int*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState);
- }
-
-- public int Confirm(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) {
-+ public int Confirm(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aParent, aDialogTitle, aText, _retval);
- }
-
-- public int ConfirmCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
-+ public int ConfirmCheck(long /*int*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState, _retval);
- }
-
-@@ -91,23 +91,23 @@
-
- public static final int STD_YES_NO_BUTTONS = 1027;
-
-- public int ConfirmEx(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
-+ public int ConfirmEx(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, aDialogTitle, aText, aButtonFlags, aButton0Title, aButton1Title, aButton2Title, aCheckMsg, aCheckState, _retval);
- }
-
-- public int Prompt(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
-+ public int Prompt(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, aDialogTitle, aText, aValue, aCheckMsg, aCheckState, _retval);
- }
-
-- public int PromptUsernameAndPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aUsername, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
-+ public int PromptUsernameAndPassword(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aUsername, long /*int*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParent, aDialogTitle, aText, aUsername, aPassword, aCheckMsg, aCheckState, _retval);
- }
-
-- public int PromptPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
-+ public int PromptPassword(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParent, aDialogTitle, aText, aPassword, aCheckMsg, aCheckState, _retval);
- }
-
-- public int Select(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aCount, int /*long*/[] aSelectList, int[] aOutSelection, int[] _retval) {
-+ public int Select(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int aCount, long /*int*/[] aSelectList, int[] aOutSelection, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aParent, aDialogTitle, aText, aCount, aSelectList, aOutSelection, _retval);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIProperties.java x86_64/org/eclipse/swt/internal/mozilla/nsIProperties.java
---- x86/org/eclipse/swt/internal/mozilla/nsIProperties.java 2008-10-22 16:17:02.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIProperties.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,15 +37,15 @@
- public static final nsID NS_IPROPERTIES_IID =
- new nsID(NS_IPROPERTIES_IID_STR);
-
-- public nsIProperties(int /*long*/ address) {
-+ public nsIProperties(long /*int*/ address) {
- super(address);
- }
-
-- public int Get(byte[] prop, nsID iid, int /*long*/[] result) {
-+ public int Get(byte[] prop, nsID iid, long /*int*/[] result) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, iid, result);
- }
-
-- public int Set(byte[] prop, int /*long*/ value) {
-+ public int Set(byte[] prop, long /*int*/ value) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prop, value);
- }
-
-@@ -57,7 +57,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), prop);
- }
-
-- public int GetKeys(int[] count, int /*long*/[] keys) {
-+ public int GetKeys(int[] count, long /*int*/[] keys) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), count, keys);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIRequest.java x86_64/org/eclipse/swt/internal/mozilla/nsIRequest.java
---- x86/org/eclipse/swt/internal/mozilla/nsIRequest.java 2008-10-22 16:17:02.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIRequest.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,11 +37,11 @@
- public static final nsID NS_IREQUEST_IID =
- new nsID(NS_IREQUEST_IID_STR);
-
-- public nsIRequest(int /*long*/ address) {
-+ public nsIRequest(long /*int*/ address) {
- super(address);
- }
-
-- public int GetName(int /*long*/ aName) {
-+ public int GetName(long /*int*/ aName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);
- }
-
-@@ -49,7 +49,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
- }
-
-- public int GetStatus(int /*long*/[] aStatus) {
-+ public int GetStatus(long /*int*/[] aStatus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aStatus);
- }
-
-@@ -65,15 +65,15 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
- }
-
-- public int GetLoadGroup(int /*long*/[] aLoadGroup) {
-+ public int GetLoadGroup(long /*int*/[] aLoadGroup) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aLoadGroup);
- }
-
-- public int SetLoadGroup(int /*long*/ aLoadGroup) {
-+ public int SetLoadGroup(long /*int*/ aLoadGroup) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aLoadGroup);
- }
-
-- public int GetLoadFlags(int /*long*/[] aLoadFlags) {
-+ public int GetLoadFlags(long /*int*/[] aLoadFlags) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aLoadFlags);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java x86_64/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java
---- x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java 2009-04-08 14:54:52.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,19 +37,19 @@
- public static final nsID NS_ISCRIPTSECURITYMANAGER_IID =
- new nsID(NS_ISCRIPTSECURITYMANAGER_IID_STR);
-
-- public nsIScriptSecurityManager_1_9_1(int /*long*/ address) {
-+ public nsIScriptSecurityManager_1_9_1(long /*int*/ address) {
- super(address);
- }
-
--// public int CheckPropertyAccess(int /*long*/ aJSContext, int /*long*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE <jsval >! aProperty, int aAction) {
-+// public int CheckPropertyAccess(long /*int*/ aJSContext, long /*int*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE <jsval >! aProperty, int aAction) {
- // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 1, getAddress(), aJSContext, aJSObject, aClassName, aProperty, aAction);
- // }
-
-- public int CheckConnect(int /*long*/ aJSContext, int /*long*/ aTargetURI, byte[] aClassName, byte[] aProperty) {
-+ public int CheckConnect(long /*int*/ aJSContext, long /*int*/ aTargetURI, byte[] aClassName, byte[] aProperty) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 2, getAddress(), aJSContext, aTargetURI, aClassName, aProperty);
- }
-
-- public int CheckLoadURIFromScript(int /*long*/ cx, int /*long*/ uri) {
-+ public int CheckLoadURIFromScript(long /*int*/ cx, long /*int*/ uri) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 3, getAddress(), cx, uri);
- }
-
-@@ -65,47 +65,47 @@
-
- public static final int DISALLOW_SCRIPT = 8;
-
-- public int CheckLoadURIWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
-+ public int CheckLoadURIWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 4, getAddress(), aPrincipal, uri, flags);
- }
-
-- public int CheckLoadURI(int /*long*/ from, int /*long*/ uri, int flags) {
-+ public int CheckLoadURI(long /*int*/ from, long /*int*/ uri, int flags) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 5, getAddress(), from, uri, flags);
- }
-
-- public int CheckLoadURIStrWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
-+ public int CheckLoadURIStrWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 6, getAddress(), aPrincipal, uri, flags);
- }
-
-- public int CheckLoadURIStr(int /*long*/ from, int /*long*/ uri, int flags) {
-+ public int CheckLoadURIStr(long /*int*/ from, long /*int*/ uri, int flags) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 7, getAddress(), from, uri, flags);
- }
-
-- public int CheckFunctionAccess(int /*long*/ cx, int /*long*/ funObj, int /*long*/ targetObj) {
-+ public int CheckFunctionAccess(long /*int*/ cx, long /*int*/ funObj, long /*int*/ targetObj) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 8, getAddress(), cx, funObj, targetObj);
- }
-
--// public int CanExecuteScripts(int /*long*/ cx, int /*long*/ principal, int[] _retval NS_OUTPARAM) {
-+// public int CanExecuteScripts(long /*int*/ cx, long /*int*/ principal, int[] _retval NS_OUTPARAM) {
- // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 9, getAddress(), cx, principal, _retval NS_OUTPARAM);
- // }
-
--// public int GetSubjectPrincipal(int /*long*/[] _retval NS_OUTPARAM) {
-+// public int GetSubjectPrincipal(long /*int*/[] _retval NS_OUTPARAM) {
- // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 10, getAddress(), _retval NS_OUTPARAM);
- // }
-
-- public int GetSystemPrincipal(int /*long*/[] _retval) {
-+ public int GetSystemPrincipal(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 11, getAddress(), _retval);
- }
-
--// public int GetCertificatePrincipal(int /*long*/ aCertFingerprint, int /*long*/ aSubjectName, int /*long*/ aPrettyName, int /*long*/ aCert, int /*long*/ aURI, int /*long*/[] _retval NS_OUTPARAM) {
-+// public int GetCertificatePrincipal(long /*int*/ aCertFingerprint, long /*int*/ aSubjectName, long /*int*/ aPrettyName, long /*int*/ aCert, long /*int*/ aURI, long /*int*/[] _retval NS_OUTPARAM) {
- // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 12, getAddress(), aCertFingerprint, aSubjectName, aPrettyName, aCert, aURI, _retval NS_OUTPARAM);
- // }
-
--// public int GetCodebasePrincipal(int /*long*/ aURI, int /*long*/[] _retval NS_OUTPARAM) {
-+// public int GetCodebasePrincipal(long /*int*/ aURI, long /*int*/[] _retval NS_OUTPARAM) {
- // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 13, getAddress(), aURI, _retval NS_OUTPARAM);
- // }
-
--// public int RequestCapability(int /*long*/ principal, byte[] capability, int /*long*/ _retval NS_OUTPARAM) {
-+// public int RequestCapability(long /*int*/ principal, byte[] capability, long /*int*/ _retval NS_OUTPARAM) {
- // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 14, getAddress(), principal, capability, _retval NS_OUTPARAM);
- // }
-
-@@ -125,11 +125,11 @@
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 18, getAddress(), capability);
- }
-
--// public int SetCanEnableCapability(int /*long*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {
-+// public int SetCanEnableCapability(long /*int*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {
- // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 19, getAddress(), certificateFingerprint, capability, canEnable);
- // }
-
--// public int GetObjectPrincipal(int /*long*/ cx, int /*long*/ obj, int /*long*/[] _retval NS_OUTPARAM) {
-+// public int GetObjectPrincipal(long /*int*/ cx, long /*int*/ obj, long /*int*/[] _retval NS_OUTPARAM) {
- // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 20, getAddress(), cx, obj, _retval NS_OUTPARAM);
- // }
-
-@@ -137,23 +137,23 @@
- // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 21, getAddress(), _retval NS_OUTPARAM);
- // }
-
-- public int CheckSameOrigin(int /*long*/ aJSContext, int /*long*/ aTargetURI) {
-+ public int CheckSameOrigin(long /*int*/ aJSContext, long /*int*/ aTargetURI) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 22, getAddress(), aJSContext, aTargetURI);
- }
-
-- public int CheckSameOriginURI(int /*long*/ aSourceURI, int /*long*/ aTargetURI, int reportError) {
-+ public int CheckSameOriginURI(long /*int*/ aSourceURI, long /*int*/ aTargetURI, int reportError) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 23, getAddress(), aSourceURI, aTargetURI, reportError);
- }
-
--// public int GetPrincipalFromContext(int /*long*/ cx, int /*long*/[] _retval NS_OUTPARAM) {
-+// public int GetPrincipalFromContext(long /*int*/ cx, long /*int*/[] _retval NS_OUTPARAM) {
- // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 24, getAddress(), cx, _retval NS_OUTPARAM);
- // }
-
--// public int GetChannelPrincipal(int /*long*/ aChannel, int /*long*/[] _retval NS_OUTPARAM) {
-+// public int GetChannelPrincipal(long /*int*/ aChannel, long /*int*/[] _retval NS_OUTPARAM) {
- // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 25, getAddress(), aChannel, _retval NS_OUTPARAM);
- // }
-
--// public int IsSystemPrincipal(int /*long*/ aPrincipal, int[] _retval NS_OUTPARAM) {
-+// public int IsSystemPrincipal(long /*int*/ aPrincipal, int[] _retval NS_OUTPARAM) {
- // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 26, getAddress(), aPrincipal, _retval NS_OUTPARAM);
- // }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java x86_64/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java
---- x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java 2009-04-08 14:54:52.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,19 +37,19 @@
- public static final nsID NS_ISCRIPTSECURITYMANAGER_IID =
- new nsID(NS_ISCRIPTSECURITYMANAGER_IID_STR);
-
-- public nsIScriptSecurityManager_1_9(int /*long*/ address) {
-+ public nsIScriptSecurityManager_1_9(long /*int*/ address) {
- super(address);
- }
-
--// public int CheckPropertyAccess(int /*long*/ aJSContext, int /*long*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE <jsval >! aProperty, int aAction) {
-+// public int CheckPropertyAccess(long /*int*/ aJSContext, long /*int*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE <jsval >! aProperty, int aAction) {
- // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 1, getAddress(), aJSContext, aJSObject, aClassName, aProperty, aAction);
- // }
-
--// public int CheckConnect(int /*long*/ aJSContext, int /*long*/ aTargetURI, byte[] aClassName, byte[] aProperty) {
-+// public int CheckConnect(long /*int*/ aJSContext, long /*int*/ aTargetURI, byte[] aClassName, byte[] aProperty) {
- // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 2, getAddress(), aJSContext, aTargetURI, aClassName, aProperty);
- // }
-
-- public int CheckLoadURIFromScript(int /*long*/ cx, int /*long*/ uri) {
-+ public int CheckLoadURIFromScript(long /*int*/ cx, long /*int*/ uri) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 3, getAddress(), cx, uri);
- }
-
-@@ -65,47 +65,47 @@
-
- public static final int DISALLOW_SCRIPT = 8;
-
-- public int CheckLoadURIWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
-+ public int CheckLoadURIWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 4, getAddress(), aPrincipal, uri, flags);
- }
-
-- public int CheckLoadURI(int /*long*/ from, int /*long*/ uri, int flags) {
-+ public int CheckLoadURI(long /*int*/ from, long /*int*/ uri, int flags) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 5, getAddress(), from, uri, flags);
- }
-
-- public int CheckLoadURIStrWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
-+ public int CheckLoadURIStrWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 6, getAddress(), aPrincipal, uri, flags);
- }
-
-- public int CheckLoadURIStr(int /*long*/ from, int /*long*/ uri, int flags) {
-+ public int CheckLoadURIStr(long /*int*/ from, long /*int*/ uri, int flags) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 7, getAddress(), from, uri, flags);
- }
-
-- public int CheckFunctionAccess(int /*long*/ cx, int /*long*/ funObj, int /*long*/ targetObj) {
-+ public int CheckFunctionAccess(long /*int*/ cx, long /*int*/ funObj, long /*int*/ targetObj) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 8, getAddress(), cx, funObj, targetObj);
- }
-
-- public int CanExecuteScripts(int /*long*/ cx, int /*long*/ principal, int[] _retval) {
-+ public int CanExecuteScripts(long /*int*/ cx, long /*int*/ principal, int[] _retval) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 9, getAddress(), cx, principal, _retval);
- }
-
-- public int GetSubjectPrincipal(int /*long*/[] _retval) {
-+ public int GetSubjectPrincipal(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 10, getAddress(), _retval);
- }
-
-- public int GetSystemPrincipal(int /*long*/[] _retval) {
-+ public int GetSystemPrincipal(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 11, getAddress(), _retval);
- }
-
--// public int GetCertificatePrincipal(int /*long*/ aCertFingerprint, int /*long*/ aSubjectName, int /*long*/ aPrettyName, int /*long*/ aCert, int /*long*/ aURI, int /*long*/[] _retval) {
-+// public int GetCertificatePrincipal(long /*int*/ aCertFingerprint, long /*int*/ aSubjectName, long /*int*/ aPrettyName, long /*int*/ aCert, long /*int*/ aURI, long /*int*/[] _retval) {
- // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 12, getAddress(), aCertFingerprint, aSubjectName, aPrettyName, aCert, aURI, _retval);
- // }
-
-- public int GetCodebasePrincipal(int /*long*/ aURI, int /*long*/[] _retval) {
-+ public int GetCodebasePrincipal(long /*int*/ aURI, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 13, getAddress(), aURI, _retval);
- }
-
--// public int RequestCapability(int /*long*/ principal, byte[] capability, int /*long*/ _retval) {
-+// public int RequestCapability(long /*int*/ principal, byte[] capability, long /*int*/ _retval) {
- // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 14, getAddress(), principal, capability, _retval);
- // }
-
-@@ -125,11 +125,11 @@
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 18, getAddress(), capability);
- }
-
--// public int SetCanEnableCapability(int /*long*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {
-+// public int SetCanEnableCapability(long /*int*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {
- // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 19, getAddress(), certificateFingerprint, capability, canEnable);
- // }
-
-- public int GetObjectPrincipal(int /*long*/ cx, int /*long*/ obj, int /*long*/[] _retval) {
-+ public int GetObjectPrincipal(long /*int*/ cx, long /*int*/ obj, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 20, getAddress(), cx, obj, _retval);
- }
-
-@@ -137,23 +137,23 @@
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 21, getAddress(), _retval);
- }
-
-- public int CheckSameOrigin(int /*long*/ aJSContext, int /*long*/ aTargetURI) {
-+ public int CheckSameOrigin(long /*int*/ aJSContext, long /*int*/ aTargetURI) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 22, getAddress(), aJSContext, aTargetURI);
- }
-
-- public int CheckSameOriginURI(int /*long*/ aSourceURI, int /*long*/ aTargetURI, int reportError) {
-+ public int CheckSameOriginURI(long /*int*/ aSourceURI, long /*int*/ aTargetURI, int reportError) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 23, getAddress(), aSourceURI, aTargetURI, reportError);
- }
-
-- public int GetPrincipalFromContext(int /*long*/ cx, int /*long*/[] _retval) {
-+ public int GetPrincipalFromContext(long /*int*/ cx, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 24, getAddress(), cx, _retval);
- }
-
-- public int GetChannelPrincipal(int /*long*/ aChannel, int /*long*/[] _retval) {
-+ public int GetChannelPrincipal(long /*int*/ aChannel, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 25, getAddress(), aChannel, _retval);
- }
-
-- public int IsSystemPrincipal(int /*long*/ aPrincipal, int[] _retval) {
-+ public int IsSystemPrincipal(long /*int*/ aPrincipal, int[] _retval) {
- return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 26, getAddress(), aPrincipal, _retval);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java x86_64/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java
---- x86/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java 2008-12-02 11:18:44.000000000 -0500
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java 2009-09-17 08:48:22.000000000 -0400
-@@ -11,23 +11,23 @@
- public static final nsID NS_ISECURITYCHECKEDCOMPONENT_IID =
- new nsID(NS_ISECURITYCHECKEDCOMPONENT_IID_STR);
-
-- public nsISecurityCheckedComponent(int /*long*/ address) {
-+ public nsISecurityCheckedComponent(long /*int*/ address) {
- super(address);
- }
-
-- public int CanCreateWrapper(int /*long*/ iid, int /*long*/[] _retval) {
-+ public int CanCreateWrapper(long /*int*/ iid, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), iid, _retval);
- }
-
-- public int CanCallMethod(int /*long*/ iid, char[] methodName, int /*long*/[] _retval) {
-+ public int CanCallMethod(long /*int*/ iid, char[] methodName, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), iid, methodName, _retval);
- }
-
-- public int CanGetProperty(int /*long*/ iid, char[] propertyName, int /*long*/[] _retval) {
-+ public int CanGetProperty(long /*int*/ iid, char[] propertyName, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), iid, propertyName, _retval);
- }
-
-- public int CanSetProperty(int /*long*/ iid, char[] propertyName, int /*long*/[] _retval) {
-+ public int CanSetProperty(long /*int*/ iid, char[] propertyName, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), iid, propertyName, _retval);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsISerializable.java x86_64/org/eclipse/swt/internal/mozilla/nsISerializable.java
---- x86/org/eclipse/swt/internal/mozilla/nsISerializable.java 2009-04-08 14:54:52.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsISerializable.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,15 +37,15 @@
- public static final nsID NS_ISERIALIZABLE_IID =
- new nsID(NS_ISERIALIZABLE_IID_STR);
-
-- public nsISerializable(int /*long*/ address) {
-+ public nsISerializable(long /*int*/ address) {
- super(address);
- }
-
-- public int Read(int /*long*/ aInputStream) {
-+ public int Read(long /*int*/ aInputStream) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aInputStream);
- }
-
-- public int Write(int /*long*/ aOutputStream) {
-+ public int Write(long /*int*/ aOutputStream) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aOutputStream);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIServiceManager.java x86_64/org/eclipse/swt/internal/mozilla/nsIServiceManager.java
---- x86/org/eclipse/swt/internal/mozilla/nsIServiceManager.java 2008-10-22 16:17:02.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIServiceManager.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,15 +37,15 @@
- public static final nsID NS_ISERVICEMANAGER_IID =
- new nsID(NS_ISERVICEMANAGER_IID_STR);
-
-- public nsIServiceManager(int /*long*/ address) {
-+ public nsIServiceManager(long /*int*/ address) {
- super(address);
- }
-
-- public int GetService(nsID aClass, nsID aIID, int /*long*/[] result) {
-+ public int GetService(nsID aClass, nsID aIID, long /*int*/[] result) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result);
- }
-
-- public int GetServiceByContractID(byte[] aContractID, nsID aIID, int /*long*/[] result) {
-+ public int GetServiceByContractID(byte[] aContractID, nsID aIID, long /*int*/[] result) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java x86_64/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java
---- x86/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java 2008-10-22 16:17:02.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_ISIMPLEENUMERATOR_IID =
- new nsID(NS_ISIMPLEENUMERATOR_IID_STR);
-
-- public nsISimpleEnumerator(int /*long*/ address) {
-+ public nsISimpleEnumerator(long /*int*/ address) {
- super(address);
- }
-
-@@ -45,7 +45,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), _retval);
- }
-
-- public int GetNext(int /*long*/[] _retval) {
-+ public int GetNext(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsISSLStatus.java x86_64/org/eclipse/swt/internal/mozilla/nsISSLStatus.java
---- x86/org/eclipse/swt/internal/mozilla/nsISSLStatus.java 2009-08-19 16:24:48.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsISSLStatus.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,15 +37,15 @@
- public static final nsID NS_ISSLSTATUS_IID =
- new nsID(NS_ISSLSTATUS_IID_STR);
-
-- public nsISSLStatus(int /*long*/ address) {
-+ public nsISSLStatus(long /*int*/ address) {
- super(address);
- }
-
-- public int GetServerCert(int /*long*/[] aServerCert) {
-+ public int GetServerCert(long /*int*/[] aServerCert) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aServerCert);
- }
-
-- public int GetCipherName(int /*long*/[] aCipherName) {
-+ public int GetCipherName(long /*int*/[] aCipherName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCipherName);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsISupports.java x86_64/org/eclipse/swt/internal/mozilla/nsISupports.java
---- x86/org/eclipse/swt/internal/mozilla/nsISupports.java 2009-04-22 15:12:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsISupports.java 2009-09-17 08:48:22.000000000 -0400
-@@ -44,17 +44,17 @@
- public static final nsID NS_ISUPPORTS_IID =
- new nsID(NS_ISUPPORTS_IID_STR);
-
-- int /*long*/ address;
-+ long /*int*/ address;
-
-- public nsISupports(int /*long*/ address) {
-+ public nsISupports(long /*int*/ address) {
- this.address = address;
- }
-
-- public int /*long*/ getAddress() {
-+ public long /*int*/ getAddress() {
- return this.address;
- }
-
-- public int QueryInterface(nsID uuid, int /*long*/[] result) {
-+ public int QueryInterface(nsID uuid, long /*int*/[] result) {
- return XPCOM.VtblCall(FIRST_METHOD_ID, getAddress(), uuid, result);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java x86_64/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java
---- x86/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java 2006-05-09 14:54:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,11 +37,11 @@
- public static final nsID NS_ISUPPORTSWEAKREFERENCE_IID =
- new nsID(NS_ISUPPORTSWEAKREFERENCE_IID_STR);
-
-- public nsISupportsWeakReference(int /*long*/ address) {
-+ public nsISupportsWeakReference(long /*int*/ address) {
- super(address);
- }
-
-- public int GetWeakReference(int /*long*/[] _retval) {
-+ public int GetWeakReference(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), _retval);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsITooltipListener.java x86_64/org/eclipse/swt/internal/mozilla/nsITooltipListener.java
---- x86/org/eclipse/swt/internal/mozilla/nsITooltipListener.java 2006-05-09 14:54:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsITooltipListener.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_ITOOLTIPLISTENER_IID =
- new nsID(NS_ITOOLTIPLISTENER_IID_STR);
-
-- public nsITooltipListener(int /*long*/ address) {
-+ public nsITooltipListener(long /*int*/ address) {
- super(address);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsITransfer.java x86_64/org/eclipse/swt/internal/mozilla/nsITransfer.java
---- x86/org/eclipse/swt/internal/mozilla/nsITransfer.java 2006-10-26 11:24:36.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsITransfer.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,11 +37,11 @@
- public static final nsID NS_ITRANSFER_IID =
- new nsID(NS_ITRANSFER_IID_STR);
-
-- public nsITransfer(int /*long*/ address) {
-+ public nsITransfer(long /*int*/ address) {
- super(address);
- }
-
-- public int Init(int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, long startTime, int /*long*/ aTempFile, int /*long*/ aCancelable) {
-+ public int Init(long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long startTime, long /*int*/ aTempFile, long /*int*/ aCancelable) {
- return XPCOM.VtblCall(nsIWebProgressListener2.LAST_METHOD_ID + 1, getAddress(), aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aTempFile, aCancelable);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java x86_64/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
---- x86/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,39 +37,39 @@
- public static final nsID NS_IURICONTENTLISTENER_IID =
- new nsID(NS_IURICONTENTLISTENER_IID_STR);
-
-- public nsIURIContentListener(int /*long*/ address) {
-+ public nsIURIContentListener(long /*int*/ address) {
- super(address);
- }
-
-- public int OnStartURIOpen(int /*long*/ aURI, int[] _retval) {
-+ public int OnStartURIOpen(long /*int*/ aURI, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, _retval);
- }
-
-- public int DoContent(byte[] aContentType, int aIsContentPreferred, int /*long*/ aRequest, int /*long*/[] aContentHandler, int[] _retval) {
-+ public int DoContent(byte[] aContentType, int aIsContentPreferred, long /*int*/ aRequest, long /*int*/[] aContentHandler, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContentType, aIsContentPreferred, aRequest, aContentHandler, _retval);
- }
-
-- public int IsPreferred(byte[] aContentType, int /*long*/[] aDesiredContentType, int[] _retval) {
-+ public int IsPreferred(byte[] aContentType, long /*int*/[] aDesiredContentType, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContentType, aDesiredContentType, _retval);
- }
-
-- public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, int /*long*/[] aDesiredContentType, int[] _retval) {
-+ public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, long /*int*/[] aDesiredContentType, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContentType, aIsContentPreferred, aDesiredContentType, _retval);
- }
-
-- public int GetLoadCookie(int /*long*/[] aLoadCookie) {
-+ public int GetLoadCookie(long /*int*/[] aLoadCookie) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLoadCookie);
- }
-
-- public int SetLoadCookie(int /*long*/ aLoadCookie) {
-+ public int SetLoadCookie(long /*int*/ aLoadCookie) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLoadCookie);
- }
-
-- public int GetParentContentListener(int /*long*/[] aParentContentListener) {
-+ public int GetParentContentListener(long /*int*/[] aParentContentListener) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParentContentListener);
- }
-
-- public int SetParentContentListener(int /*long*/ aParentContentListener) {
-+ public int SetParentContentListener(long /*int*/ aParentContentListener) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParentContentListener);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIURI.java x86_64/org/eclipse/swt/internal/mozilla/nsIURI.java
---- x86/org/eclipse/swt/internal/mozilla/nsIURI.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIURI.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,67 +37,67 @@
- public static final nsID NS_IURI_IID =
- new nsID(NS_IURI_IID_STR);
-
-- public nsIURI(int /*long*/ address) {
-+ public nsIURI(long /*int*/ address) {
- super(address);
- }
-
-- public int GetSpec(int /*long*/ aSpec) {
-+ public int GetSpec(long /*int*/ aSpec) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);
- }
-
-- public int SetSpec(int /*long*/ aSpec) {
-+ public int SetSpec(long /*int*/ aSpec) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);
- }
-
-- public int GetPrePath(int /*long*/ aPrePath) {
-+ public int GetPrePath(long /*int*/ aPrePath) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aPrePath);
- }
-
-- public int GetScheme(int /*long*/ aScheme) {
-+ public int GetScheme(long /*int*/ aScheme) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aScheme);
- }
-
-- public int SetScheme(int /*long*/ aScheme) {
-+ public int SetScheme(long /*int*/ aScheme) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aScheme);
- }
-
-- public int GetUserPass(int /*long*/ aUserPass) {
-+ public int GetUserPass(long /*int*/ aUserPass) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aUserPass);
- }
-
-- public int SetUserPass(int /*long*/ aUserPass) {
-+ public int SetUserPass(long /*int*/ aUserPass) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aUserPass);
- }
-
-- public int GetUsername(int /*long*/ aUsername) {
-+ public int GetUsername(long /*int*/ aUsername) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aUsername);
- }
-
-- public int SetUsername(int /*long*/ aUsername) {
-+ public int SetUsername(long /*int*/ aUsername) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aUsername);
- }
-
-- public int GetPassword(int /*long*/ aPassword) {
-+ public int GetPassword(long /*int*/ aPassword) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPassword);
- }
-
-- public int SetPassword(int /*long*/ aPassword) {
-+ public int SetPassword(long /*int*/ aPassword) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aPassword);
- }
-
-- public int GetHostPort(int /*long*/ aHostPort) {
-+ public int GetHostPort(long /*int*/ aHostPort) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aHostPort);
- }
-
-- public int SetHostPort(int /*long*/ aHostPort) {
-+ public int SetHostPort(long /*int*/ aHostPort) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aHostPort);
- }
-
-- public int GetHost(int /*long*/ aHost) {
-+ public int GetHost(long /*int*/ aHost) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aHost);
- }
-
-- public int SetHost(int /*long*/ aHost) {
-+ public int SetHost(long /*int*/ aHost) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aHost);
- }
-
-@@ -109,15 +109,15 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aPort);
- }
-
-- public int GetPath(int /*long*/ aPath) {
-+ public int GetPath(long /*int*/ aPath) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPath);
- }
-
-- public int SetPath(int /*long*/ aPath) {
-+ public int SetPath(long /*int*/ aPath) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aPath);
- }
-
-- public int Equals(int /*long*/ other, int[] _retval) {
-+ public int Equals(long /*int*/ other, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), other, _retval);
- }
-
-@@ -125,23 +125,23 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), scheme, _retval);
- }
-
-- public int Clone(int /*long*/[] _retval) {
-+ public int Clone(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);
- }
-
-- public int Resolve(int /*long*/ relativePath, int /*long*/ _retval) {
-+ public int Resolve(long /*int*/ relativePath, long /*int*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), relativePath, _retval);
- }
-
-- public int GetAsciiSpec(int /*long*/ aAsciiSpec) {
-+ public int GetAsciiSpec(long /*int*/ aAsciiSpec) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAsciiSpec);
- }
-
-- public int GetAsciiHost(int /*long*/ aAsciiHost) {
-+ public int GetAsciiHost(long /*int*/ aAsciiHost) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAsciiHost);
- }
-
-- public int GetOriginCharset(int /*long*/ aOriginCharset) {
-+ public int GetOriginCharset(long /*int*/ aOriginCharset) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aOriginCharset);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIVariant.java x86_64/org/eclipse/swt/internal/mozilla/nsIVariant.java
---- x86/org/eclipse/swt/internal/mozilla/nsIVariant.java 2008-12-02 11:18:44.000000000 -0500
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIVariant.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IVARIANT_IID =
- new nsID(NS_IVARIANT_IID_STR);
-
-- public nsIVariant(int /*long*/ address) {
-+ public nsIVariant(long /*int*/ address) {
- super(address);
- }
-
-@@ -45,11 +45,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aDataType);
- }
-
-- public int GetAsInt8(int /*long*/ _retval) {
-+ public int GetAsInt8(long /*int*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
- }
-
-- public int GetAsInt16(int /*long*/ _retval) {
-+ public int GetAsInt16(long /*int*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
- }
-
-@@ -61,7 +61,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);
- }
-
-- public int GetAsUint8(int /*long*/ _retval) {
-+ public int GetAsUint8(long /*int*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval);
- }
-
-@@ -73,7 +73,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), _retval);
- }
-
-- public int GetAsUint64(int /*long*/ _retval) {
-+ public int GetAsUint64(long /*int*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
- }
-
-@@ -81,7 +81,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval);
- }
-
-- public int GetAsDouble(int /*long*/ _retval) {
-+ public int GetAsDouble(long /*int*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), _retval);
- }
-
-@@ -97,51 +97,51 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), _retval);
- }
-
-- public int GetAsID(int /*long*/ retval) {
-+ public int GetAsID(long /*int*/ retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), retval);
- }
-
-- public int GetAsAString(int /*long*/ _retval) {
-+ public int GetAsAString(long /*int*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), _retval);
- }
-
-- public int GetAsDOMString(int /*long*/ _retval) {
-+ public int GetAsDOMString(long /*int*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), _retval);
- }
-
-- public int GetAsACString(int /*long*/ _retval) {
-+ public int GetAsACString(long /*int*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), _retval);
- }
-
-- public int GetAsAUTF8String(int /*long*/ _retval) {
-+ public int GetAsAUTF8String(long /*int*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), _retval);
- }
-
-- public int GetAsString(int /*long*/[] _retval) {
-+ public int GetAsString(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), _retval);
- }
-
-- public int GetAsWString(int /*long*/[] _retval) {
-+ public int GetAsWString(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), _retval);
- }
-
-- public int GetAsISupports(int /*long*/[] _retval) {
-+ public int GetAsISupports(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);
- }
-
-- public int GetAsInterface(int /*long*/[] iid, int /*long*/[] iface) {
-+ public int GetAsInterface(long /*int*/[] iid, long /*int*/[] iface) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), iid, iface);
- }
-
-- public int GetAsArray(short[] type, int /*long*/ iid, int[] count, int /*long*/[] ptr) {
-+ public int GetAsArray(short[] type, long /*int*/ iid, int[] count, long /*int*/[] ptr) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), type, iid, count, ptr);
- }
-
-- public int GetAsStringWithSize(int[] size, int /*long*/[] str) {
-+ public int GetAsStringWithSize(int[] size, long /*int*/[] str) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), size, str);
- }
-
-- public int GetAsWStringWithSize(int[] size, int /*long*/[] str) {
-+ public int GetAsWStringWithSize(int[] size, long /*int*/[] str) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), size, str);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWeakReference.java x86_64/org/eclipse/swt/internal/mozilla/nsIWeakReference.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWeakReference.java 2006-05-09 14:54:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWeakReference.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,11 +37,11 @@
- public static final nsID NS_IWEAKREFERENCE_IID =
- new nsID(NS_IWEAKREFERENCE_IID_STR);
-
-- public nsIWeakReference(int /*long*/ address) {
-+ public nsIWeakReference(long /*int*/ address) {
- super(address);
- }
-
-- public int QueryReferent(nsID uuid, int /*long*/[] result) {
-+ public int QueryReferent(nsID uuid, long /*int*/[] result) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uuid, result);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java 2006-05-09 14:54:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IWEBBROWSERCHROMEFOCUS_IID =
- new nsID(NS_IWEBBROWSERCHROMEFOCUS_IID_STR);
-
-- public nsIWebBrowserChromeFocus(int /*long*/ address) {
-+ public nsIWebBrowserChromeFocus(long /*int*/ address) {
- super(address);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IWEBBROWSERCHROME_IID =
- new nsID(NS_IWEBBROWSERCHROME_IID_STR);
-
-- public nsIWebBrowserChrome(int /*long*/ address) {
-+ public nsIWebBrowserChrome(long /*int*/ address) {
- super(address);
- }
-
-@@ -51,11 +51,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), statusType, status);
- }
-
-- public int GetWebBrowser(int /*long*/[] aWebBrowser) {
-+ public int GetWebBrowser(long /*int*/[] aWebBrowser) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWebBrowser);
- }
-
-- public int SetWebBrowser(int /*long*/ aWebBrowser) {
-+ public int SetWebBrowser(long /*int*/ aWebBrowser) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aWebBrowser);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java 2006-05-09 14:54:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IWEBBROWSERFOCUS_IID =
- new nsID(NS_IWEBBROWSERFOCUS_IID_STR);
-
-- public nsIWebBrowserFocus(int /*long*/ address) {
-+ public nsIWebBrowserFocus(long /*int*/ address) {
- super(address);
- }
-
-@@ -57,19 +57,19 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
- }
-
-- public int GetFocusedWindow(int /*long*/[] aFocusedWindow) {
-+ public int GetFocusedWindow(long /*int*/[] aFocusedWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aFocusedWindow);
- }
-
-- public int SetFocusedWindow(int /*long*/ aFocusedWindow) {
-+ public int SetFocusedWindow(long /*int*/ aFocusedWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aFocusedWindow);
- }
-
-- public int GetFocusedElement(int /*long*/[] aFocusedElement) {
-+ public int GetFocusedElement(long /*int*/[] aFocusedElement) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aFocusedElement);
- }
-
-- public int SetFocusedElement(int /*long*/ aFocusedElement) {
-+ public int SetFocusedElement(long /*int*/ aFocusedElement) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aFocusedElement);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java 2006-05-09 14:54:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,35 +37,35 @@
- public static final nsID NS_IWEBBROWSER_IID =
- new nsID(NS_IWEBBROWSER_IID_STR);
-
-- public nsIWebBrowser(int /*long*/ address) {
-+ public nsIWebBrowser(long /*int*/ address) {
- super(address);
- }
-
-- public int AddWebBrowserListener(int /*long*/ aListener, nsID aIID) {
-+ public int AddWebBrowserListener(long /*int*/ aListener, nsID aIID) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aListener, aIID);
- }
-
-- public int RemoveWebBrowserListener(int /*long*/ aListener, nsID aIID) {
-+ public int RemoveWebBrowserListener(long /*int*/ aListener, nsID aIID) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aListener, aIID);
- }
-
-- public int GetContainerWindow(int /*long*/[] aContainerWindow) {
-+ public int GetContainerWindow(long /*int*/[] aContainerWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContainerWindow);
- }
-
-- public int SetContainerWindow(int /*long*/ aContainerWindow) {
-+ public int SetContainerWindow(long /*int*/ aContainerWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContainerWindow);
- }
-
-- public int GetParentURIContentListener(int /*long*/[] aParentURIContentListener) {
-+ public int GetParentURIContentListener(long /*int*/[] aParentURIContentListener) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParentURIContentListener);
- }
-
-- public int SetParentURIContentListener(int /*long*/ aParentURIContentListener) {
-+ public int SetParentURIContentListener(long /*int*/ aParentURIContentListener) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParentURIContentListener);
- }
-
-- public int GetContentDOMWindow(int /*long*/[] aContentDOMWindow) {
-+ public int GetContentDOMWindow(long /*int*/[] aContentDOMWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aContentDOMWindow);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java 2009-02-20 14:12:54.000000000 -0500
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IWEBBROWSERSETUP_IID =
- new nsID(NS_IWEBBROWSERSETUP_IID_STR);
-
-- public nsIWebBrowserSetup(int /*long*/ address) {
-+ public nsIWebBrowserSetup(long /*int*/ address) {
- super(address);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java 2009-03-31 13:05:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,15 +37,15 @@
- public static final nsID NS_IWEBBROWSERSTREAM_IID =
- new nsID(NS_IWEBBROWSERSTREAM_IID_STR);
-
-- public nsIWebBrowserStream(int /*long*/ address) {
-+ public nsIWebBrowserStream(long /*int*/ address) {
- super(address);
- }
-
-- public int OpenStream(int /*long*/ aBaseURI, int /*long*/ aContentType) {
-+ public int OpenStream(long /*int*/ aBaseURI, long /*int*/ aContentType) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aBaseURI, aContentType);
- }
-
-- public int AppendToStream(int /*long*/ aData, int aLen) {
-+ public int AppendToStream(long /*int*/ aData, int aLen) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData, aLen);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java 2007-04-24 17:35:12.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IWEBNAVIGATIONINFO_IID =
- new nsID(NS_IWEBNAVIGATIONINFO_IID_STR);
-
-- public nsIWebNavigationInfo(int /*long*/ address) {
-+ public nsIWebNavigationInfo(long /*int*/ address) {
- super(address);
- }
-
-@@ -49,7 +49,7 @@
-
- public static final int OTHER = 32768;
-
-- public int IsTypeSupported(int /*long*/ aType, int /*long*/ aWebNav, int[] _retval) {
-+ public int IsTypeSupported(long /*int*/ aType, long /*int*/ aWebNav, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aType, aWebNav, _retval);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IWEBNAVIGATION_IID =
- new nsID(NS_IWEBNAVIGATION_IID_STR);
-
-- public nsIWebNavigation(int /*long*/ address) {
-+ public nsIWebNavigation(long /*int*/ address) {
- super(address);
- }
-
-@@ -79,7 +79,7 @@
-
- public static final int LOAD_FLAGS_CHARSET_CHANGE = 1024;
-
-- public int LoadURI(char[] uri, int loadFlags, int /*long*/ referrer, int /*long*/ postData, int /*long*/ headers) {
-+ public int LoadURI(char[] uri, int loadFlags, long /*int*/ referrer, long /*int*/ postData, long /*int*/ headers) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), uri, loadFlags, referrer, postData, headers);
- }
-
-@@ -97,23 +97,23 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), stopFlags);
- }
-
-- public int GetDocument(int /*long*/[] aDocument) {
-+ public int GetDocument(long /*int*/[] aDocument) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDocument);
- }
-
-- public int GetCurrentURI(int /*long*/[] aCurrentURI) {
-+ public int GetCurrentURI(long /*int*/[] aCurrentURI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aCurrentURI);
- }
-
-- public int GetReferringURI(int /*long*/[] aReferringURI) {
-+ public int GetReferringURI(long /*int*/[] aReferringURI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aReferringURI);
- }
-
-- public int GetSessionHistory(int /*long*/[] aSessionHistory) {
-+ public int GetSessionHistory(long /*int*/[] aSessionHistory) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aSessionHistory);
- }
-
-- public int SetSessionHistory(int /*long*/ aSessionHistory) {
-+ public int SetSessionHistory(long /*int*/ aSessionHistory) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSessionHistory);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebProgress.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgress.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebProgress.java 2008-10-22 16:02:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgress.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IWEBPROGRESS_IID =
- new nsID(NS_IWEBPROGRESS_IID_STR);
-
-- public nsIWebProgress(int /*long*/ address) {
-+ public nsIWebProgress(long /*int*/ address) {
- super(address);
- }
-
-@@ -61,15 +61,15 @@
-
- public static final int NOTIFY_ALL = 255;
-
-- public int AddProgressListener(int /*long*/ listener, int aNotifyMask) {
-+ public int AddProgressListener(long /*int*/ listener, int aNotifyMask) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), listener, aNotifyMask);
- }
-
-- public int RemoveProgressListener(int /*long*/ listener) {
-+ public int RemoveProgressListener(long /*int*/ listener) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), listener);
- }
-
-- public int GetDOMWindow(int /*long*/[] aDOMWindow) {
-+ public int GetDOMWindow(long /*int*/[] aDOMWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDOMWindow);
- }
-
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java 2006-10-26 11:24:38.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,11 +37,11 @@
- public static final nsID NS_IWEBPROGRESSLISTENER2_IID =
- new nsID(NS_IWEBPROGRESSLISTENER2_IID_STR);
-
-- public nsIWebProgressListener2(int /*long*/ address) {
-+ public nsIWebProgressListener2(long /*int*/ address) {
- super(address);
- }
-
-- public int OnProgressChange64(int /*long*/ aWebProgress, int /*long*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) {
-+ public int OnProgressChange64(long /*int*/ aWebProgress, long /*int*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) {
- return XPCOM.VtblCall(nsIWebProgressListener.LAST_METHOD_ID + 1, getAddress(), aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java 2006-05-09 14:54:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IWEBPROGRESSLISTENER_IID =
- new nsID(NS_IWEBPROGRESSLISTENER_IID_STR);
-
-- public nsIWebProgressListener(int /*long*/ address) {
-+ public nsIWebProgressListener(long /*int*/ address) {
- super(address);
- }
-
-@@ -71,23 +71,23 @@
-
- public static final int STATE_SECURE_LOW = 131072;
-
-- public int OnStateChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {
-+ public int OnStateChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aWebProgress, aRequest, aStateFlags, aStatus);
- }
-
-- public int OnProgressChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
-+ public int OnProgressChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
- }
-
-- public int OnLocationChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ location) {
-+ public int OnLocationChange(long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ location) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aWebProgress, aRequest, location);
- }
-
-- public int OnStatusChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, char[] aMessage) {
-+ public int OnStatusChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int aStatus, char[] aMessage) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aWebProgress, aRequest, aStatus, aMessage);
- }
-
-- public int OnSecurityChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int state) {
-+ public int OnSecurityChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int state) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aWebProgress, aRequest, state);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java x86_64/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java 2008-10-22 16:17:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,13 +37,13 @@
- public static final nsID NS_IWINDOWCREATOR2_IID =
- new nsID(NS_IWINDOWCREATOR2_IID_STR);
-
-- public nsIWindowCreator2(int /*long*/ address) {
-+ public nsIWindowCreator2(long /*int*/ address) {
- super(address);
- }
-
- public static final int PARENT_IS_LOADING_OR_RUNNING_TIMEOUT = 1;
-
-- public int CreateChromeWindow2(int /*long*/ parent, int chromeFlags, int contextFlags, int /*long*/ uri, int[] cancel, int /*long*/[] _retval) {
-+ public int CreateChromeWindow2(long /*int*/ parent, int chromeFlags, int contextFlags, long /*int*/ uri, int[] cancel, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIWindowCreator.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, contextFlags, uri, cancel, _retval);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java x86_64/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java 2007-03-02 11:13:26.000000000 -0500
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,11 +37,11 @@
- public static final nsID NS_IWINDOWCREATOR_IID =
- new nsID(NS_IWINDOWCREATOR_IID_STR);
-
-- public nsIWindowCreator(int /*long*/ address) {
-+ public nsIWindowCreator(long /*int*/ address) {
- super(address);
- }
-
-- public int CreateChromeWindow(int /*long*/ parent, int chromeFlags, int /*long*/[] _retval) {
-+ public int CreateChromeWindow(long /*int*/ parent, int chromeFlags, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, _retval);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java x86_64/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java 2006-05-09 14:54:24.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,51 +37,51 @@
- public static final nsID NS_IWINDOWWATCHER_IID =
- new nsID(NS_IWINDOWWATCHER_IID_STR);
-
-- public nsIWindowWatcher(int /*long*/ address) {
-+ public nsIWindowWatcher(long /*int*/ address) {
- super(address);
- }
-
-- public int OpenWindow(int /*long*/ aParent, byte[] aUrl, byte[] aName, byte[] aFeatures, int /*long*/ aArguments, int /*long*/[] _retval) {
-+ public int OpenWindow(long /*int*/ aParent, byte[] aUrl, byte[] aName, byte[] aFeatures, long /*int*/ aArguments, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aUrl, aName, aFeatures, aArguments, _retval);
- }
-
-- public int RegisterNotification(int /*long*/ aObserver) {
-+ public int RegisterNotification(long /*int*/ aObserver) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aObserver);
- }
-
-- public int UnregisterNotification(int /*long*/ aObserver) {
-+ public int UnregisterNotification(long /*int*/ aObserver) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aObserver);
- }
-
-- public int GetWindowEnumerator(int /*long*/[] _retval) {
-+ public int GetWindowEnumerator(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), _retval);
- }
-
-- public int GetNewPrompter(int /*long*/ aParent, int /*long*/[] _retval) {
-+ public int GetNewPrompter(long /*int*/ aParent, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, _retval);
- }
-
-- public int GetNewAuthPrompter(int /*long*/ aParent, int /*long*/[] _retval) {
-+ public int GetNewAuthPrompter(long /*int*/ aParent, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, _retval);
- }
-
-- public int SetWindowCreator(int /*long*/ creator) {
-+ public int SetWindowCreator(long /*int*/ creator) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), creator);
- }
-
-- public int GetChromeForWindow(int /*long*/ aWindow, int /*long*/[] _retval) {
-+ public int GetChromeForWindow(long /*int*/ aWindow, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aWindow, _retval);
- }
-
-- public int GetWindowByName(char[] aTargetName, int /*long*/ aCurrentWindow, int /*long*/[] _retval) {
-+ public int GetWindowByName(char[] aTargetName, long /*int*/ aCurrentWindow, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aTargetName, aCurrentWindow, _retval);
- }
-
-- public int GetActiveWindow(int /*long*/[] aActiveWindow) {
-+ public int GetActiveWindow(long /*int*/[] aActiveWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aActiveWindow);
- }
-
-- public int SetActiveWindow(int /*long*/ aActiveWindow) {
-+ public int SetActiveWindow(long /*int*/ aActiveWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aActiveWindow);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java x86_64/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java 2008-12-02 11:18:44.000000000 -0500
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java 2009-09-17 08:48:22.000000000 -0400
-@@ -11,7 +11,7 @@
- public static final nsID NS_IWRITABLEVARIANT_IID =
- new nsID(NS_IWRITABLEVARIANT_IID_STR);
-
-- public nsIWritableVariant(int /*long*/ address) {
-+ public nsIWritableVariant(long /*int*/ address) {
- super(address);
- }
-
-@@ -75,23 +75,23 @@
- // return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 15, getAddress(), aValue);
- // }
-
-- public int SetAsID(int /*long*/ aValue) {
-+ public int SetAsID(long /*int*/ aValue) {
- return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 16, getAddress(), aValue);
- }
-
-- public int SetAsAString(int /*long*/ aValue) {
-+ public int SetAsAString(long /*int*/ aValue) {
- return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 17, getAddress(), aValue);
- }
-
-- public int SetAsDOMString(int /*long*/ aValue) {
-+ public int SetAsDOMString(long /*int*/ aValue) {
- return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 18, getAddress(), aValue);
- }
-
-- public int SetAsACString(int /*long*/ aValue) {
-+ public int SetAsACString(long /*int*/ aValue) {
- return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 19, getAddress(), aValue);
- }
-
-- public int SetAsAUTF8String(int /*long*/ aValue) {
-+ public int SetAsAUTF8String(long /*int*/ aValue) {
- return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 20, getAddress(), aValue);
- }
-
-@@ -103,15 +103,15 @@
- return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 22, getAddress(), aValue);
- }
-
-- public int SetAsISupports(int /*long*/ aValue) {
-+ public int SetAsISupports(long /*int*/ aValue) {
- return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 23, getAddress(), aValue);
- }
-
-- public int SetAsInterface(nsID iid, int /*long*/ iface) {
-+ public int SetAsInterface(nsID iid, long /*int*/ iface) {
- return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 24, getAddress(), iid, iface);
- }
-
-- public int SetAsArray(short type, int /*long*/ iid, int count, int /*long*/ ptr) {
-+ public int SetAsArray(short type, long /*int*/ iid, int count, long /*int*/ ptr) {
- return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 25, getAddress(), type, iid, count, ptr);
- }
-
-@@ -135,7 +135,7 @@
- return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 30, getAddress());
- }
-
-- public int SetFromVariant(int /*long*/ aValue) {
-+ public int SetFromVariant(long /*int*/ aValue) {
- return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 31, getAddress(), aValue);
- }
- }
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIX509Cert.java x86_64/org/eclipse/swt/internal/mozilla/nsIX509Cert.java
---- x86/org/eclipse/swt/internal/mozilla/nsIX509Cert.java 2009-08-19 16:24:46.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIX509Cert.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,87 +37,87 @@
- public static final nsID NS_IX509CERT_IID =
- new nsID(NS_IX509CERT_IID_STR);
-
-- public nsIX509Cert(int /*long*/ address) {
-+ public nsIX509Cert(long /*int*/ address) {
- super(address);
- }
-
-- public int GetNickname(int /*long*/ aNickname) {
-+ public int GetNickname(long /*int*/ aNickname) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNickname);
- }
-
-- public int GetEmailAddress(int /*long*/ aEmailAddress) {
-+ public int GetEmailAddress(long /*int*/ aEmailAddress) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEmailAddress);
- }
-
-- public int GetEmailAddresses(int[] length, int /*long*/[] addresses) {
-+ public int GetEmailAddresses(int[] length, long /*int*/[] addresses) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), length, addresses);
- }
-
-- public int ContainsEmailAddress(int /*long*/ aEmailAddress, int[] _retval) {
-+ public int ContainsEmailAddress(long /*int*/ aEmailAddress, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aEmailAddress, _retval);
- }
-
-- public int GetSubjectName(int /*long*/ aSubjectName) {
-+ public int GetSubjectName(long /*int*/ aSubjectName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aSubjectName);
- }
-
-- public int GetCommonName(int /*long*/ aCommonName) {
-+ public int GetCommonName(long /*int*/ aCommonName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCommonName);
- }
-
-- public int GetOrganization(int /*long*/ aOrganization) {
-+ public int GetOrganization(long /*int*/ aOrganization) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aOrganization);
- }
-
-- public int GetOrganizationalUnit(int /*long*/ aOrganizationalUnit) {
-+ public int GetOrganizationalUnit(long /*int*/ aOrganizationalUnit) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aOrganizationalUnit);
- }
-
-- public int GetSha1Fingerprint(int /*long*/ aSha1Fingerprint) {
-+ public int GetSha1Fingerprint(long /*int*/ aSha1Fingerprint) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSha1Fingerprint);
- }
-
-- public int GetMd5Fingerprint(int /*long*/ aMd5Fingerprint) {
-+ public int GetMd5Fingerprint(long /*int*/ aMd5Fingerprint) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aMd5Fingerprint);
- }
-
-- public int GetTokenName(int /*long*/ aTokenName) {
-+ public int GetTokenName(long /*int*/ aTokenName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aTokenName);
- }
-
-- public int GetIssuerName(int /*long*/ aIssuerName) {
-+ public int GetIssuerName(long /*int*/ aIssuerName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aIssuerName);
- }
-
-- public int GetSerialNumber(int /*long*/ aSerialNumber) {
-+ public int GetSerialNumber(long /*int*/ aSerialNumber) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSerialNumber);
- }
-
-- public int GetIssuerCommonName(int /*long*/ aIssuerCommonName) {
-+ public int GetIssuerCommonName(long /*int*/ aIssuerCommonName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aIssuerCommonName);
- }
-
-- public int GetIssuerOrganization(int /*long*/ aIssuerOrganization) {
-+ public int GetIssuerOrganization(long /*int*/ aIssuerOrganization) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aIssuerOrganization);
- }
-
-- public int GetIssuerOrganizationUnit(int /*long*/ aIssuerOrganizationUnit) {
-+ public int GetIssuerOrganizationUnit(long /*int*/ aIssuerOrganizationUnit) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aIssuerOrganizationUnit);
- }
-
-- public int GetIssuer(int /*long*/[] aIssuer) {
-+ public int GetIssuer(long /*int*/[] aIssuer) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aIssuer);
- }
-
-- public int GetValidity(int /*long*/[] aValidity) {
-+ public int GetValidity(long /*int*/[] aValidity) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aValidity);
- }
-
-- public int GetDbKey(int /*long*/[] aDbKey) {
-+ public int GetDbKey(long /*int*/[] aDbKey) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aDbKey);
- }
-
-- public int GetWindowTitle(int /*long*/[] aWindowTitle) {
-+ public int GetWindowTitle(long /*int*/[] aWindowTitle) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aWindowTitle);
- }
-
-@@ -173,15 +173,15 @@
-
- public static final int CERT_USAGE_AnyCA = 11;
-
-- public int GetChain(int /*long*/[] _retval) {
-+ public int GetChain(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), _retval);
- }
-
-- public int GetUsagesArray(int ignoreOcsp, int[] verified, int[] count, int /*long*/[] usages) {
-+ public int GetUsagesArray(int ignoreOcsp, int[] verified, int[] count, long /*int*/[] usages) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), ignoreOcsp, verified, count, usages);
- }
-
-- public int GetUsagesString(int ignoreOcsp, int[] verified, int /*long*/ usages) {
-+ public int GetUsagesString(int ignoreOcsp, int[] verified, long /*int*/ usages) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), ignoreOcsp, verified, usages);
- }
-
-@@ -189,15 +189,15 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), usage, _retval);
- }
-
-- public int GetASN1Structure(int /*long*/[] aASN1Structure) {
-+ public int GetASN1Structure(long /*int*/[] aASN1Structure) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aASN1Structure);
- }
-
-- public int GetRawDER(int[] length, int /*long*/[] data) {
-+ public int GetRawDER(int[] length, long /*int*/[] data) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), length, data);
- }
-
-- public int Equals(int /*long*/ other, int[] _retval) {
-+ public int Equals(long /*int*/ other, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), other, _retval);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java x86_64/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java
---- x86/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java 2009-08-19 16:24:46.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,39 +37,39 @@
- public static final nsID NS_IX509CERTVALIDITY_IID =
- new nsID(NS_IX509CERTVALIDITY_IID_STR);
-
-- public nsIX509CertValidity(int /*long*/ address) {
-+ public nsIX509CertValidity(long /*int*/ address) {
- super(address);
- }
-
-- public int GetNotBefore(int /*long*/ aNotBefore) {
-+ public int GetNotBefore(long /*int*/ aNotBefore) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNotBefore);
- }
-
-- public int GetNotBeforeLocalTime(int /*long*/ aNotBeforeLocalTime) {
-+ public int GetNotBeforeLocalTime(long /*int*/ aNotBeforeLocalTime) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aNotBeforeLocalTime);
- }
-
-- public int GetNotBeforeLocalDay(int /*long*/ aNotBeforeLocalDay) {
-+ public int GetNotBeforeLocalDay(long /*int*/ aNotBeforeLocalDay) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aNotBeforeLocalDay);
- }
-
-- public int GetNotBeforeGMT(int /*long*/ aNotBeforeGMT) {
-+ public int GetNotBeforeGMT(long /*int*/ aNotBeforeGMT) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNotBeforeGMT);
- }
-
-- public int GetNotAfter(int /*long*/ aNotAfter) {
-+ public int GetNotAfter(long /*int*/ aNotAfter) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aNotAfter);
- }
-
-- public int GetNotAfterLocalTime(int /*long*/ aNotAfterLocalTime) {
-+ public int GetNotAfterLocalTime(long /*int*/ aNotAfterLocalTime) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aNotAfterLocalTime);
- }
-
-- public int GetNotAfterLocalDay(int /*long*/ aNotAfterLocalDay) {
-+ public int GetNotAfterLocalDay(long /*int*/ aNotAfterLocalDay) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNotAfterLocalDay);
- }
-
-- public int GetNotAfterGMT(int /*long*/ aNotAfterGMT) {
-+ public int GetNotAfterGMT(long /*int*/ aNotAfterGMT) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNotAfterGMT);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java x86_64/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java
---- x86/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java 2009-04-08 14:54:52.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java 2009-09-17 08:48:22.000000000 -0400
-@@ -37,7 +37,7 @@
- public static final nsID NS_IXPCSECURITYMANAGER_IID =
- new nsID(NS_IXPCSECURITYMANAGER_IID_STR);
-
-- public nsIXPCSecurityManager(int /*long*/ address) {
-+ public nsIXPCSecurityManager(long /*int*/ address) {
- super(address);
- }
-
-@@ -55,15 +55,15 @@
-
- public static final int HOOK_ALL = 63;
-
-- public int CanCreateWrapper(int /*long*/ aJSContext, nsID aIID, int /*long*/ aObj, int /*long*/ aClassInfo, int /*long*/[] aPolicy) {
-+ public int CanCreateWrapper(long /*int*/ aJSContext, nsID aIID, long /*int*/ aObj, long /*int*/ aClassInfo, long /*int*/[] aPolicy) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aJSContext, aIID, aObj, aClassInfo, aPolicy);
- }
-
-- public int CanCreateInstance(int /*long*/ aJSContext, nsID aCID) {
-+ public int CanCreateInstance(long /*int*/ aJSContext, nsID aCID) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aJSContext, aCID);
- }
-
-- public int CanGetService(int /*long*/ aJSContext, nsID aCID) {
-+ public int CanGetService(long /*int*/ aJSContext, nsID aCID) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aJSContext, aCID);
- }
-
-@@ -73,7 +73,7 @@
-
- public static final int ACCESS_SET_PROPERTY = 2;
-
-- public int CanAccess(int aAction, int /*long*/ aCallContext, int /*long*/ aJSContext, int /*long*/ aJSObject, int /*long*/ aObj, int /*long*/ aClassInfo, int /*long*/ aName, int /*long*/[] aPolicy) {
-+ public int CanAccess(int aAction, long /*int*/ aCallContext, long /*int*/ aJSContext, long /*int*/ aJSObject, long /*int*/ aObj, long /*int*/ aClassInfo, long /*int*/ aName, long /*int*/[] aPolicy) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aAction, aCallContext, aJSContext, aJSObject, aObj, aClassInfo, aName, aPolicy);
- }
- }
-\ No newline at end of file
-diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt/internal/mozilla/XPCOM.java
---- x86/org/eclipse/swt/internal/mozilla/XPCOM.java 2009-08-19 16:24:48.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/XPCOM.java 2009-09-17 08:48:20.000000000 -0400
-@@ -139,25 +139,25 @@
+diff --git a/org/eclipse/swt/internal/mozilla/XPCOM.java b/org/eclipse/swt/internal/mozilla/XPCOM.java
+index f474386..3f1c3d9 100644
+--- a/org/eclipse/swt/internal/mozilla/XPCOM.java
++++ b/org/eclipse/swt/internal/mozilla/XPCOM.java
+@@ -139,25 +139,25 @@ public static final native int nsDynamicFunctionLoad_sizeof ();
* @param src cast=(const void *),flags=no_out critical
* @param size cast=(size_t)
*/
@@ -28756,7 +24536,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _JS_EvaluateUCScriptForPrincipals(mozillaPath, cx, obj, principals, chars, length, filename, lineno, retVal);
-@@ -167,8 +167,8 @@
+@@ -167,8 +167,8 @@ public static final int JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, int
}
/** @param result cast=(nsIComponentManager**) */
@@ -28767,7 +24547,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _NS_GetComponentManager(result);
-@@ -177,8 +177,8 @@
+@@ -177,8 +177,8 @@ public static final int NS_GetComponentManager(int /*long*/[] result) {
}
}
/** @param result cast=(nsIServiceManager**) */
@@ -28778,7 +24558,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _NS_GetServiceManager(result);
-@@ -191,8 +191,8 @@
+@@ -191,8 +191,8 @@ public static final int NS_GetServiceManager(int /*long*/[] result) {
* @param binDirectory cast=(nsIFile *)
* @param appFileLocationProvider cast=(nsIDirectoryServiceProvider *)
*/
@@ -28789,7 +24569,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _NS_InitXPCOM2(result, binDirectory, appFileLocationProvider);
-@@ -204,8 +204,8 @@
+@@ -204,8 +204,8 @@ public static final int NS_InitXPCOM2(int /*long*/ result, int /*long*/ binDirec
* @param path cast=(nsAString *),flags=struct
* @param result cast=(nsILocalFile**)
*/
@@ -28800,7 +24580,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _NS_NewLocalFile(path, followLinks, result);
-@@ -214,8 +214,8 @@
+@@ -214,8 +214,8 @@ public static final int NS_NewLocalFile(int /*long*/ path, int followLinks, int
}
}
/** @method flags=new */
@@ -28811,7 +24591,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsEmbedCString_new();
-@@ -227,8 +227,8 @@
+@@ -227,8 +227,8 @@ public static final int /*long*/ nsEmbedCString_new() {
* @method flags=new
* @param aString cast=(const char *)
*/
@@ -28822,7 +24602,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsEmbedCString_new(aString, length);
-@@ -240,8 +240,8 @@
+@@ -240,8 +240,8 @@ public static final int /*long*/ nsEmbedCString_new(byte[] aString, int length)
* @method flags=new
* @param aString cast=(const char *)
*/
@@ -28833,7 +24613,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsEmbedCString_new(aString, length);
-@@ -253,8 +253,8 @@
+@@ -253,8 +253,8 @@ public static final int /*long*/ nsEmbedCString_new(int /*long*/ aString, int le
* @method flags=delete
* @param ptr cast=(nsEmbedCString *)
*/
@@ -28844,7 +24624,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
_nsEmbedCString_delete(ptr);
-@@ -266,8 +266,8 @@
+@@ -266,8 +266,8 @@ public static final void nsEmbedCString_delete(int /*long*/ ptr) {
* @method flags=cpp
* @param ptr cast=(nsEmbedCString *)
*/
@@ -28855,7 +24635,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsEmbedCString_Length(ptr);
-@@ -279,8 +279,8 @@
+@@ -279,8 +279,8 @@ public static final int nsEmbedCString_Length(int /*long*/ ptr) {
* @method flags=cpp
* @param ptr cast=(nsIScriptGlobalObject *)
*/
@@ -28866,7 +24646,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsIScriptGlobalObject_EnsureScriptEnvironment(ptr, lang);
-@@ -292,8 +292,8 @@
+@@ -292,8 +292,8 @@ public static final int nsIScriptGlobalObject_EnsureScriptEnvironment(int /*long
* @method flags=cpp
* @param ptr cast=(nsIScriptGlobalObject *)
*/
@@ -28877,7 +24657,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsIScriptGlobalObject_GetScriptGlobal(ptr, lang);
-@@ -305,8 +305,8 @@
+@@ -305,8 +305,8 @@ public static final int /*long*/ nsIScriptGlobalObject_GetScriptGlobal(int /*lon
* @method flags=cpp
* @param ptr cast=(nsIScriptGlobalObject *)
*/
@@ -28888,7 +24668,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsIScriptGlobalObject_GetScriptContext(ptr, lang);
-@@ -318,8 +318,8 @@
+@@ -318,8 +318,8 @@ public static final int /*long*/ nsIScriptGlobalObject_GetScriptContext(int /*lo
* @method flags=cpp
* @param ptr cast=(nsIScriptContext *)
*/
@@ -28899,7 +24679,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsIScriptContext_GetNativeContext(ptr);
-@@ -332,8 +332,8 @@
+@@ -332,8 +332,8 @@ public static final int /*long*/ nsIScriptContext_GetNativeContext(int /*long*/
* @method flags=cpp
* @param ptr cast=(nsEmbedCString *)
*/
@@ -28910,7 +24690,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsEmbedCString_get(ptr);
-@@ -345,8 +345,8 @@
+@@ -345,8 +345,8 @@ public static final int /*long*/ nsEmbedCString_get(int /*long*/ ptr) {
* @method flags=delete
* @param ptr cast=(nsID *)
*/
@@ -28921,7 +24701,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
_nsID_delete(ptr);
-@@ -355,8 +355,8 @@
+@@ -355,8 +355,8 @@ public static final void nsID_delete(int /*long*/ ptr) {
}
}
/** @method flags=new */
@@ -28932,7 +24712,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsID_new();
-@@ -369,8 +369,8 @@
+@@ -369,8 +369,8 @@ public static final int /*long*/ nsID_new() {
* @param ptr cast=(nsID *)
* @param other cast=(nsID *),flags=struct
*/
@@ -28943,7 +24723,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsID_Equals(ptr, other);
-@@ -379,8 +379,8 @@
+@@ -379,8 +379,8 @@ public static final int nsID_Equals(int /*long*/ ptr, int /*long*/ other) {
}
}
/** @method flags=new */
@@ -28954,7 +24734,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsEmbedString_new();
-@@ -392,8 +392,8 @@
+@@ -392,8 +392,8 @@ public static final int /*long*/ nsEmbedString_new() {
* @method flags=new
* @param aString cast=(PRUnichar *)
*/
@@ -28965,7 +24745,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsEmbedString_new(aString);
-@@ -405,8 +405,8 @@
+@@ -405,8 +405,8 @@ public static final int /*long*/ nsEmbedString_new(char[] aString) {
* @method flags=delete
* @param ptr cast=(nsEmbedString *)
*/
@@ -28976,7 +24756,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
_nsEmbedString_delete(ptr);
-@@ -418,8 +418,8 @@
+@@ -418,8 +418,8 @@ public static final void nsEmbedString_delete(int /*long*/ ptr) {
* @method flags=cpp
* @param ptr cast=(nsEmbedString *)
*/
@@ -28987,7 +24767,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsEmbedString_Length(ptr);
-@@ -431,8 +431,8 @@
+@@ -431,8 +431,8 @@ public static final int nsEmbedString_Length(int /*long*/ ptr) {
* @method flags=cpp
* @param ptr cast=(nsEmbedString *)
*/
@@ -28998,7 +24778,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsEmbedString_get(ptr);
-@@ -445,8 +445,8 @@
+@@ -445,8 +445,8 @@ public static final int /*long*/ nsEmbedString_get(int /*long*/ ptr) {
* @param ptr cast=(nsIMemory *)
* @param size cast=(size_t)
*/
@@ -29009,7 +24789,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsIMemory_Alloc(ptr, size);
-@@ -460,8 +460,8 @@
+@@ -460,8 +460,8 @@ public static final int /*long*/ nsIMemory_Alloc(int /*long*/ ptr, int size) {
* @param ptr2 cast=(void *)
* @param size cast=(size_t)
*/
@@ -29020,7 +24800,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _nsIMemory_Realloc(ptr1, ptr2, size);
-@@ -470,8 +470,8 @@
+@@ -470,8 +470,8 @@ public static final int /*long*/ nsIMemory_Realloc(int /*long*/ ptr1, int /*long
}
}
/** @param functionLoad cast=(const nsDynamicFunctionLoad *) */
@@ -29031,7 +24811,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _XPCOMGlueLoadXULFunctions(functionLoad);
-@@ -499,8 +499,8 @@
+@@ -499,8 +499,8 @@ public static final int XPCOMGlueShutdown() {
}
}
@@ -29042,7 +24822,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _Call(ptr);
-@@ -516,8 +516,8 @@
+@@ -516,8 +516,8 @@ public static final int Call(int /*long*/ ptr) {
* @param aFromSegment cast=(const char *)
* @param aWriteCount cast=(PRUint32 *)
*/
@@ -29053,7 +24833,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _Call(ptr, aInStream, aClosure, aFromSegment, aToOffset, aCount, aWriteCount);
-@@ -533,8 +533,8 @@
+@@ -533,8 +533,8 @@ public static final int /*long*/ Call(int /*long*/ ptr, int /*long*/ aInStream,
* @param aAppDirProvider cast=(nsIDirectoryServiceProvider *)
* @param aStaticComponents cast=(nsStaticModuleInfo const *)
*/
@@ -29064,7 +24844,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _Call(ptr, aLibXULDirectory, aAppDirectory, aAppDirProvider, aStaticComponents, aStaticComponentsCount);
-@@ -543,8 +543,8 @@
+@@ -543,8 +543,8 @@ public static final int Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, in
}
}
@@ -29075,7 +24855,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl);
-@@ -553,8 +553,8 @@
+@@ -553,8 +553,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl) {
}
}
@@ -29086,7 +24866,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -562,8 +562,8 @@
+@@ -562,8 +562,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0) {
lock.unlock();
}
}
@@ -29097,7 +24877,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -571,8 +571,8 @@
+@@ -571,8 +571,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0) {
lock.unlock();
}
}
@@ -29108,7 +24888,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -580,8 +580,8 @@
+@@ -580,8 +580,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, double arg0) {
lock.unlock();
}
}
@@ -29119,7 +24899,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -589,8 +589,8 @@
+@@ -589,8 +589,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0) {
lock.unlock();
}
}
@@ -29130,7 +24910,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -598,8 +598,8 @@
+@@ -598,8 +598,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float[] arg0) {
lock.unlock();
}
}
@@ -29141,7 +24921,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -607,8 +607,8 @@
+@@ -607,8 +607,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0) {
lock.unlock();
}
}
@@ -29152,7 +24932,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -616,8 +616,8 @@
+@@ -616,8 +616,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0) {
lock.unlock();
}
}
@@ -29163,7 +24943,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -625,8 +625,8 @@
+@@ -625,8 +625,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0) {
lock.unlock();
}
}
@@ -29174,7 +24954,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -634,8 +634,8 @@
+@@ -634,8 +634,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0) {
lock.unlock();
}
}
@@ -29185,7 +24965,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -644,8 +644,8 @@
+@@ -644,8 +644,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0) {
}
}
@@ -29196,7 +24976,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -653,8 +653,8 @@
+@@ -653,8 +653,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1)
lock.unlock();
}
}
@@ -29207,7 +24987,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -662,8 +662,8 @@
+@@ -662,8 +662,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
@@ -29218,7 +24998,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -671,8 +671,8 @@
+@@ -671,8 +671,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -29229,7 +25009,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -680,8 +680,8 @@
+@@ -680,8 +680,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
lock.unlock();
}
}
@@ -29240,7 +25020,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -689,8 +689,8 @@
+@@ -689,8 +689,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long []
lock.unlock();
}
}
@@ -29251,7 +25031,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -698,8 +698,8 @@
+@@ -698,8 +698,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] ar
lock.unlock();
}
}
@@ -29262,7 +25042,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -707,8 +707,8 @@
+@@ -707,8 +707,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[]
lock.unlock();
}
}
@@ -29273,7 +25053,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -716,8 +716,8 @@
+@@ -716,8 +716,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[]
lock.unlock();
}
}
@@ -29284,7 +25064,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -725,8 +725,8 @@
+@@ -725,8 +725,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long a
lock.unlock();
}
}
@@ -29295,7 +25075,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -734,8 +734,8 @@
+@@ -734,8 +734,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
lock.unlock();
}
}
@@ -29306,7 +25086,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -743,8 +743,8 @@
+@@ -743,8 +743,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1
lock.unlock();
}
}
@@ -29317,7 +25097,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -752,8 +752,8 @@
+@@ -752,8 +752,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg
lock.unlock();
}
}
@@ -29328,7 +25108,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -761,8 +761,8 @@
+@@ -761,8 +761,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
@@ -29339,7 +25119,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -770,8 +770,8 @@
+@@ -770,8 +770,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] a
lock.unlock();
}
}
@@ -29350,7 +25130,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -779,8 +779,8 @@
+@@ -779,8 +779,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[]
lock.unlock();
}
}
@@ -29361,7 +25141,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -788,8 +788,8 @@
+@@ -788,8 +788,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1
lock.unlock();
}
}
@@ -29372,7 +25152,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -797,8 +797,8 @@
+@@ -797,8 +797,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg
lock.unlock();
}
}
@@ -29383,7 +25163,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -806,8 +806,8 @@
+@@ -806,8 +806,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int[] ar
lock.unlock();
}
}
@@ -29394,7 +25174,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -815,8 +815,8 @@
+@@ -815,8 +815,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long[] a
lock.unlock();
}
}
@@ -29405,7 +25185,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -824,8 +824,8 @@
+@@ -824,8 +824,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[]
lock.unlock();
}
}
@@ -29416,7 +25196,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -833,8 +833,8 @@
+@@ -833,8 +833,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
lock.unlock();
}
}
@@ -29427,7 +25207,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -842,8 +842,8 @@
+@@ -842,8 +842,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
lock.unlock();
}
}
@@ -29438,7 +25218,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -852,8 +852,8 @@
+@@ -852,8 +852,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
}
}
@@ -29449,7 +25229,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -861,8 +861,8 @@
+@@ -861,8 +861,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
@@ -29460,7 +25240,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -870,8 +870,8 @@
+@@ -870,8 +870,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
@@ -29471,7 +25251,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -879,8 +879,8 @@
+@@ -879,8 +879,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
@@ -29482,7 +25262,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -888,8 +888,8 @@
+@@ -888,8 +888,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
@@ -29493,7 +25273,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -897,8 +897,8 @@
+@@ -897,8 +897,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] a
lock.unlock();
}
}
@@ -29504,7 +25284,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -906,8 +906,8 @@
+@@ -906,8 +906,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long
lock.unlock();
}
}
@@ -29515,7 +25295,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -915,8 +915,8 @@
+@@ -915,8 +915,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
lock.unlock();
}
}
@@ -29526,7 +25306,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -924,8 +924,8 @@
+@@ -924,8 +924,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
lock.unlock();
}
}
@@ -29537,7 +25317,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -934,8 +934,8 @@
+@@ -934,8 +934,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long
}
}
@@ -29548,7 +25328,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -943,8 +943,8 @@
+@@ -943,8 +943,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, int arg
lock.unlock();
}
}
@@ -29559,7 +25339,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -953,8 +953,8 @@
+@@ -953,8 +953,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, long ar
}
}
@@ -29570,7 +25350,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -962,8 +962,8 @@
+@@ -962,8 +962,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[]
lock.unlock();
}
}
@@ -29581,7 +25361,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -971,8 +971,8 @@
+@@ -971,8 +971,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[]
lock.unlock();
}
}
@@ -29592,7 +25372,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -980,8 +980,8 @@
+@@ -980,8 +980,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
lock.unlock();
}
}
@@ -29603,7 +25383,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -989,8 +989,8 @@
+@@ -989,8 +989,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long a
lock.unlock();
}
}
@@ -29614,7 +25394,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -998,8 +998,8 @@
+@@ -998,8 +998,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID a
lock.unlock();
}
}
@@ -29625,7 +25405,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1007,8 +1007,8 @@
+@@ -1007,8 +1007,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID a
lock.unlock();
}
}
@@ -29636,7 +25416,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1016,8 +1016,8 @@
+@@ -1016,8 +1016,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int ar
lock.unlock();
}
}
@@ -29647,7 +25427,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1025,8 +1025,8 @@
+@@ -1025,8 +1025,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long a
lock.unlock();
}
}
@@ -29658,7 +25438,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1034,8 +1034,8 @@
+@@ -1034,8 +1034,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
@@ -29669,7 +25449,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1043,8 +1043,8 @@
+@@ -1043,8 +1043,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
@@ -29680,7 +25460,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1052,8 +1052,8 @@
+@@ -1052,8 +1052,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -29691,7 +25471,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1061,8 +1061,8 @@
+@@ -1061,8 +1061,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -29702,7 +25482,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1070,8 +1070,8 @@
+@@ -1070,8 +1070,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1
lock.unlock();
}
}
@@ -29713,7 +25493,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1079,8 +1079,8 @@
+@@ -1079,8 +1079,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -29724,7 +25504,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1088,8 +1088,8 @@
+@@ -1088,8 +1088,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -29735,7 +25515,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1097,8 +1097,8 @@
+@@ -1097,8 +1097,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -29746,7 +25526,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1106,8 +1106,8 @@
+@@ -1106,8 +1106,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -29757,7 +25537,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1115,8 +1115,8 @@
+@@ -1115,8 +1115,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
@@ -29768,7 +25548,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1124,8 +1124,8 @@
+@@ -1124,8 +1124,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -29779,7 +25559,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1133,8 +1133,8 @@
+@@ -1133,8 +1133,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1
lock.unlock();
}
}
@@ -29790,7 +25570,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1142,8 +1142,8 @@
+@@ -1142,8 +1142,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg
lock.unlock();
}
}
@@ -29801,7 +25581,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1151,8 +1151,8 @@
+@@ -1151,8 +1151,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -29812,7 +25592,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1160,8 +1160,8 @@
+@@ -1160,8 +1160,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg
lock.unlock();
}
}
@@ -29823,7 +25603,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1169,8 +1169,8 @@
+@@ -1169,8 +1169,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg
lock.unlock();
}
}
@@ -29834,7 +25614,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1178,8 +1178,8 @@
+@@ -1178,8 +1178,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
lock.unlock();
}
}
@@ -29845,7 +25625,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1187,8 +1187,8 @@
+@@ -1187,8 +1187,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
lock.unlock();
}
}
@@ -29856,7 +25636,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1196,8 +1196,8 @@
+@@ -1196,8 +1196,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[]
lock.unlock();
}
}
@@ -29867,7 +25647,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1205,8 +1205,8 @@
+@@ -1205,8 +1205,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[]
lock.unlock();
}
}
@@ -29878,7 +25658,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1214,8 +1214,8 @@
+@@ -1214,8 +1214,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[]
lock.unlock();
}
}
@@ -29889,7 +25669,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1223,8 +1223,8 @@
+@@ -1223,8 +1223,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID a
lock.unlock();
}
}
@@ -29900,7 +25680,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1232,8 +1232,8 @@
+@@ -1232,8 +1232,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID a
lock.unlock();
}
}
@@ -29911,7 +25691,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1241,8 +1241,8 @@
+@@ -1241,8 +1241,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
lock.unlock();
}
}
@@ -29922,7 +25702,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1250,8 +1250,8 @@
+@@ -1250,8 +1250,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
lock.unlock();
}
}
@@ -29933,7 +25713,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1259,8 +1259,8 @@
+@@ -1259,8 +1259,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -29944,7 +25724,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1268,8 +1268,8 @@
+@@ -1268,8 +1268,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -29955,7 +25735,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1277,8 +1277,8 @@
+@@ -1277,8 +1277,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
lock.unlock();
}
}
@@ -29966,7 +25746,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1286,8 +1286,8 @@
+@@ -1286,8 +1286,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
lock.unlock();
}
}
@@ -29977,7 +25757,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1295,8 +1295,8 @@
+@@ -1295,8 +1295,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
lock.unlock();
}
}
@@ -29988,7 +25768,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1304,8 +1304,8 @@
+@@ -1304,8 +1304,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
lock.unlock();
}
}
@@ -29999,7 +25779,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1313,8 +1313,8 @@
+@@ -1313,8 +1313,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
lock.unlock();
}
}
@@ -30010,7 +25790,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1322,8 +1322,8 @@
+@@ -1322,8 +1322,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
lock.unlock();
}
}
@@ -30021,7 +25801,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1332,8 +1332,8 @@
+@@ -1332,8 +1332,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
}
}
@@ -30032,7 +25812,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1341,8 +1341,8 @@
+@@ -1341,8 +1341,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
lock.unlock();
}
}
@@ -30043,7 +25823,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1350,8 +1350,8 @@
+@@ -1350,8 +1350,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long a
lock.unlock();
}
}
@@ -30054,7 +25834,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1359,8 +1359,8 @@
+@@ -1359,8 +1359,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
lock.unlock();
}
}
@@ -30065,7 +25845,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1368,8 +1368,8 @@
+@@ -1368,8 +1368,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
lock.unlock();
}
}
@@ -30076,7 +25856,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1377,8 +1377,8 @@
+@@ -1377,8 +1377,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
@@ -30087,7 +25867,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1386,8 +1386,8 @@
+@@ -1386,8 +1386,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
@@ -30098,7 +25878,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1395,8 +1395,8 @@
+@@ -1395,8 +1395,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
@@ -30109,7 +25889,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1404,8 +1404,8 @@
+@@ -1404,8 +1404,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30120,7 +25900,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1413,8 +1413,8 @@
+@@ -1413,8 +1413,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30131,7 +25911,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1422,8 +1422,8 @@
+@@ -1422,8 +1422,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30142,7 +25922,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1431,8 +1431,8 @@
+@@ -1431,8 +1431,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30153,7 +25933,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1440,8 +1440,8 @@
+@@ -1440,8 +1440,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30164,7 +25944,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1449,8 +1449,8 @@
+@@ -1449,8 +1449,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30175,7 +25955,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1458,8 +1458,8 @@
+@@ -1458,8 +1458,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30186,7 +25966,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1467,8 +1467,8 @@
+@@ -1467,8 +1467,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30197,7 +25977,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1476,8 +1476,8 @@
+@@ -1476,8 +1476,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30208,7 +25988,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1485,8 +1485,8 @@
+@@ -1485,8 +1485,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] a
lock.unlock();
}
}
@@ -30219,7 +25999,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1494,8 +1494,8 @@
+@@ -1494,8 +1494,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
lock.unlock();
}
}
@@ -30230,7 +26010,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1503,8 +1503,8 @@
+@@ -1503,8 +1503,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
lock.unlock();
}
}
@@ -30241,7 +26021,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1512,8 +1512,8 @@
+@@ -1512,8 +1512,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] a
lock.unlock();
}
}
@@ -30252,7 +26032,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1521,8 +1521,8 @@
+@@ -1521,8 +1521,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] a
lock.unlock();
}
}
@@ -30263,7 +26043,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1530,8 +1530,8 @@
+@@ -1530,8 +1530,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1
lock.unlock();
}
}
@@ -30274,7 +26054,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1539,8 +1539,8 @@
+@@ -1539,8 +1539,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg
lock.unlock();
}
}
@@ -30285,7 +26065,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1548,8 +1548,8 @@
+@@ -1548,8 +1548,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
lock.unlock();
}
}
@@ -30296,7 +26076,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1557,8 +1557,8 @@
+@@ -1557,8 +1557,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
lock.unlock();
}
}
@@ -30307,7 +26087,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1566,8 +1566,8 @@
+@@ -1566,8 +1566,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30318,7 +26098,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1575,8 +1575,8 @@
+@@ -1575,8 +1575,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30329,7 +26109,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1584,8 +1584,8 @@
+@@ -1584,8 +1584,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30340,7 +26120,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1593,8 +1593,8 @@
+@@ -1593,8 +1593,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30351,7 +26131,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1602,8 +1602,8 @@
+@@ -1602,8 +1602,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, int a
lock.unlock();
}
}
@@ -30362,7 +26142,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1611,8 +1611,8 @@
+@@ -1611,8 +1611,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, long
lock.unlock();
}
}
@@ -30373,7 +26153,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1620,8 +1620,8 @@
+@@ -1620,8 +1620,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
@@ -30384,7 +26164,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1629,8 +1629,8 @@
+@@ -1629,8 +1629,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30395,7 +26175,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1639,8 +1639,8 @@
+@@ -1639,8 +1639,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
}
}
@@ -30406,7 +26186,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1648,8 +1648,8 @@
+@@ -1648,8 +1648,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int ar
lock.unlock();
}
}
@@ -30417,7 +26197,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1657,8 +1657,8 @@
+@@ -1657,8 +1657,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int ar
lock.unlock();
}
}
@@ -30428,7 +26208,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1666,8 +1666,8 @@
+@@ -1666,8 +1666,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30439,7 +26219,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1675,8 +1675,8 @@
+@@ -1675,8 +1675,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30450,7 +26230,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1684,8 +1684,8 @@
+@@ -1684,8 +1684,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
lock.unlock();
}
}
@@ -30461,7 +26241,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1693,8 +1693,8 @@
+@@ -1693,8 +1693,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
@@ -30472,7 +26252,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1702,8 +1702,8 @@
+@@ -1702,8 +1702,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
@@ -30483,7 +26263,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1711,8 +1711,8 @@
+@@ -1711,8 +1711,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
lock.unlock();
}
}
@@ -30494,7 +26274,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1720,8 +1720,8 @@
+@@ -1720,8 +1720,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
lock.unlock();
}
}
@@ -30505,7 +26285,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1730,8 +1730,8 @@
+@@ -1730,8 +1730,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
}
}
@@ -30516,7 +26296,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1739,8 +1739,8 @@
+@@ -1739,8 +1739,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30527,7 +26307,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1748,8 +1748,8 @@
+@@ -1748,8 +1748,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1
lock.unlock();
}
}
@@ -30538,7 +26318,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1757,8 +1757,8 @@
+@@ -1757,8 +1757,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg
lock.unlock();
}
}
@@ -30549,7 +26329,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1767,8 +1767,8 @@
+@@ -1767,8 +1767,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
}
}
@@ -30560,7 +26340,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1776,8 +1776,8 @@
+@@ -1776,8 +1776,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
lock.unlock();
}
}
@@ -30571,7 +26351,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1785,8 +1785,8 @@
+@@ -1785,8 +1785,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
lock.unlock();
}
}
@@ -30582,7 +26362,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1794,8 +1794,8 @@
+@@ -1794,8 +1794,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30593,7 +26373,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1803,8 +1803,8 @@
+@@ -1803,8 +1803,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30604,7 +26384,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1812,8 +1812,8 @@
+@@ -1812,8 +1812,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30615,7 +26395,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1821,8 +1821,8 @@
+@@ -1821,8 +1821,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30626,7 +26406,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1831,8 +1831,8 @@
+@@ -1831,8 +1831,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] a
}
}
@@ -30637,7 +26417,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1840,8 +1840,8 @@
+@@ -1840,8 +1840,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0, long[]
lock.unlock();
}
}
@@ -30648,7 +26428,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1849,8 +1849,8 @@
+@@ -1849,8 +1849,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30659,7 +26439,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1858,8 +1858,8 @@
+@@ -1858,8 +1858,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30670,7 +26450,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1868,8 +1868,8 @@
+@@ -1868,8 +1868,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
}
}
@@ -30681,7 +26461,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1877,8 +1877,8 @@
+@@ -1877,8 +1877,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30692,7 +26472,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1886,8 +1886,8 @@
+@@ -1886,8 +1886,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] a
lock.unlock();
}
}
@@ -30703,7 +26483,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1895,8 +1895,8 @@
+@@ -1895,8 +1895,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] a
lock.unlock();
}
}
@@ -30714,7 +26494,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1904,8 +1904,8 @@
+@@ -1904,8 +1904,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30725,7 +26505,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1913,8 +1913,8 @@
+@@ -1913,8 +1913,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30736,7 +26516,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1922,8 +1922,8 @@
+@@ -1922,8 +1922,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
@@ -30747,7 +26527,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1931,8 +1931,8 @@
+@@ -1931,8 +1931,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
@@ -30758,7 +26538,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1940,8 +1940,8 @@
+@@ -1940,8 +1940,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
lock.unlock();
}
}
@@ -30769,7 +26549,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1949,8 +1949,8 @@
+@@ -1949,8 +1949,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
lock.unlock();
}
}
@@ -30780,7 +26560,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1958,8 +1958,8 @@
+@@ -1958,8 +1958,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30791,7 +26571,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1967,8 +1967,8 @@
+@@ -1967,8 +1967,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
@@ -30802,7 +26582,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1976,8 +1976,8 @@
+@@ -1976,8 +1976,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30813,7 +26593,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1985,8 +1985,8 @@
+@@ -1985,8 +1985,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30824,7 +26604,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1994,8 +1994,8 @@
+@@ -1994,8 +1994,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30835,7 +26615,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2003,8 +2003,8 @@
+@@ -2003,8 +2003,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30846,7 +26626,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2012,8 +2012,8 @@
+@@ -2012,8 +2012,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30857,7 +26637,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2022,8 +2022,8 @@
+@@ -2022,8 +2022,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
}
}
@@ -30868,7 +26648,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2031,8 +2031,8 @@
+@@ -2031,8 +2031,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
@@ -30879,7 +26659,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2040,8 +2040,8 @@
+@@ -2040,8 +2040,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
@@ -30890,7 +26670,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2049,8 +2049,8 @@
+@@ -2049,8 +2049,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
@@ -30901,7 +26681,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2058,8 +2058,8 @@
+@@ -2058,8 +2058,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
@@ -30912,7 +26692,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2067,8 +2067,8 @@
+@@ -2067,8 +2067,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30923,7 +26703,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2076,8 +2076,8 @@
+@@ -2076,8 +2076,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30934,7 +26714,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2085,8 +2085,8 @@
+@@ -2085,8 +2085,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30945,7 +26725,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2094,8 +2094,8 @@
+@@ -2094,8 +2094,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30956,7 +26736,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2103,8 +2103,8 @@
+@@ -2103,8 +2103,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30967,7 +26747,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2113,8 +2113,8 @@
+@@ -2113,8 +2113,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
}
}
@@ -30978,7 +26758,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-@@ -2122,8 +2122,8 @@
+@@ -2122,8 +2122,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
@@ -30989,7 +26769,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-@@ -2131,8 +2131,8 @@
+@@ -2131,8 +2131,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
@@ -31000,7 +26780,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-@@ -2140,8 +2140,8 @@
+@@ -2140,8 +2140,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31011,7 +26791,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-@@ -2150,8 +2150,8 @@
+@@ -2150,8 +2150,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1
}
}
@@ -31022,7 +26802,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-@@ -2159,8 +2159,8 @@
+@@ -2159,8 +2159,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31033,7 +26813,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-@@ -2168,8 +2168,8 @@
+@@ -2168,8 +2168,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -31044,7 +26824,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-@@ -2177,8 +2177,8 @@
+@@ -2177,8 +2177,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31055,7 +26835,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-@@ -2186,8 +2186,8 @@
+@@ -2186,8 +2186,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
@@ -31066,7 +26846,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-@@ -2195,8 +2195,8 @@
+@@ -2195,8 +2195,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
@@ -31077,7 +26857,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-@@ -2204,8 +2204,8 @@
+@@ -2204,8 +2204,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
@@ -31088,7 +26868,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
-@@ -2213,8 +2213,8 @@
+@@ -2213,8 +2213,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31099,7 +26879,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
-@@ -2222,8 +2222,8 @@
+@@ -2222,8 +2222,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -31110,7 +26890,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
-@@ -2231,8 +2231,8 @@
+@@ -2231,8 +2231,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31121,7 +26901,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
-@@ -2240,8 +2240,8 @@
+@@ -2240,8 +2240,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -31132,7 +26912,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14);
-@@ -2249,8 +2249,8 @@
+@@ -2249,8 +2249,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31143,10 +26923,11 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14);
-diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOMObject.java x86_64/org/eclipse/swt/internal/mozilla/XPCOMObject.java
---- x86/org/eclipse/swt/internal/mozilla/XPCOMObject.java 2009-05-29 17:30:26.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/XPCOMObject.java 2009-09-17 08:48:20.000000000 -0400
-@@ -21,7 +21,7 @@
+diff --git a/org/eclipse/swt/internal/mozilla/XPCOMObject.java b/org/eclipse/swt/internal/mozilla/XPCOMObject.java
+index bc22e54..9899a99 100644
+--- a/org/eclipse/swt/internal/mozilla/XPCOMObject.java
++++ b/org/eclipse/swt/internal/mozilla/XPCOMObject.java
+@@ -21,7 +21,7 @@ public class XPCOMObject {
IsSolaris = osName.startsWith ("sunos") || osName.startsWith("solaris"); //$NON-NLS-1$
}
@@ -31155,7 +26936,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOMObject.java x86_64/org/eclip
static private final int MAX_ARG_COUNT = 12;
static private final int MAX_VTABLE_LENGTH = 80;
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,7 @@ public class XPCOMObject {
public XPCOMObject (int[] argCounts) {
@@ -31164,7 +26945,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOMObject.java x86_64/org/eclip
synchronized (Callbacks) {
for (int i = 0, length = argCounts.length; i < length; i++) {
if ((Callbacks[i + OS_OFFSET][argCounts[i]]) == null) {
-@@ -42,737 +42,737 @@
+@@ -42,737 +42,737 @@ public XPCOMObject (int[] argCounts) {
}
}
@@ -32145,7 +27926,7 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOMObject.java x86_64/org/eclip
XPCOM.memmove (pVtable, ppVtable, C.PTR_SIZEOF);
C.free (pVtable[0]);
C.free (ppVtable);
-@@ -783,248 +783,248 @@
+@@ -783,248 +783,248 @@ public void dispose() {
ppVtable = 0;
}
@@ -32475,10 +28256,4446 @@ diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOMObject.java x86_64/org/eclip
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
}
-diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/swt/internal/opengl/glx/GLX.java
---- x86/org/eclipse/swt/internal/opengl/glx/GLX.java 2009-05-29 17:30:30.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/opengl/glx/GLX.java 2009-09-17 08:48:22.000000000 -0400
-@@ -231,8 +231,8 @@
+diff --git a/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java b/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java
+index da361dd..5be1893 100644
+--- a/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java
++++ b/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java
+@@ -13,10 +13,10 @@ package org.eclipse.swt.internal.mozilla.init;
+ /** @jniclass flags=cpp */
+ public class GREVersionRange {
+ /** @field cast=(const char *) */
+- public int /*long*/ lower;
++ public long /*int*/ lower;
+ public boolean lowerInclusive;
+ /** @field cast=(const char *) */
+- public int /*long*/ upper;
++ public long /*int*/ upper;
+ public boolean upperInclusive;
+ public static final int sizeof = XPCOMInit.GREVersionRange_sizeof();
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java b/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java
+index a746934..dbac2e1 100644
+--- a/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java
++++ b/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java
+@@ -40,8 +40,8 @@ public static final native int GREVersionRange_sizeof ();
+ * @param properties cast=(const GREProperty *)
+ * @param buffer cast=(char *)
+ */
+-public static final native int _GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, int /*long*/ properties, int propertiesLength, int /*long*/ buffer, int buflen);
+-public static final int GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, int /*long*/ properties, int propertiesLength, int /*long*/ buffer, int buflen) {
++public static final native int _GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, long /*int*/ properties, int propertiesLength, long /*int*/ buffer, int buflen);
++public static final int GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, long /*int*/ properties, int propertiesLength, long /*int*/ buffer, int buflen) {
+ lock.lock();
+ try {
+ return _GRE_GetGREPathWithProperties(versions, versionsLength, properties, propertiesLength, buffer, buflen);
+diff --git a/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java b/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java
+index 7857539..550f562 100644
+--- a/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java
++++ b/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java
+@@ -12,7 +12,7 @@ package org.eclipse.swt.internal.mozilla;
+
+ public class nsDynamicFunctionLoad {
+ /** @field cast=(const char *) */
+- public int /*long*/ functionName;
++ public long /*int*/ functionName;
+ /** @field cast=(NSFuncPtr *) */
+- public int /*long*/ function;
++ public long /*int*/ function;
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsEmbedString.java b/org/eclipse/swt/internal/mozilla/nsEmbedString.java
+index 162a0ad..ad9d453 100644
+--- a/org/eclipse/swt/internal/mozilla/nsEmbedString.java
++++ b/org/eclipse/swt/internal/mozilla/nsEmbedString.java
+@@ -28,7 +28,7 @@
+ package org.eclipse.swt.internal.mozilla;
+
+ public class nsEmbedString {
+- int /*long*/ handle;
++ long /*int*/ handle;
+
+ public nsEmbedString() {
+ handle = XPCOM.nsEmbedString_new();
+@@ -42,14 +42,14 @@ public nsEmbedString(String string) {
+ }
+ }
+
+-public int /*long*/ getAddress() {
++public long /*int*/ getAddress() {
+ return handle;
+ }
+
+ public String toString() {
+ if (handle == 0) return null;
+ int length = XPCOM.nsEmbedString_Length(handle);
+- int /*long*/ buffer = XPCOM.nsEmbedString_get(handle);
++ long /*int*/ buffer = XPCOM.nsEmbedString_get(handle);
+ char[] dest = new char[length];
+ XPCOM.memmove(dest, buffer, length * 2);
+ return new String(dest);
+diff --git a/org/eclipse/swt/internal/mozilla/nsIAppShell.java b/org/eclipse/swt/internal/mozilla/nsIAppShell.java
+index 9ce7481..c67dd14 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIAppShell.java
++++ b/org/eclipse/swt/internal/mozilla/nsIAppShell.java
+@@ -37,11 +37,11 @@ public class nsIAppShell extends nsISupports {
+ public static final nsID NS_IAPPSHELL_IID =
+ new nsID(NS_IAPPSHELL_IID_STR);
+
+- public nsIAppShell(int /*long*/ address) {
++ public nsIAppShell(long /*int*/ address) {
+ super(address);
+ }
+
+- public int Create(int /*long*/ argc, int /*long*/[] argv) {
++ public int Create(long /*int*/ argc, long /*int*/[] argv) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), argc, argv);
+ }
+
+@@ -57,15 +57,15 @@ public class nsIAppShell extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
+ }
+
+- public int ListenToEventQueue(int /*long*/ aQueue, int aListen) {
++ public int ListenToEventQueue(long /*int*/ aQueue, int aListen) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aQueue, aListen);
+ }
+
+- public int GetNativeEvent(int /*long*/ aRealEvent, int /*long*/[] aEvent) {
++ public int GetNativeEvent(long /*int*/ aRealEvent, long /*int*/[] aEvent) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aRealEvent, aEvent);
+ }
+
+- public int DispatchNativeEvent(int aRealEvent, int /*long*/ aEvent) {
++ public int DispatchNativeEvent(int aRealEvent, long /*int*/ aEvent) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aRealEvent, aEvent);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java b/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java
+index 2041790..363cabf 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java
++++ b/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java
+@@ -37,7 +37,7 @@ public class nsIAuthInformation extends nsISupports {
+ public static final nsID NS_IAUTHINFORMATION_IID =
+ new nsID(NS_IAUTHINFORMATION_IID_STR);
+
+- public nsIAuthInformation(int /*long*/ address) {
++ public nsIAuthInformation(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -53,35 +53,35 @@ public class nsIAuthInformation extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aFlags);
+ }
+
+- public int GetRealm(int /*long*/ aRealm) {
++ public int GetRealm(long /*int*/ aRealm) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aRealm);
+ }
+
+- public int GetAuthenticationScheme(int /*long*/ aAuthenticationScheme) {
++ public int GetAuthenticationScheme(long /*int*/ aAuthenticationScheme) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aAuthenticationScheme);
+ }
+
+- public int GetUsername(int /*long*/ aUsername) {
++ public int GetUsername(long /*int*/ aUsername) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aUsername);
+ }
+
+- public int SetUsername(int /*long*/ aUsername) {
++ public int SetUsername(long /*int*/ aUsername) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aUsername);
+ }
+
+- public int GetPassword(int /*long*/ aPassword) {
++ public int GetPassword(long /*int*/ aPassword) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aPassword);
+ }
+
+- public int SetPassword(int /*long*/ aPassword) {
++ public int SetPassword(long /*int*/ aPassword) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aPassword);
+ }
+
+- public int GetDomain(int /*long*/ aDomain) {
++ public int GetDomain(long /*int*/ aDomain) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aDomain);
+ }
+
+- public int SetDomain(int /*long*/ aDomain) {
++ public int SetDomain(long /*int*/ aDomain) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDomain);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java b/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java
+index 361bc5d..c909868 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java
++++ b/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java
+@@ -37,11 +37,11 @@ public class nsIBadCertListener2 extends nsISupports {
+ public static final nsID NS_IBADCERTLISTENER2_IID =
+ new nsID(NS_IBADCERTLISTENER2_IID_STR);
+
+- public nsIBadCertListener2(int /*long*/ address) {
++ public nsIBadCertListener2(long /*int*/ address) {
+ super(address);
+ }
+
+- public int NotifyCertProblem(int /*long*/ socketInfo, int /*long*/ status, int /*long*/ targetSite, int[] _retval) {
++ public int NotifyCertProblem(long /*int*/ socketInfo, long /*int*/ status, long /*int*/ targetSite, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), socketInfo, status, targetSite, _retval);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java b/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
+index 23c915b..319b78d 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
++++ b/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
+@@ -37,11 +37,11 @@ public class nsIBaseWindow extends nsISupports {
+ public static final nsID NS_IBASEWINDOW_IID =
+ new nsID(NS_IBASEWINDOW_IID_STR);
+
+- public nsIBaseWindow(int /*long*/ address) {
++ public nsIBaseWindow(long /*int*/ address) {
+ super(address);
+ }
+
+- public int InitWindow(int /*long*/ parentNativeWindow, int /*long*/ parentWidget, int x, int y, int cx, int cy) {
++ public int InitWindow(long /*int*/ parentNativeWindow, long /*int*/ parentWidget, int x, int y, int cx, int cy) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parentNativeWindow, parentWidget, x, y, cx, cy);
+ }
+
+@@ -81,19 +81,19 @@ public class nsIBaseWindow extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), force);
+ }
+
+- public int GetParentWidget(int /*long*/[] aParentWidget) {
++ public int GetParentWidget(long /*int*/[] aParentWidget) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aParentWidget);
+ }
+
+- public int SetParentWidget(int /*long*/ aParentWidget) {
++ public int SetParentWidget(long /*int*/ aParentWidget) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aParentWidget);
+ }
+
+- public int GetParentNativeWindow(int /*long*/[] aParentNativeWindow) {
++ public int GetParentNativeWindow(long /*int*/[] aParentNativeWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aParentNativeWindow);
+ }
+
+- public int SetParentNativeWindow(int /*long*/ aParentNativeWindow) {
++ public int SetParentNativeWindow(long /*int*/ aParentNativeWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentNativeWindow);
+ }
+
+@@ -121,7 +121,7 @@ public class nsIBaseWindow extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aBlurSuppression);
+ }
+
+- public int GetMainWidget(int /*long*/[] aMainWidget) {
++ public int GetMainWidget(long /*int*/[] aMainWidget) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aMainWidget);
+ }
+
+@@ -129,7 +129,7 @@ public class nsIBaseWindow extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress());
+ }
+
+- public int GetTitle(int /*long*/[] aTitle) {
++ public int GetTitle(long /*int*/[] aTitle) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aTitle);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsICancelable.java b/org/eclipse/swt/internal/mozilla/nsICancelable.java
+index e20f203..b6af27d 100644
+--- a/org/eclipse/swt/internal/mozilla/nsICancelable.java
++++ b/org/eclipse/swt/internal/mozilla/nsICancelable.java
+@@ -37,7 +37,7 @@ public class nsICancelable extends nsISupports {
+ public static final nsID NS_ICANCELABLE_IID =
+ new nsID(NS_ICANCELABLE_IID_STR);
+
+- public nsICancelable(int /*long*/ address) {
++ public nsICancelable(long /*int*/ address) {
+ super(address);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsICategoryManager.java b/org/eclipse/swt/internal/mozilla/nsICategoryManager.java
+index 8417352..5189b63 100644
+--- a/org/eclipse/swt/internal/mozilla/nsICategoryManager.java
++++ b/org/eclipse/swt/internal/mozilla/nsICategoryManager.java
+@@ -37,15 +37,15 @@ public class nsICategoryManager extends nsISupports {
+ public static final nsID NS_ICATEGORYMANAGER_IID =
+ new nsID(NS_ICATEGORYMANAGER_IID_STR);
+
+- public nsICategoryManager(int /*long*/ address) {
++ public nsICategoryManager(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetCategoryEntry(byte[] aCategory, byte[] aEntry, int /*long*/[] _retval) {
++ public int GetCategoryEntry(byte[] aCategory, byte[] aEntry, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCategory, aEntry, _retval);
+ }
+
+- public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, int /*long*/[] _retval) {
++ public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCategory, aEntry, aValue, aPersist, aReplace, _retval);
+ }
+
+@@ -57,11 +57,11 @@ public class nsICategoryManager extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aCategory);
+ }
+
+- public int EnumerateCategory(byte[] aCategory, int /*long*/[] _retval) {
++ public int EnumerateCategory(byte[] aCategory, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCategory, _retval);
+ }
+
+- public int EnumerateCategories(int /*long*/[] _retval) {
++ public int EnumerateCategories(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java b/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java
+index bd5752a..63a1c64 100644
+--- a/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java
++++ b/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java
+@@ -37,7 +37,7 @@ public class nsICertOverrideService extends nsISupports {
+ public static final nsID NS_ICERTOVERRIDESERVICE_IID =
+ new nsID(NS_ICERTOVERRIDESERVICE_IID_STR);
+
+- public nsICertOverrideService(int /*long*/ address) {
++ public nsICertOverrideService(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -47,27 +47,27 @@ public class nsICertOverrideService extends nsISupports {
+
+ public static final int ERROR_TIME = 4;
+
+- public int RememberValidityOverride(int /*long*/ aHostName, int aPort, int /*long*/ aCert, int aOverrideBits, int aTemporary) {
++ public int RememberValidityOverride(long /*int*/ aHostName, int aPort, long /*int*/ aCert, int aOverrideBits, int aTemporary) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aHostName, aPort, aCert, aOverrideBits, aTemporary);
+ }
+
+- public int HasMatchingOverride(int /*long*/ aHostName, int aPort, int /*long*/ aCert, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
++ public int HasMatchingOverride(long /*int*/ aHostName, int aPort, long /*int*/ aCert, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aHostName, aPort, aCert, aOverrideBits, aIsTemporary, _retval);
+ }
+
+- public int GetValidityOverride(int /*long*/ aHostName, int aPort, int /*long*/ aHashAlg, int /*long*/ aFingerprint, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
++ public int GetValidityOverride(long /*int*/ aHostName, int aPort, long /*int*/ aHashAlg, long /*int*/ aFingerprint, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aHostName, aPort, aHashAlg, aFingerprint, aOverrideBits, aIsTemporary, _retval);
+ }
+
+- public int ClearValidityOverride(int /*long*/ aHostName, int aPort) {
++ public int ClearValidityOverride(long /*int*/ aHostName, int aPort) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHostName, aPort);
+ }
+
+- public int GetAllOverrideHostsWithPorts(int[] aCount, int /*long*/[] aHostsWithPortsArray) {
++ public int GetAllOverrideHostsWithPorts(int[] aCount, long /*int*/[] aHostsWithPortsArray) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCount, aHostsWithPortsArray);
+ }
+
+- public int IsCertUsedForOverrides(int /*long*/ aCert, int aCheckTemporaries, int aCheckPermanents, int[] _retval) {
++ public int IsCertUsedForOverrides(long /*int*/ aCert, int aCheckTemporaries, int aCheckPermanents, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCert, aCheckTemporaries, aCheckPermanents, _retval);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java b/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java
+index 44d581d..4a5b653 100644
+--- a/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java
++++ b/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java
+@@ -37,31 +37,31 @@ public class nsICertificateDialogs extends nsISupports {
+ public static final nsID NS_ICERTIFICATEDIALOGS_IID =
+ new nsID(NS_ICERTIFICATEDIALOGS_IID_STR);
+
+- public nsICertificateDialogs(int /*long*/ address) {
++ public nsICertificateDialogs(long /*int*/ address) {
+ super(address);
+ }
+
+- public int ConfirmDownloadCACert(int /*long*/ ctx, int /*long*/ cert, int[] trust, int[] _retval) {
++ public int ConfirmDownloadCACert(long /*int*/ ctx, long /*int*/ cert, int[] trust, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), ctx, cert, trust, _retval);
+ }
+
+- public int NotifyCACertExists(int /*long*/ ctx) {
++ public int NotifyCACertExists(long /*int*/ ctx) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), ctx);
+ }
+
+- public int SetPKCS12FilePassword(int /*long*/ ctx, int /*long*/ password, int[] _retval) {
++ public int SetPKCS12FilePassword(long /*int*/ ctx, long /*int*/ password, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ctx, password, _retval);
+ }
+
+- public int GetPKCS12FilePassword(int /*long*/ ctx, int /*long*/ password, int[] _retval) {
++ public int GetPKCS12FilePassword(long /*int*/ ctx, long /*int*/ password, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), ctx, password, _retval);
+ }
+
+- public int ViewCert(int /*long*/ ctx, int /*long*/ cert) {
++ public int ViewCert(long /*int*/ ctx, long /*int*/ cert) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), ctx, cert);
+ }
+
+- public int CrlImportStatusDialog(int /*long*/ ctx, int /*long*/ crl) {
++ public int CrlImportStatusDialog(long /*int*/ ctx, long /*int*/ crl) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), ctx, crl);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsIChannel.java b/org/eclipse/swt/internal/mozilla/nsIChannel.java
+index 5868a23..1bab5d3 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIChannel.java
++++ b/org/eclipse/swt/internal/mozilla/nsIChannel.java
+@@ -37,55 +37,55 @@ public class nsIChannel extends nsIRequest {
+ public static final nsID NS_ICHANNEL_IID =
+ new nsID(NS_ICHANNEL_IID_STR);
+
+- public nsIChannel(int /*long*/ address) {
++ public nsIChannel(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetOriginalURI(int /*long*/[] aOriginalURI) {
++ public int GetOriginalURI(long /*int*/[] aOriginalURI) {
+ return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 1, getAddress(), aOriginalURI);
+ }
+
+- public int SetOriginalURI(int /*long*/ aOriginalURI) {
++ public int SetOriginalURI(long /*int*/ aOriginalURI) {
+ return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 2, getAddress(), aOriginalURI);
+ }
+
+- public int GetURI(int /*long*/[] aURI) {
++ public int GetURI(long /*int*/[] aURI) {
+ return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 3, getAddress(), aURI);
+ }
+
+- public int GetOwner(int /*long*/[] aOwner) {
++ public int GetOwner(long /*int*/[] aOwner) {
+ return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 4, getAddress(), aOwner);
+ }
+
+- public int SetOwner(int /*long*/ aOwner) {
++ public int SetOwner(long /*int*/ aOwner) {
+ return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 5, getAddress(), aOwner);
+ }
+
+- public int GetNotificationCallbacks(int /*long*/[] aNotificationCallbacks) {
++ public int GetNotificationCallbacks(long /*int*/[] aNotificationCallbacks) {
+ return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 6, getAddress(), aNotificationCallbacks);
+ }
+
+- public int SetNotificationCallbacks(int /*long*/ aNotificationCallbacks) {
++ public int SetNotificationCallbacks(long /*int*/ aNotificationCallbacks) {
+ return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 7, getAddress(), aNotificationCallbacks);
+ }
+
+- public int GetSecurityInfo(int /*long*/[] aSecurityInfo) {
++ public int GetSecurityInfo(long /*int*/[] aSecurityInfo) {
+ return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 8, getAddress(), aSecurityInfo);
+ }
+
+- public int GetContentType(int /*long*/ aContentType) {
++ public int GetContentType(long /*int*/ aContentType) {
+ return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 9, getAddress(), aContentType);
+ }
+
+- public int SetContentType(int /*long*/ aContentType) {
++ public int SetContentType(long /*int*/ aContentType) {
+ return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 10, getAddress(), aContentType);
+ }
+
+- public int GetContentCharset(int /*long*/ aContentCharset) {
++ public int GetContentCharset(long /*int*/ aContentCharset) {
+ return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 11, getAddress(), aContentCharset);
+ }
+
+- public int SetContentCharset(int /*long*/ aContentCharset) {
++ public int SetContentCharset(long /*int*/ aContentCharset) {
+ return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 12, getAddress(), aContentCharset);
+ }
+
+@@ -97,11 +97,11 @@ public class nsIChannel extends nsIRequest {
+ return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 14, getAddress(), aContentLength);
+ }
+
+- public int Open(int /*long*/[] _retval) {
++ public int Open(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 15, getAddress(), _retval);
+ }
+
+- public int AsyncOpen(int /*long*/ aListener, int /*long*/ aContext) {
++ public int AsyncOpen(long /*int*/ aListener, long /*int*/ aContext) {
+ return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 16, getAddress(), aListener, aContext);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsIClassInfo.java b/org/eclipse/swt/internal/mozilla/nsIClassInfo.java
+index 180f721..ae725a3 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIClassInfo.java
++++ b/org/eclipse/swt/internal/mozilla/nsIClassInfo.java
+@@ -37,27 +37,27 @@ public class nsIClassInfo extends nsISupports {
+ public static final nsID NS_ICLASSINFO_IID =
+ new nsID(NS_ICLASSINFO_IID_STR);
+
+- public nsIClassInfo(int /*long*/ address) {
++ public nsIClassInfo(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetInterfaces(int[] count, int /*long*/[] array) {
++ public int GetInterfaces(int[] count, long /*int*/[] array) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), count, array);
+ }
+
+- public int GetHelperForLanguage(int language, int /*long*/[] _retval) {
++ public int GetHelperForLanguage(int language, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), language, _retval);
+ }
+
+- public int GetContractID(int /*long*/[] aContractID) {
++ public int GetContractID(long /*int*/[] aContractID) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContractID);
+ }
+
+- public int GetClassDescription(int /*long*/[] aClassDescription) {
++ public int GetClassDescription(long /*int*/[] aClassDescription) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClassDescription);
+ }
+
+- public int GetClassID(int /*long*/ aClassID) {
++ public int GetClassID(long /*int*/ aClassID) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClassID);
+ }
+
+@@ -85,7 +85,7 @@ public class nsIClassInfo extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aFlags);
+ }
+
+- public int GetClassIDNoAlloc(int /*long*/ aClassIDNoAlloc) {
++ public int GetClassIDNoAlloc(long /*int*/ aClassIDNoAlloc) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aClassIDNoAlloc);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIComponentManager.java b/org/eclipse/swt/internal/mozilla/nsIComponentManager.java
+index 0dd1e04..63c327d 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIComponentManager.java
++++ b/org/eclipse/swt/internal/mozilla/nsIComponentManager.java
+@@ -37,23 +37,23 @@ public class nsIComponentManager extends nsISupports {
+ public static final nsID NS_ICOMPONENTMANAGER_IID =
+ new nsID(NS_ICOMPONENTMANAGER_IID_STR);
+
+- public nsIComponentManager(int /*long*/ address) {
++ public nsIComponentManager(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetClassObject(nsID aClass, nsID aIID, int /*long*/[] result) {
++ public int GetClassObject(nsID aClass, nsID aIID, long /*int*/[] result) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result);
+ }
+
+- public int GetClassObjectByContractID(byte[] aContractID, nsID aIID, int /*long*/[] result) {
++ public int GetClassObjectByContractID(byte[] aContractID, nsID aIID, long /*int*/[] result) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);
+ }
+
+- public int CreateInstance(nsID aClass, int /*long*/ aDelegate, nsID aIID, int /*long*/[] result) {
++ public int CreateInstance(nsID aClass, long /*int*/ aDelegate, nsID aIID, long /*int*/[] result) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aDelegate, aIID, result);
+ }
+
+- public int CreateInstanceByContractID(byte[] aContractID, int /*long*/ aDelegate, nsID aIID, int /*long*/[] result) {
++ public int CreateInstanceByContractID(byte[] aContractID, long /*int*/ aDelegate, nsID aIID, long /*int*/[] result) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContractID, aDelegate, aIID, result);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java b/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java
+index 6ff0cff..ce33351 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java
++++ b/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java
+@@ -37,31 +37,31 @@ public class nsIComponentRegistrar extends nsISupports {
+ public static final nsID NS_ICOMPONENTREGISTRAR_IID =
+ new nsID(NS_ICOMPONENTREGISTRAR_IID_STR);
+
+- public nsIComponentRegistrar(int /*long*/ address) {
++ public nsIComponentRegistrar(long /*int*/ address) {
+ super(address);
+ }
+
+- public int AutoRegister(int /*long*/ aSpec) {
++ public int AutoRegister(long /*int*/ aSpec) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);
+ }
+
+- public int AutoUnregister(int /*long*/ aSpec) {
++ public int AutoUnregister(long /*int*/ aSpec) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);
+ }
+
+- public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFactory) {
++ public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, long /*int*/ aFactory) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aClassName, aContractID, aFactory);
+ }
+
+- public int UnregisterFactory(nsID aClass, int /*long*/ aFactory) {
++ public int UnregisterFactory(nsID aClass, long /*int*/ aFactory) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClass, aFactory);
+ }
+
+- public int RegisterFactoryLocation(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFile, byte[] aLoaderStr, byte[] aType) {
++ public int RegisterFactoryLocation(nsID aClass, byte[] aClassName, byte[] aContractID, long /*int*/ aFile, byte[] aLoaderStr, byte[] aType) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClass, aClassName, aContractID, aFile, aLoaderStr, aType);
+ }
+
+- public int UnregisterFactoryLocation(nsID aClass, int /*long*/ aFile) {
++ public int UnregisterFactoryLocation(nsID aClass, long /*int*/ aFile) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aClass, aFile);
+ }
+
+@@ -73,19 +73,19 @@ public class nsIComponentRegistrar extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aContractID, _retval);
+ }
+
+- public int EnumerateCIDs(int /*long*/[] _retval) {
++ public int EnumerateCIDs(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
+ }
+
+- public int EnumerateContractIDs(int /*long*/[] _retval) {
++ public int EnumerateContractIDs(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval);
+ }
+
+- public int CIDToContractID(nsID aClass, int /*long*/[] _retval) {
++ public int CIDToContractID(nsID aClass, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aClass, _retval);
+ }
+
+- public int ContractIDToCID(byte[] aContractID, int /*long*/ _retval) {
++ public int ContractIDToCID(byte[] aContractID, long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aContractID, _retval);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java b/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java
+index b29155e..96e1355 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java
++++ b/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java
+@@ -37,7 +37,7 @@ public class nsIContextMenuListener extends nsISupports {
+ public static final nsID NS_ICONTEXTMENULISTENER_IID =
+ new nsID(NS_ICONTEXTMENULISTENER_IID_STR);
+
+- public nsIContextMenuListener(int /*long*/ address) {
++ public nsIContextMenuListener(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -53,7 +53,7 @@ public class nsIContextMenuListener extends nsISupports {
+
+ public static final int CONTEXT_INPUT = 16;
+
+- public int OnShowContextMenu(int aContextFlags, int /*long*/ aEvent, int /*long*/ aNode) {
++ public int OnShowContextMenu(int aContextFlags, long /*int*/ aEvent, long /*int*/ aNode) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aContextFlags, aEvent, aNode);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsICookie.java b/org/eclipse/swt/internal/mozilla/nsICookie.java
+index 77eb6d2..5bc725e 100644
+--- a/org/eclipse/swt/internal/mozilla/nsICookie.java
++++ b/org/eclipse/swt/internal/mozilla/nsICookie.java
+@@ -37,15 +37,15 @@ public class nsICookie extends nsISupports {
+ public static final nsID NS_ICOOKIE_IID =
+ new nsID(NS_ICOOKIE_IID_STR);
+
+- public nsICookie(int /*long*/ address) {
++ public nsICookie(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetName(int /*long*/ aName) {
++ public int GetName(long /*int*/ aName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);
+ }
+
+- public int GetValue(int /*long*/ aValue) {
++ public int GetValue(long /*int*/ aValue) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aValue);
+ }
+
+@@ -53,11 +53,11 @@ public class nsICookie extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aIsDomain);
+ }
+
+- public int GetHost(int /*long*/ aHost) {
++ public int GetHost(long /*int*/ aHost) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHost);
+ }
+
+- public int GetPath(int /*long*/ aPath) {
++ public int GetPath(long /*int*/ aPath) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPath);
+ }
+
+@@ -79,7 +79,7 @@ public class nsICookie extends nsISupports {
+
+ public static final int STATUS_REJECTED = 4;
+
+- public int GetStatus(int /*long*/ aStatus) {
++ public int GetStatus(long /*int*/ aStatus) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStatus);
+ }
+
+@@ -95,7 +95,7 @@ public class nsICookie extends nsISupports {
+
+ public static final int POLICY_NO_II = 5;
+
+- public int GetPolicy(int /*long*/ aPolicy) {
++ public int GetPolicy(long /*int*/ aPolicy) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPolicy);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsICookieManager.java b/org/eclipse/swt/internal/mozilla/nsICookieManager.java
+index a925dd8..56c8a12 100644
+--- a/org/eclipse/swt/internal/mozilla/nsICookieManager.java
++++ b/org/eclipse/swt/internal/mozilla/nsICookieManager.java
+@@ -37,7 +37,7 @@ public class nsICookieManager extends nsISupports {
+ public static final nsID NS_ICOOKIEMANAGER_IID =
+ new nsID(NS_ICOOKIEMANAGER_IID_STR);
+
+- public nsICookieManager(int /*long*/ address) {
++ public nsICookieManager(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -45,11 +45,11 @@ public class nsICookieManager extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
+ }
+
+- public int GetEnumerator(int /*long*/[] aEnumerator) {
++ public int GetEnumerator(long /*int*/[] aEnumerator) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEnumerator);
+ }
+
+- public int Remove(int /*long*/ aDomain, int /*long*/ aName, int /*long*/ aPath, int aBlocked) {
++ public int Remove(long /*int*/ aDomain, long /*int*/ aName, long /*int*/ aPath, int aBlocked) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDomain, aName, aPath, aBlocked);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsICookieService.java b/org/eclipse/swt/internal/mozilla/nsICookieService.java
+index f3faf9b..9ec84d7 100644
+--- a/org/eclipse/swt/internal/mozilla/nsICookieService.java
++++ b/org/eclipse/swt/internal/mozilla/nsICookieService.java
+@@ -38,23 +38,23 @@ public class nsICookieService extends nsISupports {
+ public static final nsID NS_ICOOKIESERVICE_IID =
+ new nsID(NS_ICOOKIESERVICE_IID_STR);
+
+- public nsICookieService(int /*long*/ address) {
++ public nsICookieService(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetCookieString(int /*long*/ aURI, int /*long*/ aChannel, int /*long*/[] _retval) {
++ public int GetCookieString(long /*int*/ aURI, long /*int*/ aChannel, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval);
+ }
+
+- public int GetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aChannel, int /*long*/[] _retval) {
++ public int GetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aChannel, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval);
+ }
+
+- public int SetCookieString(int /*long*/ aURI, int /*long*/ aPrompt, byte[] aCookie, int /*long*/ aChannel) {
++ public int SetCookieString(long /*int*/ aURI, long /*int*/ aPrompt, byte[] aCookie, long /*int*/ aChannel) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel);
+ }
+
+- public int SetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aPrompt, byte[] aCookie, byte[] aServerTime, int /*long*/ aChannel) {
++ public int SetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aPrompt, byte[] aCookie, byte[] aServerTime, long /*int*/ aChannel) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java b/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java
+index 0824f34..39902c8 100644
+--- a/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java
++++ b/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java
+@@ -37,23 +37,23 @@ public class nsICookieService_1_9 extends nsISupports {
+ public static final nsID NS_ICOOKIESERVICE_IID =
+ new nsID(NS_ICOOKIESERVICE_IID_STR);
+
+- public nsICookieService_1_9(int /*long*/ address) {
++ public nsICookieService_1_9(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetCookieString(int /*long*/ aURI, int /*long*/ aChannel, int /*long*/[] _retval) {
++ public int GetCookieString(long /*int*/ aURI, long /*int*/ aChannel, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval);
+ }
+
+- public int GetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aChannel, int /*long*/[] _retval) {
++ public int GetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aChannel, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval);
+ }
+
+- public int SetCookieString(int /*long*/ aURI, int /*long*/ aPrompt, byte[] aCookie, int /*long*/ aChannel) {
++ public int SetCookieString(long /*int*/ aURI, long /*int*/ aPrompt, byte[] aCookie, long /*int*/ aChannel) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel);
+ }
+
+- public int SetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aPrompt, byte[] aCookie, byte[] aServerTime, int /*long*/ aChannel) {
++ public int SetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aPrompt, byte[] aCookie, byte[] aServerTime, long /*int*/ aChannel) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsID.java b/org/eclipse/swt/internal/mozilla/nsID.java
+index a5fd6d8..d608287 100644
+--- a/org/eclipse/swt/internal/mozilla/nsID.java
++++ b/org/eclipse/swt/internal/mozilla/nsID.java
+@@ -44,9 +44,9 @@ public nsID(String id) {
+ }
+
+ public boolean Equals(nsID other) {
+- int /*long*/ ptr = XPCOM.nsID_new ();
++ long /*int*/ ptr = XPCOM.nsID_new ();
+ XPCOM.memmove (ptr, this, nsID.sizeof);
+- int /*long*/ otherPtr = XPCOM.nsID_new ();
++ long /*int*/ otherPtr = XPCOM.nsID_new ();
+ XPCOM.memmove (otherPtr, other, nsID.sizeof);
+ boolean result = XPCOM.nsID_Equals (ptr, otherPtr) != 0;
+ XPCOM.nsID_delete (ptr);
+diff --git a/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java b/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
+index b07be67..220db6b 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
++++ b/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
+@@ -37,7 +37,7 @@ public class nsIDOMEvent extends nsISupports {
+ public static final nsID NS_IDOMEVENT_IID =
+ new nsID(NS_IDOMEVENT_IID_STR);
+
+- public nsIDOMEvent(int /*long*/ address) {
++ public nsIDOMEvent(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -47,15 +47,15 @@ public class nsIDOMEvent extends nsISupports {
+
+ public static final int BUBBLING_PHASE = 3;
+
+- public int GetType(int /*long*/ aType) {
++ public int GetType(long /*int*/ aType) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aType);
+ }
+
+- public int GetTarget(int /*long*/[] aTarget) {
++ public int GetTarget(long /*int*/[] aTarget) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aTarget);
+ }
+
+- public int GetCurrentTarget(int /*long*/[] aCurrentTarget) {
++ public int GetCurrentTarget(long /*int*/[] aCurrentTarget) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aCurrentTarget);
+ }
+
+@@ -71,7 +71,7 @@ public class nsIDOMEvent extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCancelable);
+ }
+
+- public int GetTimeStamp(int /*long*/[] aTimeStamp) {
++ public int GetTimeStamp(long /*int*/[] aTimeStamp) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTimeStamp);
+ }
+
+@@ -83,7 +83,7 @@ public class nsIDOMEvent extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress());
+ }
+
+- public int InitEvent(int /*long*/ eventTypeArg, int canBubbleArg, int cancelableArg) {
++ public int InitEvent(long /*int*/ eventTypeArg, int canBubbleArg, int cancelableArg) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), eventTypeArg, canBubbleArg, cancelableArg);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java b/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java
+index fd08c33..e83aa11 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java
++++ b/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java
+@@ -37,19 +37,19 @@ public class nsIDOMEventTarget extends nsISupports {
+ public static final nsID NS_IDOMEVENTTARGET_IID =
+ new nsID(NS_IDOMEVENTTARGET_IID_STR);
+
+- public nsIDOMEventTarget(int /*long*/ address) {
++ public nsIDOMEventTarget(long /*int*/ address) {
+ super(address);
+ }
+
+- public int AddEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
++ public int AddEventListener(long /*int*/ type, long /*int*/ listener, int useCapture) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), type, listener, useCapture);
+ }
+
+- public int RemoveEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
++ public int RemoveEventListener(long /*int*/ type, long /*int*/ listener, int useCapture) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), type, listener, useCapture);
+ }
+
+- public int DispatchEvent(int /*long*/ evt, int[] _retval) {
++ public int DispatchEvent(long /*int*/ evt, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), evt, _retval);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java b/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java
+index 906c132..1b1c0ec 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java
++++ b/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java
+@@ -37,7 +37,7 @@ public class nsIDOMKeyEvent extends nsIDOMUIEvent {
+ public static final nsID NS_IDOMKEYEVENT_IID =
+ new nsID(NS_IDOMKEYEVENT_IID_STR);
+
+- public nsIDOMKeyEvent(int /*long*/ address) {
++ public nsIDOMKeyEvent(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -293,7 +293,7 @@ public class nsIDOMKeyEvent extends nsIDOMUIEvent {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aMetaKey);
+ }
+
+- public int InitKeyEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, int keyCodeArg, int charCodeArg) {
++ public int InitKeyEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, int keyCodeArg, int charCodeArg) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, keyCodeArg, charCodeArg);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java b/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
+index 71b7a73..7911213 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
++++ b/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
+@@ -37,7 +37,7 @@ public class nsIDOMMouseEvent extends nsIDOMUIEvent {
+ public static final nsID NS_IDOMMOUSEEVENT_IID =
+ new nsID(NS_IDOMMOUSEEVENT_IID_STR);
+
+- public nsIDOMMouseEvent(int /*long*/ address) {
++ public nsIDOMMouseEvent(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -77,11 +77,11 @@ public class nsIDOMMouseEvent extends nsIDOMUIEvent {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 9, getAddress(), aButton);
+ }
+
+- public int GetRelatedTarget(int /*long*/[] aRelatedTarget) {
++ public int GetRelatedTarget(long /*int*/[] aRelatedTarget) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 10, getAddress(), aRelatedTarget);
+ }
+
+- public int InitMouseEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, int /*long*/ relatedTargetArg) {
++ public int InitMouseEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, long /*int*/ relatedTargetArg) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 11, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java b/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java
+index a44ec1f..6648049 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java
++++ b/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java
+@@ -37,15 +37,15 @@ public class nsIDOMSerializer extends nsISupports {
+ public static final nsID NS_IDOMSERIALIZER_IID =
+ new nsID(NS_IDOMSERIALIZER_IID_STR);
+
+- public nsIDOMSerializer(int /*long*/ address) {
++ public nsIDOMSerializer(long /*int*/ address) {
+ super(address);
+ }
+
+- public int SerializeToString(int /*long*/ root, int /*long*/[] _retval) {
++ public int SerializeToString(long /*int*/ root, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), root, _retval);
+ }
+
+- public int SerializeToStream(int /*long*/ root, int /*long*/ stream, byte[] charset) {
++ public int SerializeToStream(long /*int*/ root, long /*int*/ stream, byte[] charset) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), root, stream, charset);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java b/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java
+index 3a8ec8b..39b41ed 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java
++++ b/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java
+@@ -37,15 +37,15 @@ public class nsIDOMSerializer_1_7 extends nsISupports {
+ public static final nsID NS_IDOMSERIALIZER_IID =
+ new nsID(NS_IDOMSERIALIZER_IID_STR);
+
+- public nsIDOMSerializer_1_7(int /*long*/ address) {
++ public nsIDOMSerializer_1_7(long /*int*/ address) {
+ super(address);
+ }
+
+- public int SerializeToString(int /*long*/ root, int /*long*/ _retval) {
++ public int SerializeToString(long /*int*/ root, long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), root, _retval);
+ }
+
+- public int SerializeToStream(int /*long*/ root, int /*long*/ stream, int /*long*/ charset) {
++ public int SerializeToStream(long /*int*/ root, long /*int*/ stream, long /*int*/ charset) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), root, stream, charset);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java b/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
+index 3a35f4b..fd2994b 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
++++ b/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
+@@ -37,11 +37,11 @@ public class nsIDOMUIEvent extends nsIDOMEvent {
+ public static final nsID NS_IDOMUIEVENT_IID =
+ new nsID(NS_IDOMUIEVENT_IID_STR);
+
+- public nsIDOMUIEvent(int /*long*/ address) {
++ public nsIDOMUIEvent(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetView(int /*long*/[] aView) {
++ public int GetView(long /*int*/[] aView) {
+ return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 1, getAddress(), aView);
+ }
+
+@@ -49,7 +49,7 @@ public class nsIDOMUIEvent extends nsIDOMEvent {
+ return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 2, getAddress(), aDetail);
+ }
+
+- public int InitUIEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg) {
++ public int InitUIEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int detailArg) {
+ return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 3, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java b/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java
+index 514843a..eeef96e 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java
++++ b/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java
+@@ -37,35 +37,35 @@ public class nsIDOMWindow extends nsISupports {
+ public static final nsID NS_IDOMWINDOW_IID =
+ new nsID(NS_IDOMWINDOW_IID_STR);
+
+- public nsIDOMWindow(int /*long*/ address) {
++ public nsIDOMWindow(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetDocument(int /*long*/[] aDocument) {
++ public int GetDocument(long /*int*/[] aDocument) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aDocument);
+ }
+
+- public int GetParent(int /*long*/[] aParent) {
++ public int GetParent(long /*int*/[] aParent) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aParent);
+ }
+
+- public int GetTop(int /*long*/[] aTop) {
++ public int GetTop(long /*int*/[] aTop) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aTop);
+ }
+
+- public int GetScrollbars(int /*long*/[] aScrollbars) {
++ public int GetScrollbars(long /*int*/[] aScrollbars) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aScrollbars);
+ }
+
+- public int GetFrames(int /*long*/[] aFrames) {
++ public int GetFrames(long /*int*/[] aFrames) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aFrames);
+ }
+
+- public int GetName(int /*long*/ aName) {
++ public int GetName(long /*int*/ aName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aName);
+ }
+
+- public int SetName(int /*long*/ aName) {
++ public int SetName(long /*int*/ aName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aName);
+ }
+
+@@ -93,7 +93,7 @@ public class nsIDOMWindow extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), xScrollDif, yScrollDif);
+ }
+
+- public int GetSelection(int /*long*/[] _retval) {
++ public int GetSelection(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), _retval);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java b/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java
+index 663688a..e250093 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java
++++ b/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java
+@@ -37,7 +37,7 @@ public class nsIDOMWindowCollection extends nsISupports {
+ public static final nsID NS_IDOMWINDOWCOLLECTION_IID =
+ new nsID(NS_IDOMWINDOWCOLLECTION_IID_STR);
+
+- public nsIDOMWindowCollection(int /*long*/ address) {
++ public nsIDOMWindowCollection(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -45,11 +45,11 @@ public class nsIDOMWindowCollection extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLength);
+ }
+
+- public int Item(int index, int /*long*/[] _retval) {
++ public int Item(int index, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), index, _retval);
+ }
+
+- public int NamedItem(int /*long*/ name, int /*long*/[] _retval) {
++ public int NamedItem(long /*int*/ name, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), name, _retval);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIDataType.java b/org/eclipse/swt/internal/mozilla/nsIDataType.java
+index 88e6093..cf9e0b6 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIDataType.java
++++ b/org/eclipse/swt/internal/mozilla/nsIDataType.java
+@@ -11,7 +11,7 @@ public class nsIDataType extends nsISupports {
+ public static final nsID NS_IDATATYPE_IID =
+ new nsID(NS_IDATATYPE_IID_STR);
+
+- public nsIDataType(int /*long*/ address) {
++ public nsIDataType(long /*int*/ address) {
+ super(address);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java b/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
+index 58aef5f..9b07197 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
++++ b/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
+@@ -37,7 +37,7 @@ public class nsIDirectoryService extends nsISupports {
+ public static final nsID NS_IDIRECTORYSERVICE_IID =
+ new nsID(NS_IDIRECTORYSERVICE_IID_STR);
+
+- public nsIDirectoryService(int /*long*/ address) {
++ public nsIDirectoryService(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -45,11 +45,11 @@ public class nsIDirectoryService extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
+ }
+
+- public int RegisterProvider(int /*long*/ prov) {
++ public int RegisterProvider(long /*int*/ prov) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prov);
+ }
+
+- public int UnregisterProvider(int /*long*/ prov) {
++ public int UnregisterProvider(long /*int*/ prov) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prov);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java b/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
+index 8998396..435d97d 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
++++ b/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
+@@ -37,11 +37,11 @@ public class nsIDirectoryServiceProvider extends nsISupports {
+ public static final nsID NS_IDIRECTORYSERVICEPROVIDER_IID =
+ new nsID(NS_IDIRECTORYSERVICEPROVIDER_IID_STR);
+
+- public nsIDirectoryServiceProvider(int /*long*/ address) {
++ public nsIDirectoryServiceProvider(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetFile(byte[] prop, int[] persistent, int /*long*/[] _retval) {
++ public int GetFile(byte[] prop, int[] persistent, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, persistent, _retval);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java b/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java
+index a277b15..1a44e2d 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java
++++ b/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java
+@@ -37,11 +37,11 @@ public class nsIDirectoryServiceProvider2 extends nsIDirectoryServiceProvider {
+ public static final nsID NS_IDIRECTORYSERVICEPROVIDER2_IID =
+ new nsID(NS_IDIRECTORYSERVICEPROVIDER2_IID_STRING);
+
+- public nsIDirectoryServiceProvider2(int /*long*/ address) {
++ public nsIDirectoryServiceProvider2(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetFiles(byte[] prop, int /*long*/[] _retval) {
++ public int GetFiles(byte[] prop, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIDirectoryServiceProvider.LAST_METHOD_ID + 1, getAddress(), prop, _retval);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsIDocShell.java b/org/eclipse/swt/internal/mozilla/nsIDocShell.java
+index bed487c..ea3312c 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIDocShell.java
++++ b/org/eclipse/swt/internal/mozilla/nsIDocShell.java
+@@ -37,23 +37,23 @@ public class nsIDocShell extends nsISupports {
+ public static final nsID NS_IDOCSHELL_IID =
+ new nsID(NS_IDOCSHELL_IID_STR);
+
+- public nsIDocShell(int /*long*/ address) {
++ public nsIDocShell(long /*int*/ address) {
+ super(address);
+ }
+
+- public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {
++ public int LoadURI(long /*int*/ uri, long /*int*/ loadInfo, int aLoadFlags, int firstParty) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);
+ }
+
+- public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {
++ public int LoadStream(long /*int*/ aStream, long /*int*/ aURI, long /*int*/ aContentType, long /*int*/ aContentCharset, long /*int*/ aLoadInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);
+ }
+
+- public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aInheritOwner, char[] aWindowTarget, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {
++ public int InternalLoad(long /*int*/ aURI, long /*int*/ aReferrer, long /*int*/ aOwner, int aInheritOwner, char[] aWindowTarget, long /*int*/ aPostDataStream, long /*int*/ aHeadersStream, int aLoadFlags, long /*int*/ aSHEntry, int firstParty, long /*int*/[] aDocShell, long /*int*/[] aRequest) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aInheritOwner, aWindowTarget, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);
+ }
+
+- public int CreateLoadInfo(int /*long*/[] loadInfo) {
++ public int CreateLoadInfo(long /*int*/[] loadInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);
+ }
+
+@@ -61,7 +61,7 @@ public class nsIDocShell extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
+ }
+
+- public int SetCurrentURI(int /*long*/ aURI) {
++ public int SetCurrentURI(long /*int*/ aURI) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);
+ }
+
+@@ -69,43 +69,43 @@ public class nsIDocShell extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress());
+ }
+
+- public int GetPresContext(int /*long*/[] aPresContext) {
++ public int GetPresContext(long /*int*/[] aPresContext) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);
+ }
+
+- public int GetPresShell(int /*long*/[] aPresShell) {
++ public int GetPresShell(long /*int*/[] aPresShell) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);
+ }
+
+- public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {
++ public int GetEldestPresShell(long /*int*/[] aEldestPresShell) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);
+ }
+
+- public int GetContentViewer(int /*long*/[] aContentViewer) {
++ public int GetContentViewer(long /*int*/[] aContentViewer) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);
+ }
+
+- public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {
++ public int GetChromeEventHandler(long /*int*/[] aChromeEventHandler) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);
+ }
+
+- public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {
++ public int SetChromeEventHandler(long /*int*/ aChromeEventHandler) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);
+ }
+
+- public int GetParentURIContentListener(int /*long*/[] aParentURIContentListener) {
++ public int GetParentURIContentListener(long /*int*/[] aParentURIContentListener) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentURIContentListener);
+ }
+
+- public int SetParentURIContentListener(int /*long*/ aParentURIContentListener) {
++ public int SetParentURIContentListener(long /*int*/ aParentURIContentListener) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aParentURIContentListener);
+ }
+
+- public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {
++ public int GetDocumentCharsetInfo(long /*int*/[] aDocumentCharsetInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aDocumentCharsetInfo);
+ }
+
+- public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {
++ public int SetDocumentCharsetInfo(long /*int*/ aDocumentCharsetInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocumentCharsetInfo);
+ }
+
+@@ -153,7 +153,7 @@ public class nsIDocShell extends nsISupports {
+
+ public static final int ENUMERATE_BACKWARDS = 1;
+
+- public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {
++ public int GetDocShellEnumerator(int aItemType, int aDirection, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aItemType, aDirection, _retval);
+ }
+
+@@ -255,11 +255,11 @@ public class nsIDocShell extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aIsExecutingOnLoadHandler);
+ }
+
+- public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {
++ public int GetLayoutHistoryState(long /*int*/[] aLayoutHistoryState) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aLayoutHistoryState);
+ }
+
+- public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {
++ public int SetLayoutHistoryState(long /*int*/ aLayoutHistoryState) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aLayoutHistoryState);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java b/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java
+index 526c759..3cbeb31 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java
++++ b/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java
+@@ -37,15 +37,15 @@ public class nsIDocShell_1_8 extends nsISupports {
+ public static final nsID NS_IDOCSHELL_IID =
+ new nsID(NS_IDOCSHELL_IID_STR);
+
+- public nsIDocShell_1_8(int /*long*/ address) {
++ public nsIDocShell_1_8(long /*int*/ address) {
+ super(address);
+ }
+
+- public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {
++ public int LoadURI(long /*int*/ uri, long /*int*/ loadInfo, int aLoadFlags, int firstParty) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);
+ }
+
+- public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {
++ public int LoadStream(long /*int*/ aStream, long /*int*/ aURI, long /*int*/ aContentType, long /*int*/ aContentCharset, long /*int*/ aLoadInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);
+ }
+
+@@ -55,11 +55,11 @@ public class nsIDocShell_1_8 extends nsISupports {
+
+ public static final int INTERNAL_LOAD_FLAGS_DONT_SEND_REFERRER = 2;
+
+- public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aFlags, char[] aWindowTarget, byte[] aTypeHint, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {
++ public int InternalLoad(long /*int*/ aURI, long /*int*/ aReferrer, long /*int*/ aOwner, int aFlags, char[] aWindowTarget, byte[] aTypeHint, long /*int*/ aPostDataStream, long /*int*/ aHeadersStream, int aLoadFlags, long /*int*/ aSHEntry, int firstParty, long /*int*/[] aDocShell, long /*int*/[] aRequest) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aFlags, aWindowTarget, aTypeHint, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);
+ }
+
+- public int CreateLoadInfo(int /*long*/[] loadInfo) {
++ public int CreateLoadInfo(long /*int*/[] loadInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);
+ }
+
+@@ -67,7 +67,7 @@ public class nsIDocShell_1_8 extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
+ }
+
+- public int SetCurrentURI(int /*long*/ aURI) {
++ public int SetCurrentURI(long /*int*/ aURI) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);
+ }
+
+@@ -75,35 +75,35 @@ public class nsIDocShell_1_8 extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), isUnload);
+ }
+
+- public int GetPresContext(int /*long*/[] aPresContext) {
++ public int GetPresContext(long /*int*/[] aPresContext) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);
+ }
+
+- public int GetPresShell(int /*long*/[] aPresShell) {
++ public int GetPresShell(long /*int*/[] aPresShell) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);
+ }
+
+- public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {
++ public int GetEldestPresShell(long /*int*/[] aEldestPresShell) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);
+ }
+
+- public int GetContentViewer(int /*long*/[] aContentViewer) {
++ public int GetContentViewer(long /*int*/[] aContentViewer) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);
+ }
+
+- public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {
++ public int GetChromeEventHandler(long /*int*/[] aChromeEventHandler) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);
+ }
+
+- public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {
++ public int SetChromeEventHandler(long /*int*/ aChromeEventHandler) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);
+ }
+
+- public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {
++ public int GetDocumentCharsetInfo(long /*int*/[] aDocumentCharsetInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aDocumentCharsetInfo);
+ }
+
+- public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {
++ public int SetDocumentCharsetInfo(long /*int*/ aDocumentCharsetInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aDocumentCharsetInfo);
+ }
+
+@@ -151,7 +151,7 @@ public class nsIDocShell_1_8 extends nsISupports {
+
+ public static final int ENUMERATE_BACKWARDS = 1;
+
+- public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {
++ public int GetDocShellEnumerator(int aItemType, int aDirection, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aItemType, aDirection, _retval);
+ }
+
+@@ -255,11 +255,11 @@ public class nsIDocShell_1_8 extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), aIsExecutingOnLoadHandler);
+ }
+
+- public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {
++ public int GetLayoutHistoryState(long /*int*/[] aLayoutHistoryState) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 47, getAddress(), aLayoutHistoryState);
+ }
+
+- public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {
++ public int SetLayoutHistoryState(long /*int*/ aLayoutHistoryState) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aLayoutHistoryState);
+ }
+
+@@ -267,11 +267,11 @@ public class nsIDocShell_1_8 extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aShouldSaveLayoutState);
+ }
+
+- public int GetSecurityUI(int /*long*/[] aSecurityUI) {
++ public int GetSecurityUI(long /*int*/[] aSecurityUI) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aSecurityUI);
+ }
+
+- public int SetSecurityUI(int /*long*/ aSecurityUI) {
++ public int SetSecurityUI(long /*int*/ aSecurityUI) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 51, getAddress(), aSecurityUI);
+ }
+
+@@ -283,7 +283,7 @@ public class nsIDocShell_1_8 extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 53, getAddress());
+ }
+
+- public int BeginRestore(int /*long*/ viewer, int top) {
++ public int BeginRestore(long /*int*/ viewer, int top) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 54, getAddress(), viewer, top);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsIDownload.java b/org/eclipse/swt/internal/mozilla/nsIDownload.java
+index 365f51f..9caf472 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIDownload.java
++++ b/org/eclipse/swt/internal/mozilla/nsIDownload.java
+@@ -37,23 +37,23 @@ public class nsIDownload extends nsISupports {
+ public static final nsID NS_IDOWNLOAD_IID =
+ new nsID(NS_IDOWNLOAD_IID_STR);
+
+- public nsIDownload(int /*long*/ address) {
++ public nsIDownload(long /*int*/ address) {
+ super(address);
+ }
+
+- public int Init(int /*long*/ aSource, int /*long*/ aTarget, char[] aDisplayName, int /*long*/ aMIMEInfo, long startTime, int /*long*/ aPersist) {
++ public int Init(long /*int*/ aSource, long /*int*/ aTarget, char[] aDisplayName, long /*int*/ aMIMEInfo, long startTime, long /*int*/ aPersist) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aPersist);
+ }
+
+- public int GetSource(int /*long*/[] aSource) {
++ public int GetSource(long /*int*/[] aSource) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource);
+ }
+
+- public int GetTarget(int /*long*/[] aTarget) {
++ public int GetTarget(long /*int*/[] aTarget) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aTarget);
+ }
+
+- public int GetPersist(int /*long*/[] aPersist) {
++ public int GetPersist(long /*int*/[] aPersist) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPersist);
+ }
+
+@@ -61,7 +61,7 @@ public class nsIDownload extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPercentComplete);
+ }
+
+- public int GetDisplayName(int /*long*/[] aDisplayName) {
++ public int GetDisplayName(long /*int*/[] aDisplayName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDisplayName);
+ }
+
+@@ -73,23 +73,23 @@ public class nsIDownload extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStartTime);
+ }
+
+- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
++ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aMIMEInfo);
+ }
+
+- public int GetListener(int /*long*/[] aListener) {
++ public int GetListener(long /*int*/[] aListener) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aListener);
+ }
+
+- public int SetListener(int /*long*/ aListener) {
++ public int SetListener(long /*int*/ aListener) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aListener);
+ }
+
+- public int GetObserver(int /*long*/[] aObserver) {
++ public int GetObserver(long /*int*/[] aObserver) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aObserver);
+ }
+
+- public int SetObserver(int /*long*/ aObserver) {
++ public int SetObserver(long /*int*/ aObserver) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aObserver);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java b/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java
+index aeeb024..8105fd7 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java
++++ b/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java
+@@ -37,11 +37,11 @@ public class nsIDownload_1_8 extends nsITransfer {
+ public static final nsID NS_IDOWNLOAD_IID =
+ new nsID(NS_IDOWNLOAD_IID_STR);
+
+- public nsIDownload_1_8(int /*long*/ address) {
++ public nsIDownload_1_8(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetTargetFile(int /*long*/[] aTargetFile) {
++ public int GetTargetFile(long /*int*/[] aTargetFile) {
+ return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 1, getAddress(), aTargetFile);
+ }
+
+@@ -49,27 +49,27 @@ public class nsIDownload_1_8 extends nsITransfer {
+ return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 2, getAddress(), aPercentComplete);
+ }
+
+- public int GetAmountTransferred(int /*long*/ aAmountTransferred) {
++ public int GetAmountTransferred(long /*int*/ aAmountTransferred) {
+ return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 3, getAddress(), aAmountTransferred);
+ }
+
+- public int GetSize(int /*long*/ aSize) {
++ public int GetSize(long /*int*/ aSize) {
+ return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 4, getAddress(), aSize);
+ }
+
+- public int GetSource(int /*long*/[] aSource) {
++ public int GetSource(long /*int*/[] aSource) {
+ return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 5, getAddress(), aSource);
+ }
+
+- public int GetTarget(int /*long*/[] aTarget) {
++ public int GetTarget(long /*int*/[] aTarget) {
+ return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 6, getAddress(), aTarget);
+ }
+
+- public int GetCancelable(int /*long*/[] aCancelable) {
++ public int GetCancelable(long /*int*/[] aCancelable) {
+ return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 7, getAddress(), aCancelable);
+ }
+
+- public int GetDisplayName(int /*long*/[] aDisplayName) {
++ public int GetDisplayName(long /*int*/[] aDisplayName) {
+ return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 8, getAddress(), aDisplayName);
+ }
+
+@@ -77,7 +77,7 @@ public class nsIDownload_1_8 extends nsITransfer {
+ return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 9, getAddress(), aStartTime);
+ }
+
+- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
++ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
+ return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 10, getAddress(), aMIMEInfo);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java b/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
+index 3bb3009..fe5ffec 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
++++ b/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
+@@ -37,7 +37,7 @@ public class nsIEmbeddingSiteWindow extends nsISupports {
+ public static final nsID NS_IEMBEDDINGSITEWINDOW_IID =
+ new nsID(NS_IEMBEDDINGSITEWINDOW_IID_STR);
+
+- public nsIEmbeddingSiteWindow(int /*long*/ address) {
++ public nsIEmbeddingSiteWindow(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -67,7 +67,7 @@ public class nsIEmbeddingSiteWindow extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aVisibility);
+ }
+
+- public int GetTitle(int /*long*/[] aTitle) {
++ public int GetTitle(long /*int*/[] aTitle) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aTitle);
+ }
+
+@@ -75,7 +75,7 @@ public class nsIEmbeddingSiteWindow extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTitle);
+ }
+
+- public int GetSiteWindow(int /*long*/[] aSiteWindow) {
++ public int GetSiteWindow(long /*int*/[] aSiteWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aSiteWindow);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIFactory.java b/org/eclipse/swt/internal/mozilla/nsIFactory.java
+index cd83018..3429f56 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIFactory.java
++++ b/org/eclipse/swt/internal/mozilla/nsIFactory.java
+@@ -37,11 +37,11 @@ public class nsIFactory extends nsISupports {
+ public static final nsID NS_IFACTORY_IID =
+ new nsID(NS_IFACTORY_IID_STR);
+
+- public nsIFactory(int /*long*/ address) {
++ public nsIFactory(long /*int*/ address) {
+ super(address);
+ }
+
+- public int CreateInstance(int /*long*/ aOuter, nsID iid, int /*long*/[] result) {
++ public int CreateInstance(long /*int*/ aOuter, nsID iid, long /*int*/[] result) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aOuter, iid, result);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsIFile.java b/org/eclipse/swt/internal/mozilla/nsIFile.java
+index e5d51b0..9beae64 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIFile.java
++++ b/org/eclipse/swt/internal/mozilla/nsIFile.java
+@@ -37,7 +37,7 @@ public class nsIFile extends nsISupports {
+ public static final nsID NS_IFILE_IID =
+ new nsID(NS_IFILE_IID_STR);
+
+- public nsIFile(int /*long*/ address) {
++ public nsIFile(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -45,11 +45,11 @@ public class nsIFile extends nsISupports {
+
+ public static final int DIRECTORY_TYPE = 1;
+
+- public int Append(int /*long*/ node) {
++ public int Append(long /*int*/ node) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), node);
+ }
+
+- public int AppendNative(int /*long*/ node) {
++ public int AppendNative(long /*int*/ node) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), node);
+ }
+
+@@ -61,43 +61,43 @@ public class nsIFile extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), type, permissions);
+ }
+
+- public int GetLeafName(int /*long*/ aLeafName) {
++ public int GetLeafName(long /*int*/ aLeafName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLeafName);
+ }
+
+- public int SetLeafName(int /*long*/ aLeafName) {
++ public int SetLeafName(long /*int*/ aLeafName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLeafName);
+ }
+
+- public int GetNativeLeafName(int /*long*/ aNativeLeafName) {
++ public int GetNativeLeafName(long /*int*/ aNativeLeafName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNativeLeafName);
+ }
+
+- public int SetNativeLeafName(int /*long*/ aNativeLeafName) {
++ public int SetNativeLeafName(long /*int*/ aNativeLeafName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNativeLeafName);
+ }
+
+- public int CopyTo(int /*long*/ newParentDir, int /*long*/ newName) {
++ public int CopyTo(long /*int*/ newParentDir, long /*int*/ newName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), newParentDir, newName);
+ }
+
+- public int CopyToNative(int /*long*/ newParentDir, int /*long*/ newName) {
++ public int CopyToNative(long /*int*/ newParentDir, long /*int*/ newName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), newParentDir, newName);
+ }
+
+- public int CopyToFollowingLinks(int /*long*/ newParentDir, int /*long*/ newName) {
++ public int CopyToFollowingLinks(long /*int*/ newParentDir, long /*int*/ newName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), newParentDir, newName);
+ }
+
+- public int CopyToFollowingLinksNative(int /*long*/ newParentDir, int /*long*/ newName) {
++ public int CopyToFollowingLinksNative(long /*int*/ newParentDir, long /*int*/ newName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), newParentDir, newName);
+ }
+
+- public int MoveTo(int /*long*/ newParentDir, int /*long*/ newName) {
++ public int MoveTo(long /*int*/ newParentDir, long /*int*/ newName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), newParentDir, newName);
+ }
+
+- public int MoveToNative(int /*long*/ newParentDir, int /*long*/ newName) {
++ public int MoveToNative(long /*int*/ newParentDir, long /*int*/ newName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), newParentDir, newName);
+ }
+
+@@ -149,19 +149,19 @@ public class nsIFile extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aFileSizeOfLink);
+ }
+
+- public int GetTarget(int /*long*/ aTarget) {
++ public int GetTarget(long /*int*/ aTarget) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aTarget);
+ }
+
+- public int GetNativeTarget(int /*long*/ aNativeTarget) {
++ public int GetNativeTarget(long /*int*/ aNativeTarget) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aNativeTarget);
+ }
+
+- public int GetPath(int /*long*/ aPath) {
++ public int GetPath(long /*int*/ aPath) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aPath);
+ }
+
+- public int GetNativePath(int /*long*/ aNativePath) {
++ public int GetNativePath(long /*int*/ aNativePath) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aNativePath);
+ }
+
+@@ -205,23 +205,23 @@ public class nsIFile extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), type, permissions);
+ }
+
+- public int Clone(int /*long*/[] _retval) {
++ public int Clone(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), _retval);
+ }
+
+- public int Equals(int /*long*/ inFile, int[] _retval) {
++ public int Equals(long /*int*/ inFile, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), inFile, _retval);
+ }
+
+- public int Contains(int /*long*/ inFile, int recur, int[] _retval) {
++ public int Contains(long /*int*/ inFile, int recur, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), inFile, recur, _retval);
+ }
+
+- public int GetParent(int /*long*/[] aParent) {
++ public int GetParent(long /*int*/[] aParent) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aParent);
+ }
+
+- public int GetDirectoryEntries(int /*long*/[] aDirectoryEntries) {
++ public int GetDirectoryEntries(long /*int*/[] aDirectoryEntries) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), aDirectoryEntries);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIFilePicker.java b/org/eclipse/swt/internal/mozilla/nsIFilePicker.java
+index 916f834..f74a83c 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIFilePicker.java
++++ b/org/eclipse/swt/internal/mozilla/nsIFilePicker.java
+@@ -37,7 +37,7 @@ public class nsIFilePicker extends nsISupports {
+ public static final nsID NS_IFILEPICKER_IID =
+ new nsID(NS_IFILEPICKER_IID_STR);
+
+- public nsIFilePicker(int /*long*/ address) {
++ public nsIFilePicker(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -56,7 +56,7 @@ public class nsIFilePicker extends nsISupports {
+ public static final int filterXUL = 32;
+ public static final int filterApps = 64;
+
+- public int Init(int /*long*/ parent, char[] title, int mode) {
++ public int Init(long /*int*/ parent, char[] title, int mode) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode);
+ }
+
+@@ -68,7 +68,7 @@ public class nsIFilePicker extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter);
+ }
+
+- public int GetDefaultString(int /*long*/[] aDefaultString) {
++ public int GetDefaultString(long /*int*/[] aDefaultString) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString);
+ }
+
+@@ -76,7 +76,7 @@ public class nsIFilePicker extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString);
+ }
+
+- public int GetDefaultExtension(int /*long*/[] aDefaultExtension) {
++ public int GetDefaultExtension(long /*int*/[] aDefaultExtension) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension);
+ }
+
+@@ -92,27 +92,27 @@ public class nsIFilePicker extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex);
+ }
+
+- public int GetDisplayDirectory(int /*long*/[] aDisplayDirectory) {
++ public int GetDisplayDirectory(long /*int*/[] aDisplayDirectory) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aDisplayDirectory);
+ }
+
+- public int SetDisplayDirectory(int /*long*/ aDisplayDirectory) {
++ public int SetDisplayDirectory(long /*int*/ aDisplayDirectory) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDisplayDirectory);
+ }
+
+- public int GetFile(int /*long*/[] aFile) {
++ public int GetFile(long /*int*/[] aFile) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aFile);
+ }
+
+- public int GetFileURL(int /*long*/[] aFileURL) {
++ public int GetFileURL(long /*int*/[] aFileURL) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aFileURL);
+ }
+
+- public int GetFiles(int /*long*/[] aFiles) {
++ public int GetFiles(long /*int*/[] aFiles) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aFiles);
+ }
+
+- public int Show(int /*long*/ _retval) {
++ public int Show(long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), _retval);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java b/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
+index 22b0ed3..4d03fd9 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
++++ b/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
+@@ -37,7 +37,7 @@ public class nsIFilePicker_1_8 extends nsISupports {
+ public static final nsID NS_IFILEPICKER_IID =
+ new nsID(NS_IFILEPICKER_IID_STR);
+
+- public nsIFilePicker_1_8(int /*long*/ address) {
++ public nsIFilePicker_1_8(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -56,7 +56,7 @@ public class nsIFilePicker_1_8 extends nsISupports {
+ public static final int filterXUL = 32;
+ public static final int filterApps = 64;
+
+- public int Init(int /*long*/ parent, int /*long*/ title, int mode) {
++ public int Init(long /*int*/ parent, long /*int*/ title, int mode) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode);
+ }
+
+@@ -64,23 +64,23 @@ public class nsIFilePicker_1_8 extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), filterMask);
+ }
+
+- public int AppendFilter(int /*long*/ title, int /*long*/ filter) {
++ public int AppendFilter(long /*int*/ title, long /*int*/ filter) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter);
+ }
+
+- public int GetDefaultString(int /*long*/ aDefaultString) {
++ public int GetDefaultString(long /*int*/ aDefaultString) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString);
+ }
+
+- public int SetDefaultString(int /*long*/ aDefaultString) {
++ public int SetDefaultString(long /*int*/ aDefaultString) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString);
+ }
+
+- public int GetDefaultExtension(int /*long*/ aDefaultExtension) {
++ public int GetDefaultExtension(long /*int*/ aDefaultExtension) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension);
+ }
+
+- public int SetDefaultExtension(int /*long*/ aDefaultExtension) {
++ public int SetDefaultExtension(long /*int*/ aDefaultExtension) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aDefaultExtension);
+ }
+
+@@ -92,27 +92,27 @@ public class nsIFilePicker_1_8 extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex);
+ }
+
+- public int GetDisplayDirectory(int /*long*/[] aDisplayDirectory) {
++ public int GetDisplayDirectory(long /*int*/[] aDisplayDirectory) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aDisplayDirectory);
+ }
+
+- public int SetDisplayDirectory(int /*long*/ aDisplayDirectory) {
++ public int SetDisplayDirectory(long /*int*/ aDisplayDirectory) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDisplayDirectory);
+ }
+
+- public int GetFile(int /*long*/[] aFile) {
++ public int GetFile(long /*int*/[] aFile) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aFile);
+ }
+
+- public int GetFileURL(int /*long*/[] aFileURL) {
++ public int GetFileURL(long /*int*/[] aFileURL) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aFileURL);
+ }
+
+- public int GetFiles(int /*long*/[] aFiles) {
++ public int GetFiles(long /*int*/[] aFiles) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aFiles);
+ }
+
+- public int Show(int /*long*/ _retval) {
++ public int Show(long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), _retval);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java b/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java
+index c003eb6..d1f6a36 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java
++++ b/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java
+@@ -37,27 +37,27 @@ public class nsIHelperAppLauncher extends nsISupports {
+ public static final nsID NS_IHELPERAPPLAUNCHER_IID =
+ new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
+
+- public nsIHelperAppLauncher(int /*long*/ address) {
++ public nsIHelperAppLauncher(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
++ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
+ }
+
+- public int GetSource(int /*long*/[] aSource) {
++ public int GetSource(long /*int*/[] aSource) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource);
+ }
+
+- public int GetSuggestedFileName(int /*long*/[] aSuggestedFileName) {
++ public int GetSuggestedFileName(long /*int*/[] aSuggestedFileName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
+ }
+
+- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
++ public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
+ }
+
+- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
++ public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
+ }
+
+@@ -65,7 +65,7 @@ public class nsIHelperAppLauncher extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
+ }
+
+- public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
++ public int SetWebProgressListener(long /*int*/ aWebProgressListener) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aWebProgressListener);
+ }
+
+@@ -73,7 +73,7 @@ public class nsIHelperAppLauncher extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
+ }
+
+- public int GetDownloadInfo(int /*long*/[] aSourceUrl, long[] aTimeDownloadStarted, int /*long*/[] _retval) {
++ public int GetDownloadInfo(long /*int*/[] aSourceUrl, long[] aTimeDownloadStarted, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSourceUrl, aTimeDownloadStarted, _retval);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java b/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java
+index 10ca834..16f86bb 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java
++++ b/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java
+@@ -37,19 +37,19 @@ public class nsIHelperAppLauncherDialog extends nsISupports {
+ public static final nsID NS_IHELPERAPPLAUNCHERDIALOG_IID =
+ new nsID(NS_IHELPERAPPLAUNCHERDIALOG_IID_STR);
+
+- public nsIHelperAppLauncherDialog(int /*long*/ address) {
++ public nsIHelperAppLauncherDialog(long /*int*/ address) {
+ super(address);
+ }
+
+- public int Show(int /*long*/ aLauncher, int /*long*/ aContext) {
++ public int Show(long /*int*/ aLauncher, long /*int*/ aContext) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLauncher, aContext);
+ }
+
+- public int PromptForSaveToFile(int /*long*/ aWindowContext, char[] aDefaultFile, char[] aSuggestedFileExtension, int /*long*/[] _retval) {
++ public int PromptForSaveToFile(long /*int*/ aWindowContext, char[] aDefaultFile, char[] aSuggestedFileExtension, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWindowContext, aDefaultFile, aSuggestedFileExtension, _retval);
+ }
+
+- public int ShowProgressDialog(int /*long*/ aLauncher, int /*long*/ aContext) {
++ public int ShowProgressDialog(long /*int*/ aLauncher, long /*int*/ aContext) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aLauncher, aContext);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java b/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java
+index c97f263..8a85ac2 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java
++++ b/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java
+@@ -37,7 +37,7 @@ public class nsIHelperAppLauncherDialog_1_9 extends nsISupports {
+ public static final nsID NS_IHELPERAPPLAUNCHERDIALOG_IID =
+ new nsID(NS_IHELPERAPPLAUNCHERDIALOG_IID_STR);
+
+- public nsIHelperAppLauncherDialog_1_9(int /*long*/ address) {
++ public nsIHelperAppLauncherDialog_1_9(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -47,11 +47,11 @@ public class nsIHelperAppLauncherDialog_1_9 extends nsISupports {
+
+ public static final int REASON_TYPESNIFFED = 2;
+
+- public int Show(int /*long*/ aLauncher, int /*long*/ aWindowContext, int aReason) {
++ public int Show(long /*int*/ aLauncher, long /*int*/ aWindowContext, int aReason) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLauncher, aWindowContext, aReason);
+ }
+
+- public int PromptForSaveToFile(int /*long*/ aLauncher, int /*long*/ aWindowContext, char[] aDefaultFileName, char[] aSuggestedFileExtension, int aForcePrompt, int /*long*/[] _retval) {
++ public int PromptForSaveToFile(long /*int*/ aLauncher, long /*int*/ aWindowContext, char[] aDefaultFileName, char[] aSuggestedFileExtension, int aForcePrompt, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aLauncher, aWindowContext, aDefaultFileName, aSuggestedFileExtension, aForcePrompt, _retval);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java b/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
+index 1aca93b..823e42a 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
++++ b/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
+@@ -37,31 +37,31 @@ public class nsIHelperAppLauncher_1_8 extends nsICancelable {
+ public static final nsID NS_IHELPERAPPLAUNCHER_IID =
+ new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
+
+- public nsIHelperAppLauncher_1_8(int /*long*/ address) {
++ public nsIHelperAppLauncher_1_8(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
++ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
+ }
+
+- public int GetSource(int /*long*/[] aSource) {
++ public int GetSource(long /*int*/[] aSource) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);
+ }
+
+- public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {
++ public int GetSuggestedFileName(long /*int*/ aSuggestedFileName) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
+ }
+
+- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
++ public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
+ }
+
+- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
++ public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
+ }
+
+- public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
++ public int SetWebProgressListener(long /*int*/ aWebProgressListener) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
+ }
+
+@@ -69,11 +69,11 @@ public class nsIHelperAppLauncher_1_8 extends nsICancelable {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
+ }
+
+- public int GetTargetFile(int /*long*/[] aTargetFile) {
++ public int GetTargetFile(long /*int*/[] aTargetFile) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
+ }
+
+- public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {
++ public int GetTimeDownloadStarted(long /*int*/ aTimeDownloadStarted) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTimeDownloadStarted);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java b/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
+index d277e75..bb3c6cf 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
++++ b/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
+@@ -37,31 +37,31 @@ public class nsIHelperAppLauncher_1_9 extends nsICancelable {
+ public static final nsID NS_IHELPERAPPLAUNCHER_IID =
+ new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
+
+- public nsIHelperAppLauncher_1_9(int /*long*/ address) {
++ public nsIHelperAppLauncher_1_9(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
++ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
+ }
+
+- public int GetSource(int /*long*/[] aSource) {
++ public int GetSource(long /*int*/[] aSource) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);
+ }
+
+- public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {
++ public int GetSuggestedFileName(long /*int*/ aSuggestedFileName) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
+ }
+
+- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
++ public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
+ }
+
+- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
++ public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
+ }
+
+- public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
++ public int SetWebProgressListener(long /*int*/ aWebProgressListener) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
+ }
+
+@@ -69,7 +69,7 @@ public class nsIHelperAppLauncher_1_9 extends nsICancelable {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
+ }
+
+- public int GetTargetFile(int /*long*/[] aTargetFile) {
++ public int GetTargetFile(long /*int*/[] aTargetFile) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
+ }
+
+@@ -77,7 +77,7 @@ public class nsIHelperAppLauncher_1_9 extends nsICancelable {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTargetFileIsExecutable);
+ }
+
+- public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {
++ public int GetTimeDownloadStarted(long /*int*/ aTimeDownloadStarted) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 10, getAddress(), aTimeDownloadStarted);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIIOService.java b/org/eclipse/swt/internal/mozilla/nsIIOService.java
+index a4b52e1..88caa1b 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIIOService.java
++++ b/org/eclipse/swt/internal/mozilla/nsIIOService.java
+@@ -37,11 +37,11 @@ public class nsIIOService extends nsISupports {
+ public static final nsID NS_IIOSERVICE_IID =
+ new nsID(NS_IIOSERVICE_IID_STR);
+
+- public nsIIOService(int /*long*/ address) {
++ public nsIIOService(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetProtocolHandler(byte[] aScheme, int /*long*/[] _retval) {
++ public int GetProtocolHandler(byte[] aScheme, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aScheme, _retval);
+ }
+
+@@ -49,19 +49,19 @@ public class nsIIOService extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aScheme, _retval);
+ }
+
+- public int NewURI(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) {
++ public int NewURI(long /*int*/ aSpec, byte[] aOriginCharset, long /*int*/ aBaseURI, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);
+ }
+
+- public int NewFileURI(int /*long*/ aFile, int /*long*/[] _retval) {
++ public int NewFileURI(long /*int*/ aFile, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFile, _retval);
+ }
+
+- public int NewChannelFromURI(int /*long*/ aURI, int /*long*/[] _retval) {
++ public int NewChannelFromURI(long /*int*/ aURI, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aURI, _retval);
+ }
+
+- public int NewChannel(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) {
++ public int NewChannel(long /*int*/ aSpec, byte[] aOriginCharset, long /*int*/ aBaseURI, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);
+ }
+
+@@ -77,7 +77,7 @@ public class nsIIOService extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPort, aScheme, _retval);
+ }
+
+- public int ExtractScheme(int /*long*/ urlString, int /*long*/ _retval) {
++ public int ExtractScheme(long /*int*/ urlString, long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), urlString, _retval);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIInputStream.java b/org/eclipse/swt/internal/mozilla/nsIInputStream.java
+index 62959ad..15026fe 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIInputStream.java
++++ b/org/eclipse/swt/internal/mozilla/nsIInputStream.java
+@@ -37,7 +37,7 @@ public class nsIInputStream extends nsISupports {
+ public static final nsID NS_IINPUTSTREAM_IID =
+ new nsID(NS_IINPUTSTREAM_IID_STR);
+
+- public nsIInputStream(int /*long*/ address) {
++ public nsIInputStream(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -53,7 +53,7 @@ public class nsIInputStream extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aBuf, aCount, _retval);
+ }
+
+- public int ReadSegments(int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int[] _retval) {
++ public int ReadSegments(long /*int*/ aWriter, long /*int*/ aClosure, int aCount, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aWriter, aClosure, aCount, _retval);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java b/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java
+index 16af6e2..d69ecf0 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java
++++ b/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java
+@@ -37,11 +37,11 @@ public class nsIInterfaceRequestor extends nsISupports {
+ public static final nsID NS_IINTERFACEREQUESTOR_IID =
+ new nsID(NS_IINTERFACEREQUESTOR_IID_STR);
+
+- public nsIInterfaceRequestor(int /*long*/ address) {
++ public nsIInterfaceRequestor(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetInterface(nsID uuid, int /*long*/[] result) {
++ public int GetInterface(nsID uuid, long /*int*/[] result) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uuid, result);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java b/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java
+index 5dbedbe..ea54083 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java
++++ b/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java
+@@ -37,7 +37,7 @@ public class nsIJSContextStack extends nsISupports {
+ public static final nsID NS_IJSCONTEXTSTACK_IID =
+ new nsID(NS_IJSCONTEXTSTACK_IID_STR);
+
+- public nsIJSContextStack(int /*long*/ address) {
++ public nsIJSContextStack(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -45,15 +45,15 @@ public class nsIJSContextStack extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCount);
+ }
+
+- public int Peek(int /*long*/[] _retval) {
++ public int Peek(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
+ }
+
+- public int Pop(int /*long*/[] _retval) {
++ public int Pop(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
+ }
+
+- public int Push(int /*long*/ cx) {
++ public int Push(long /*int*/ cx) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), cx);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsILocalFile.java b/org/eclipse/swt/internal/mozilla/nsILocalFile.java
+index 772bec8..b3c75d9 100644
+--- a/org/eclipse/swt/internal/mozilla/nsILocalFile.java
++++ b/org/eclipse/swt/internal/mozilla/nsILocalFile.java
+@@ -37,19 +37,19 @@ public class nsILocalFile extends nsIFile {
+ public static final nsID NS_ILOCALFILE_IID =
+ new nsID(NS_ILOCALFILE_IID_STR);
+
+- public nsILocalFile(int /*long*/ address) {
++ public nsILocalFile(long /*int*/ address) {
+ super(address);
+ }
+
+- public int InitWithPath(int /*long*/ filePath) {
++ public int InitWithPath(long /*int*/ filePath) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 1, getAddress(), filePath);
+ }
+
+- public int InitWithNativePath(int /*long*/ filePath) {
++ public int InitWithNativePath(long /*int*/ filePath) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 2, getAddress(), filePath);
+ }
+
+- public int InitWithFile(int /*long*/ aFile) {
++ public int InitWithFile(long /*int*/ aFile) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 3, getAddress(), aFile);
+ }
+
+@@ -61,15 +61,15 @@ public class nsILocalFile extends nsIFile {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 5, getAddress(), aFollowLinks);
+ }
+
+- public int OpenNSPRFileDesc(int flags, int mode, int /*long*/[] _retval) {
++ public int OpenNSPRFileDesc(int flags, int mode, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 6, getAddress(), flags, mode, _retval);
+ }
+
+- public int OpenANSIFileDesc(byte[] mode, int /*long*/[] _retval) {
++ public int OpenANSIFileDesc(byte[] mode, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 7, getAddress(), mode, _retval);
+ }
+
+- public int Load(int /*long*/[] _retval) {
++ public int Load(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 8, getAddress(), _retval);
+ }
+
+@@ -77,19 +77,19 @@ public class nsILocalFile extends nsIFile {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 9, getAddress(), aDiskSpaceAvailable);
+ }
+
+- public int AppendRelativePath(int /*long*/ relativeFilePath) {
++ public int AppendRelativePath(long /*int*/ relativeFilePath) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 10, getAddress(), relativeFilePath);
+ }
+
+- public int AppendRelativeNativePath(int /*long*/ relativeFilePath) {
++ public int AppendRelativeNativePath(long /*int*/ relativeFilePath) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 11, getAddress(), relativeFilePath);
+ }
+
+- public int GetPersistentDescriptor(int /*long*/ aPersistentDescriptor) {
++ public int GetPersistentDescriptor(long /*int*/ aPersistentDescriptor) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 12, getAddress(), aPersistentDescriptor);
+ }
+
+- public int SetPersistentDescriptor(int /*long*/ aPersistentDescriptor) {
++ public int SetPersistentDescriptor(long /*int*/ aPersistentDescriptor) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 13, getAddress(), aPersistentDescriptor);
+ }
+
+@@ -101,11 +101,11 @@ public class nsILocalFile extends nsIFile {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 15, getAddress());
+ }
+
+- public int GetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ _retval) {
++ public int GetRelativeDescriptor(long /*int*/ fromFile, long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 16, getAddress(), fromFile, _retval);
+ }
+
+- public int SetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ relativeDesc) {
++ public int SetRelativeDescriptor(long /*int*/ fromFile, long /*int*/ relativeDesc) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 17, getAddress(), fromFile, relativeDesc);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIMemory.java b/org/eclipse/swt/internal/mozilla/nsIMemory.java
+index 641777e..6083add 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIMemory.java
++++ b/org/eclipse/swt/internal/mozilla/nsIMemory.java
+@@ -37,19 +37,19 @@ public class nsIMemory extends nsISupports {
+ public static final nsID NS_IMEMORY_IID =
+ new nsID(NS_IMEMORY_IID_STR);
+
+- public nsIMemory(int /*long*/ address) {
++ public nsIMemory(long /*int*/ address) {
+ super(address);
+ }
+
+- public int /*long*/ Alloc(int size) {
++ public long /*int*/ Alloc(int size) {
+ return XPCOM.nsIMemory_Alloc(getAddress(), size);
+ }
+
+- public int /*long*/ Realloc(int /*long*/ ptr, int newSize) {
++ public long /*int*/ Realloc(long /*int*/ ptr, int newSize) {
+ return XPCOM.nsIMemory_Realloc(getAddress(), ptr, newSize);
+ }
+
+- public int Free(int /*long*/ ptr) {
++ public int Free(long /*int*/ ptr) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ptr);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsIObserverService.java b/org/eclipse/swt/internal/mozilla/nsIObserverService.java
+index 5b3775d..79c03e8 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIObserverService.java
++++ b/org/eclipse/swt/internal/mozilla/nsIObserverService.java
+@@ -37,23 +37,23 @@ public class nsIObserverService extends nsISupports {
+ public static final nsID NS_IOBSERVERSERVICE_IID =
+ new nsID(NS_IOBSERVERSERVICE_IID_STR);
+
+- public nsIObserverService(int /*long*/ address) {
++ public nsIObserverService(long /*int*/ address) {
+ super(address);
+ }
+
+- public int AddObserver(int /*long*/ anObserver, byte[] aTopic, int ownsWeak) {
++ public int AddObserver(long /*int*/ anObserver, byte[] aTopic, int ownsWeak) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), anObserver, aTopic, ownsWeak);
+ }
+
+- public int RemoveObserver(int /*long*/ anObserver, byte[] aTopic) {
++ public int RemoveObserver(long /*int*/ anObserver, byte[] aTopic) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), anObserver, aTopic);
+ }
+
+- public int NotifyObservers(int /*long*/ aSubject, byte[] aTopic, char[] someData) {
++ public int NotifyObservers(long /*int*/ aSubject, byte[] aTopic, char[] someData) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSubject, aTopic, someData);
+ }
+
+- public int EnumerateObservers(byte[] aTopic, int /*long*/[] _retval) {
++ public int EnumerateObservers(byte[] aTopic, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aTopic, _retval);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java b/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
+index 63ed2a3..fc9f825 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
++++ b/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
+@@ -37,7 +37,7 @@ public class nsIPrefBranch extends nsISupports {
+ public static final nsID NS_IPREFBRANCH_IID =
+ new nsID(NS_IPREFBRANCH_IID_STR);
+
+- public nsIPrefBranch(int /*long*/ address) {
++ public nsIPrefBranch(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -49,7 +49,7 @@ public class nsIPrefBranch extends nsISupports {
+
+ public static final int PREF_BOOL = 128;
+
+- public int GetRoot(int /*long*/[] aRoot) {
++ public int GetRoot(long /*int*/[] aRoot) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aRoot);
+ }
+
+@@ -65,7 +65,7 @@ public class nsIPrefBranch extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPrefName, aValue);
+ }
+
+- public int GetCharPref(byte[] aPrefName, int /*long*/[] _retval) {
++ public int GetCharPref(byte[] aPrefName, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPrefName, _retval);
+ }
+
+@@ -81,11 +81,11 @@ public class nsIPrefBranch extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPrefName, aValue);
+ }
+
+- public int GetComplexValue(byte[] aPrefName, nsID aType, int /*long*/[] aValue) {
++ public int GetComplexValue(byte[] aPrefName, nsID aType, long /*int*/[] aValue) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPrefName, aType, aValue);
+ }
+
+- public int SetComplexValue(byte[] aPrefName, nsID aType, int /*long*/ aValue) {
++ public int SetComplexValue(byte[] aPrefName, nsID aType, long /*int*/ aValue) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPrefName, aType, aValue);
+ }
+
+@@ -113,7 +113,7 @@ public class nsIPrefBranch extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aStartingAt);
+ }
+
+- public int GetChildList(byte[] aStartingAt, int[] aCount, int /*long*/[] aChildArray) {
++ public int GetChildList(byte[] aStartingAt, int[] aCount, long /*int*/[] aChildArray) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aStartingAt, aCount, aChildArray);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java b/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java
+index ba0c32a..85ce219 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java
++++ b/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java
+@@ -37,11 +37,11 @@ public class nsIPrefLocalizedString extends nsISupports {
+ public static final nsID NS_IPREFLOCALIZEDSTRING_IID =
+ new nsID(NS_IPREFLOCALIZEDSTRING_IID_STR);
+
+- public nsIPrefLocalizedString(int /*long*/ address) {
++ public nsIPrefLocalizedString(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetData(int /*long*/[] aData) {
++ public int GetData(long /*int*/[] aData) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aData);
+ }
+
+@@ -49,7 +49,7 @@ public class nsIPrefLocalizedString extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData);
+ }
+
+- public int ToString(int /*long*/[] _retval) {
++ public int ToString(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsIPrefService.java b/org/eclipse/swt/internal/mozilla/nsIPrefService.java
+index b3fc9fb..76459a0 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIPrefService.java
++++ b/org/eclipse/swt/internal/mozilla/nsIPrefService.java
+@@ -37,11 +37,11 @@ public class nsIPrefService extends nsISupports {
+ public static final nsID NS_IPREFSERVICE_IID =
+ new nsID(NS_IPREFSERVICE_IID_STR);
+
+- public nsIPrefService(int /*long*/ address) {
++ public nsIPrefService(long /*int*/ address) {
+ super(address);
+ }
+
+- public int ReadUserPrefs(int /*long*/ aFile) {
++ public int ReadUserPrefs(long /*int*/ aFile) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aFile);
+ }
+
+@@ -53,15 +53,15 @@ public class nsIPrefService extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
+ }
+
+- public int SavePrefFile(int /*long*/ aFile) {
++ public int SavePrefFile(long /*int*/ aFile) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFile);
+ }
+
+- public int GetBranch(byte[] aPrefRoot, int /*long*/[] _retval) {
++ public int GetBranch(byte[] aPrefRoot, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPrefRoot, _retval);
+ }
+
+- public int GetDefaultBranch(byte[] aPrefRoot, int /*long*/[] _retval) {
++ public int GetDefaultBranch(byte[] aPrefRoot, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aPrefRoot, _retval);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIPrincipal.java b/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
+index d8c3419..e7d3290 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
++++ b/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
+@@ -37,7 +37,7 @@ public class nsIPrincipal extends nsISerializable {
+ public static final nsID NS_IPRINCIPAL_IID =
+ new nsID(NS_IPRINCIPAL_IID_STR);
+
+- public nsIPrincipal(int /*long*/ address) {
++ public nsIPrincipal(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -49,11 +49,11 @@ public class nsIPrincipal extends nsISerializable {
+
+ public static final int ENABLE_GRANTED = 4;
+
+- public int GetPreferences(int /*long*/[] prefBranch, int /*long*/[] id, int /*long*/[] subjectName, int /*long*/[] grantedList, int /*long*/[] deniedList, int[] isTrusted) {
++ public int GetPreferences(long /*int*/[] prefBranch, long /*int*/[] id, long /*int*/[] subjectName, long /*int*/[] grantedList, long /*int*/[] deniedList, int[] isTrusted) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 1, getAddress(), prefBranch, id, subjectName, grantedList, deniedList, isTrusted);
+ }
+
+- public int Equals(int /*long*/ other, int[] _retval) {
++ public int Equals(long /*int*/ other, int[] _retval) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 2, getAddress(), other, _retval);
+ }
+
+@@ -61,19 +61,19 @@ public class nsIPrincipal extends nsISerializable {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 3, getAddress(), aHashValue);
+ }
+
+- public int GetJSPrincipals(int /*long*/ cx, int /*long*/[] _retval) {
++ public int GetJSPrincipals(long /*int*/ cx, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 4, getAddress(), cx, _retval);
+ }
+
+- public int GetSecurityPolicy(int /*long*/[] aSecurityPolicy) {
++ public int GetSecurityPolicy(long /*int*/[] aSecurityPolicy) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 5, getAddress(), aSecurityPolicy);
+ }
+
+- public int SetSecurityPolicy(int /*long*/ aSecurityPolicy) {
++ public int SetSecurityPolicy(long /*int*/ aSecurityPolicy) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 6, getAddress(), aSecurityPolicy);
+ }
+
+- public int CanEnableCapability(byte[] capability, int /*long*/ _retval) {
++ public int CanEnableCapability(byte[] capability, long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 7, getAddress(), capability, _retval);
+ }
+
+@@ -81,35 +81,35 @@ public class nsIPrincipal extends nsISerializable {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 8, getAddress(), capability, canEnable);
+ }
+
+- public int IsCapabilityEnabled(byte[] capability, int /*long*/ annotation, int[] _retval) {
++ public int IsCapabilityEnabled(byte[] capability, long /*int*/ annotation, int[] _retval) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 9, getAddress(), capability, annotation, _retval);
+ }
+
+- public int EnableCapability(byte[] capability, int /*long*/[] annotation) {
++ public int EnableCapability(byte[] capability, long /*int*/[] annotation) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 10, getAddress(), capability, annotation);
+ }
+
+- public int RevertCapability(byte[] capability, int /*long*/[] annotation) {
++ public int RevertCapability(byte[] capability, long /*int*/[] annotation) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 11, getAddress(), capability, annotation);
+ }
+
+- public int DisableCapability(byte[] capability, int /*long*/[] annotation) {
++ public int DisableCapability(byte[] capability, long /*int*/[] annotation) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 12, getAddress(), capability, annotation);
+ }
+
+- public int GetURI(int /*long*/[] aURI) {
++ public int GetURI(long /*int*/[] aURI) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 13, getAddress(), aURI);
+ }
+
+- public int GetDomain(int /*long*/[] aDomain) {
++ public int GetDomain(long /*int*/[] aDomain) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 14, getAddress(), aDomain);
+ }
+
+- public int SetDomain(int /*long*/ aDomain) {
++ public int SetDomain(long /*int*/ aDomain) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 15, getAddress(), aDomain);
+ }
+
+- public int GetOrigin(int /*long*/[] aOrigin) {
++ public int GetOrigin(long /*int*/[] aOrigin) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 16, getAddress(), aOrigin);
+ }
+
+@@ -117,27 +117,27 @@ public class nsIPrincipal extends nsISerializable {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 17, getAddress(), aHasCertificate);
+ }
+
+- public int GetFingerprint(int /*long*/ aFingerprint) {
++ public int GetFingerprint(long /*int*/ aFingerprint) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 18, getAddress(), aFingerprint);
+ }
+
+- public int GetPrettyName(int /*long*/ aPrettyName) {
++ public int GetPrettyName(long /*int*/ aPrettyName) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 19, getAddress(), aPrettyName);
+ }
+
+- public int Subsumes(int /*long*/ other, int[] _retval) {
++ public int Subsumes(long /*int*/ other, int[] _retval) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 20, getAddress(), other, _retval);
+ }
+
+- public int CheckMayLoad(int /*long*/ uri, int report) {
++ public int CheckMayLoad(long /*int*/ uri, int report) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 21, getAddress(), uri, report);
+ }
+
+- public int GetSubjectName(int /*long*/ aSubjectName) {
++ public int GetSubjectName(long /*int*/ aSubjectName) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 22, getAddress(), aSubjectName);
+ }
+
+- public int GetCertificate(int /*long*/[] aCertificate) {
++ public int GetCertificate(long /*int*/[] aCertificate) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 23, getAddress(), aCertificate);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java b/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
+index 2cc99e4..1170dc5 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
++++ b/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
+@@ -37,11 +37,11 @@ public class nsIProgressDialog extends nsIDownload {
+ public static final nsID NS_IPROGRESSDIALOG_IID =
+ new nsID(NS_IPROGRESSDIALOG_IID_STR);
+
+- public nsIProgressDialog(int /*long*/ address) {
++ public nsIProgressDialog(long /*int*/ address) {
+ super(address);
+ }
+
+- public int Open(int /*long*/ aParent) {
++ public int Open(long /*int*/ aParent) {
+ return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 1, getAddress(), aParent);
+ }
+
+@@ -53,11 +53,11 @@ public class nsIProgressDialog extends nsIDownload {
+ return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
+ }
+
+- public int GetDialog(int /*long*/[] aDialog) {
++ public int GetDialog(long /*int*/[] aDialog) {
+ return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 4, getAddress(), aDialog);
+ }
+
+- public int SetDialog(int /*long*/ aDialog) {
++ public int SetDialog(long /*int*/ aDialog) {
+ return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 5, getAddress(), aDialog);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java b/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
+index 13c38f7..f3be58f 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
++++ b/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
+@@ -37,11 +37,11 @@ public class nsIProgressDialog_1_8 extends nsIDownload_1_8 {
+ public static final nsID NS_IPROGRESSDIALOG_IID =
+ new nsID(NS_IPROGRESSDIALOG_IID_STR);
+
+- public nsIProgressDialog_1_8(int /*long*/ address) {
++ public nsIProgressDialog_1_8(long /*int*/ address) {
+ super(address);
+ }
+
+- public int Open(int /*long*/ aParent) {
++ public int Open(long /*int*/ aParent) {
+ return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 1, getAddress(), aParent);
+ }
+
+@@ -53,19 +53,19 @@ public class nsIProgressDialog_1_8 extends nsIDownload_1_8 {
+ return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
+ }
+
+- public int GetObserver(int /*long*/[] aObserver) {
++ public int GetObserver(long /*int*/[] aObserver) {
+ return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 4, getAddress(), aObserver);
+ }
+
+- public int SetObserver(int /*long*/ aObserver) {
++ public int SetObserver(long /*int*/ aObserver) {
+ return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 5, getAddress(), aObserver);
+ }
+
+- public int GetDialog(int /*long*/[] aDialog) {
++ public int GetDialog(long /*int*/[] aDialog) {
+ return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 6, getAddress(), aDialog);
+ }
+
+- public int SetDialog(int /*long*/ aDialog) {
++ public int SetDialog(long /*int*/ aDialog) {
+ return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 7, getAddress(), aDialog);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIPromptService.java b/org/eclipse/swt/internal/mozilla/nsIPromptService.java
+index 92577e4..9219b41 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIPromptService.java
++++ b/org/eclipse/swt/internal/mozilla/nsIPromptService.java
+@@ -37,23 +37,23 @@ public class nsIPromptService extends nsISupports {
+ public static final nsID NS_IPROMPTSERVICE_IID =
+ new nsID(NS_IPROMPTSERVICE_IID_STR);
+
+- public nsIPromptService(int /*long*/ address) {
++ public nsIPromptService(long /*int*/ address) {
+ super(address);
+ }
+
+- public int Alert(int /*long*/ aParent, char[] aDialogTitle, char[] aText) {
++ public int Alert(long /*int*/ aParent, char[] aDialogTitle, char[] aText) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aDialogTitle, aText);
+ }
+
+- public int AlertCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) {
++ public int AlertCheck(long /*int*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState);
+ }
+
+- public int Confirm(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) {
++ public int Confirm(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aParent, aDialogTitle, aText, _retval);
+ }
+
+- public int ConfirmCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
++ public int ConfirmCheck(long /*int*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState, _retval);
+ }
+
+@@ -91,23 +91,23 @@ public class nsIPromptService extends nsISupports {
+
+ public static final int STD_YES_NO_BUTTONS = 1027;
+
+- public int ConfirmEx(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
++ public int ConfirmEx(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, aDialogTitle, aText, aButtonFlags, aButton0Title, aButton1Title, aButton2Title, aCheckMsg, aCheckState, _retval);
+ }
+
+- public int Prompt(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
++ public int Prompt(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, aDialogTitle, aText, aValue, aCheckMsg, aCheckState, _retval);
+ }
+
+- public int PromptUsernameAndPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aUsername, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
++ public int PromptUsernameAndPassword(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aUsername, long /*int*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParent, aDialogTitle, aText, aUsername, aPassword, aCheckMsg, aCheckState, _retval);
+ }
+
+- public int PromptPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
++ public int PromptPassword(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParent, aDialogTitle, aText, aPassword, aCheckMsg, aCheckState, _retval);
+ }
+
+- public int Select(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aCount, int /*long*/[] aSelectList, int[] aOutSelection, int[] _retval) {
++ public int Select(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int aCount, long /*int*/[] aSelectList, int[] aOutSelection, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aParent, aDialogTitle, aText, aCount, aSelectList, aOutSelection, _retval);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIPromptService2.java b/org/eclipse/swt/internal/mozilla/nsIPromptService2.java
+index fec6bc5..5d0207f 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIPromptService2.java
++++ b/org/eclipse/swt/internal/mozilla/nsIPromptService2.java
+@@ -37,15 +37,15 @@ public class nsIPromptService2 extends nsIPromptService {
+ public static final nsID NS_IPROMPTSERVICE2_IID =
+ new nsID(NS_IPROMPTSERVICE2_IID_STR);
+
+- public nsIPromptService2(int /*long*/ address) {
++ public nsIPromptService2(long /*int*/ address) {
+ super(address);
+ }
+
+- public int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {
++ public int PromptAuth(long /*int*/ aParent, long /*int*/ aChannel, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {
+ return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 1, getAddress(), aParent, aChannel, level, authInfo, checkboxLabel, checkValue, _retval);
+ }
+
+- public int AsyncPromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int /*long*/ aCallback, int /*long*/ aContext, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int /*long*/[] _retval) {
++ public int AsyncPromptAuth(long /*int*/ aParent, long /*int*/ aChannel, long /*int*/ aCallback, long /*int*/ aContext, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 2, getAddress(), aParent, aChannel, aCallback, aContext, level, authInfo, checkboxLabel, checkValue, _retval);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIProperties.java b/org/eclipse/swt/internal/mozilla/nsIProperties.java
+index 6311098..bd27675 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIProperties.java
++++ b/org/eclipse/swt/internal/mozilla/nsIProperties.java
+@@ -37,15 +37,15 @@ public class nsIProperties extends nsISupports {
+ public static final nsID NS_IPROPERTIES_IID =
+ new nsID(NS_IPROPERTIES_IID_STR);
+
+- public nsIProperties(int /*long*/ address) {
++ public nsIProperties(long /*int*/ address) {
+ super(address);
+ }
+
+- public int Get(byte[] prop, nsID iid, int /*long*/[] result) {
++ public int Get(byte[] prop, nsID iid, long /*int*/[] result) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, iid, result);
+ }
+
+- public int Set(byte[] prop, int /*long*/ value) {
++ public int Set(byte[] prop, long /*int*/ value) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prop, value);
+ }
+
+@@ -57,7 +57,7 @@ public class nsIProperties extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), prop);
+ }
+
+- public int GetKeys(int[] count, int /*long*/[] keys) {
++ public int GetKeys(int[] count, long /*int*/[] keys) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), count, keys);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIRequest.java b/org/eclipse/swt/internal/mozilla/nsIRequest.java
+index 909ad0d..3241a28 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIRequest.java
++++ b/org/eclipse/swt/internal/mozilla/nsIRequest.java
+@@ -37,11 +37,11 @@ public class nsIRequest extends nsISupports {
+ public static final nsID NS_IREQUEST_IID =
+ new nsID(NS_IREQUEST_IID_STR);
+
+- public nsIRequest(int /*long*/ address) {
++ public nsIRequest(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetName(int /*long*/ aName) {
++ public int GetName(long /*int*/ aName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);
+ }
+
+@@ -49,7 +49,7 @@ public class nsIRequest extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
+ }
+
+- public int GetStatus(int /*long*/[] aStatus) {
++ public int GetStatus(long /*int*/[] aStatus) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aStatus);
+ }
+
+@@ -65,15 +65,15 @@ public class nsIRequest extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
+ }
+
+- public int GetLoadGroup(int /*long*/[] aLoadGroup) {
++ public int GetLoadGroup(long /*int*/[] aLoadGroup) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aLoadGroup);
+ }
+
+- public int SetLoadGroup(int /*long*/ aLoadGroup) {
++ public int SetLoadGroup(long /*int*/ aLoadGroup) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aLoadGroup);
+ }
+
+- public int GetLoadFlags(int /*long*/[] aLoadFlags) {
++ public int GetLoadFlags(long /*int*/[] aLoadFlags) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aLoadFlags);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsISSLStatus.java b/org/eclipse/swt/internal/mozilla/nsISSLStatus.java
+index 2754d62..aaec144 100644
+--- a/org/eclipse/swt/internal/mozilla/nsISSLStatus.java
++++ b/org/eclipse/swt/internal/mozilla/nsISSLStatus.java
+@@ -37,15 +37,15 @@ public class nsISSLStatus extends nsISupports {
+ public static final nsID NS_ISSLSTATUS_IID =
+ new nsID(NS_ISSLSTATUS_IID_STR);
+
+- public nsISSLStatus(int /*long*/ address) {
++ public nsISSLStatus(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetServerCert(int /*long*/[] aServerCert) {
++ public int GetServerCert(long /*int*/[] aServerCert) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aServerCert);
+ }
+
+- public int GetCipherName(int /*long*/[] aCipherName) {
++ public int GetCipherName(long /*int*/[] aCipherName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCipherName);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java b/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java
+index b2b7de8..f9f03c5 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java
++++ b/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java
+@@ -37,19 +37,19 @@ public class nsIScriptSecurityManager_1_9 extends nsIXPCSecurityManager {
+ public static final nsID NS_ISCRIPTSECURITYMANAGER_IID =
+ new nsID(NS_ISCRIPTSECURITYMANAGER_IID_STR);
+
+- public nsIScriptSecurityManager_1_9(int /*long*/ address) {
++ public nsIScriptSecurityManager_1_9(long /*int*/ address) {
+ super(address);
+ }
+
+-// public int CheckPropertyAccess(int /*long*/ aJSContext, int /*long*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE <jsval >! aProperty, int aAction) {
++// public int CheckPropertyAccess(long /*int*/ aJSContext, long /*int*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE <jsval >! aProperty, int aAction) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 1, getAddress(), aJSContext, aJSObject, aClassName, aProperty, aAction);
+ // }
+
+-// public int CheckConnect(int /*long*/ aJSContext, int /*long*/ aTargetURI, byte[] aClassName, byte[] aProperty) {
++// public int CheckConnect(long /*int*/ aJSContext, long /*int*/ aTargetURI, byte[] aClassName, byte[] aProperty) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 2, getAddress(), aJSContext, aTargetURI, aClassName, aProperty);
+ // }
+
+- public int CheckLoadURIFromScript(int /*long*/ cx, int /*long*/ uri) {
++ public int CheckLoadURIFromScript(long /*int*/ cx, long /*int*/ uri) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 3, getAddress(), cx, uri);
+ }
+
+@@ -65,47 +65,47 @@ public class nsIScriptSecurityManager_1_9 extends nsIXPCSecurityManager {
+
+ public static final int DISALLOW_SCRIPT = 8;
+
+- public int CheckLoadURIWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
++ public int CheckLoadURIWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 4, getAddress(), aPrincipal, uri, flags);
+ }
+
+- public int CheckLoadURI(int /*long*/ from, int /*long*/ uri, int flags) {
++ public int CheckLoadURI(long /*int*/ from, long /*int*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 5, getAddress(), from, uri, flags);
+ }
+
+- public int CheckLoadURIStrWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
++ public int CheckLoadURIStrWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 6, getAddress(), aPrincipal, uri, flags);
+ }
+
+- public int CheckLoadURIStr(int /*long*/ from, int /*long*/ uri, int flags) {
++ public int CheckLoadURIStr(long /*int*/ from, long /*int*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 7, getAddress(), from, uri, flags);
+ }
+
+- public int CheckFunctionAccess(int /*long*/ cx, int /*long*/ funObj, int /*long*/ targetObj) {
++ public int CheckFunctionAccess(long /*int*/ cx, long /*int*/ funObj, long /*int*/ targetObj) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 8, getAddress(), cx, funObj, targetObj);
+ }
+
+- public int CanExecuteScripts(int /*long*/ cx, int /*long*/ principal, int[] _retval) {
++ public int CanExecuteScripts(long /*int*/ cx, long /*int*/ principal, int[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 9, getAddress(), cx, principal, _retval);
+ }
+
+- public int GetSubjectPrincipal(int /*long*/[] _retval) {
++ public int GetSubjectPrincipal(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 10, getAddress(), _retval);
+ }
+
+- public int GetSystemPrincipal(int /*long*/[] _retval) {
++ public int GetSystemPrincipal(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 11, getAddress(), _retval);
+ }
+
+-// public int GetCertificatePrincipal(int /*long*/ aCertFingerprint, int /*long*/ aSubjectName, int /*long*/ aPrettyName, int /*long*/ aCert, int /*long*/ aURI, int /*long*/[] _retval) {
++// public int GetCertificatePrincipal(long /*int*/ aCertFingerprint, long /*int*/ aSubjectName, long /*int*/ aPrettyName, long /*int*/ aCert, long /*int*/ aURI, long /*int*/[] _retval) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 12, getAddress(), aCertFingerprint, aSubjectName, aPrettyName, aCert, aURI, _retval);
+ // }
+
+- public int GetCodebasePrincipal(int /*long*/ aURI, int /*long*/[] _retval) {
++ public int GetCodebasePrincipal(long /*int*/ aURI, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 13, getAddress(), aURI, _retval);
+ }
+
+-// public int RequestCapability(int /*long*/ principal, byte[] capability, int /*long*/ _retval) {
++// public int RequestCapability(long /*int*/ principal, byte[] capability, long /*int*/ _retval) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 14, getAddress(), principal, capability, _retval);
+ // }
+
+@@ -125,11 +125,11 @@ public class nsIScriptSecurityManager_1_9 extends nsIXPCSecurityManager {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 18, getAddress(), capability);
+ }
+
+-// public int SetCanEnableCapability(int /*long*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {
++// public int SetCanEnableCapability(long /*int*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 19, getAddress(), certificateFingerprint, capability, canEnable);
+ // }
+
+- public int GetObjectPrincipal(int /*long*/ cx, int /*long*/ obj, int /*long*/[] _retval) {
++ public int GetObjectPrincipal(long /*int*/ cx, long /*int*/ obj, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 20, getAddress(), cx, obj, _retval);
+ }
+
+@@ -137,23 +137,23 @@ public class nsIScriptSecurityManager_1_9 extends nsIXPCSecurityManager {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 21, getAddress(), _retval);
+ }
+
+- public int CheckSameOrigin(int /*long*/ aJSContext, int /*long*/ aTargetURI) {
++ public int CheckSameOrigin(long /*int*/ aJSContext, long /*int*/ aTargetURI) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 22, getAddress(), aJSContext, aTargetURI);
+ }
+
+- public int CheckSameOriginURI(int /*long*/ aSourceURI, int /*long*/ aTargetURI, int reportError) {
++ public int CheckSameOriginURI(long /*int*/ aSourceURI, long /*int*/ aTargetURI, int reportError) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 23, getAddress(), aSourceURI, aTargetURI, reportError);
+ }
+
+- public int GetPrincipalFromContext(int /*long*/ cx, int /*long*/[] _retval) {
++ public int GetPrincipalFromContext(long /*int*/ cx, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 24, getAddress(), cx, _retval);
+ }
+
+- public int GetChannelPrincipal(int /*long*/ aChannel, int /*long*/[] _retval) {
++ public int GetChannelPrincipal(long /*int*/ aChannel, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 25, getAddress(), aChannel, _retval);
+ }
+
+- public int IsSystemPrincipal(int /*long*/ aPrincipal, int[] _retval) {
++ public int IsSystemPrincipal(long /*int*/ aPrincipal, int[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 26, getAddress(), aPrincipal, _retval);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java b/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java
+index 25ae481..7cd414b 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java
++++ b/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java
+@@ -37,19 +37,19 @@ public class nsIScriptSecurityManager_1_9_1 extends nsIXPCSecurityManager {
+ public static final nsID NS_ISCRIPTSECURITYMANAGER_IID =
+ new nsID(NS_ISCRIPTSECURITYMANAGER_IID_STR);
+
+- public nsIScriptSecurityManager_1_9_1(int /*long*/ address) {
++ public nsIScriptSecurityManager_1_9_1(long /*int*/ address) {
+ super(address);
+ }
+
+-// public int CheckPropertyAccess(int /*long*/ aJSContext, int /*long*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE <jsval >! aProperty, int aAction) {
++// public int CheckPropertyAccess(long /*int*/ aJSContext, long /*int*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE <jsval >! aProperty, int aAction) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 1, getAddress(), aJSContext, aJSObject, aClassName, aProperty, aAction);
+ // }
+
+- public int CheckConnect(int /*long*/ aJSContext, int /*long*/ aTargetURI, byte[] aClassName, byte[] aProperty) {
++ public int CheckConnect(long /*int*/ aJSContext, long /*int*/ aTargetURI, byte[] aClassName, byte[] aProperty) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 2, getAddress(), aJSContext, aTargetURI, aClassName, aProperty);
+ }
+
+- public int CheckLoadURIFromScript(int /*long*/ cx, int /*long*/ uri) {
++ public int CheckLoadURIFromScript(long /*int*/ cx, long /*int*/ uri) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 3, getAddress(), cx, uri);
+ }
+
+@@ -65,47 +65,47 @@ public class nsIScriptSecurityManager_1_9_1 extends nsIXPCSecurityManager {
+
+ public static final int DISALLOW_SCRIPT = 8;
+
+- public int CheckLoadURIWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
++ public int CheckLoadURIWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 4, getAddress(), aPrincipal, uri, flags);
+ }
+
+- public int CheckLoadURI(int /*long*/ from, int /*long*/ uri, int flags) {
++ public int CheckLoadURI(long /*int*/ from, long /*int*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 5, getAddress(), from, uri, flags);
+ }
+
+- public int CheckLoadURIStrWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
++ public int CheckLoadURIStrWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 6, getAddress(), aPrincipal, uri, flags);
+ }
+
+- public int CheckLoadURIStr(int /*long*/ from, int /*long*/ uri, int flags) {
++ public int CheckLoadURIStr(long /*int*/ from, long /*int*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 7, getAddress(), from, uri, flags);
+ }
+
+- public int CheckFunctionAccess(int /*long*/ cx, int /*long*/ funObj, int /*long*/ targetObj) {
++ public int CheckFunctionAccess(long /*int*/ cx, long /*int*/ funObj, long /*int*/ targetObj) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 8, getAddress(), cx, funObj, targetObj);
+ }
+
+-// public int CanExecuteScripts(int /*long*/ cx, int /*long*/ principal, int[] _retval NS_OUTPARAM) {
++// public int CanExecuteScripts(long /*int*/ cx, long /*int*/ principal, int[] _retval NS_OUTPARAM) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 9, getAddress(), cx, principal, _retval NS_OUTPARAM);
+ // }
+
+-// public int GetSubjectPrincipal(int /*long*/[] _retval NS_OUTPARAM) {
++// public int GetSubjectPrincipal(long /*int*/[] _retval NS_OUTPARAM) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 10, getAddress(), _retval NS_OUTPARAM);
+ // }
+
+- public int GetSystemPrincipal(int /*long*/[] _retval) {
++ public int GetSystemPrincipal(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 11, getAddress(), _retval);
+ }
+
+-// public int GetCertificatePrincipal(int /*long*/ aCertFingerprint, int /*long*/ aSubjectName, int /*long*/ aPrettyName, int /*long*/ aCert, int /*long*/ aURI, int /*long*/[] _retval NS_OUTPARAM) {
++// public int GetCertificatePrincipal(long /*int*/ aCertFingerprint, long /*int*/ aSubjectName, long /*int*/ aPrettyName, long /*int*/ aCert, long /*int*/ aURI, long /*int*/[] _retval NS_OUTPARAM) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 12, getAddress(), aCertFingerprint, aSubjectName, aPrettyName, aCert, aURI, _retval NS_OUTPARAM);
+ // }
+
+-// public int GetCodebasePrincipal(int /*long*/ aURI, int /*long*/[] _retval NS_OUTPARAM) {
++// public int GetCodebasePrincipal(long /*int*/ aURI, long /*int*/[] _retval NS_OUTPARAM) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 13, getAddress(), aURI, _retval NS_OUTPARAM);
+ // }
+
+-// public int RequestCapability(int /*long*/ principal, byte[] capability, int /*long*/ _retval NS_OUTPARAM) {
++// public int RequestCapability(long /*int*/ principal, byte[] capability, long /*int*/ _retval NS_OUTPARAM) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 14, getAddress(), principal, capability, _retval NS_OUTPARAM);
+ // }
+
+@@ -125,11 +125,11 @@ public class nsIScriptSecurityManager_1_9_1 extends nsIXPCSecurityManager {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 18, getAddress(), capability);
+ }
+
+-// public int SetCanEnableCapability(int /*long*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {
++// public int SetCanEnableCapability(long /*int*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 19, getAddress(), certificateFingerprint, capability, canEnable);
+ // }
+
+-// public int GetObjectPrincipal(int /*long*/ cx, int /*long*/ obj, int /*long*/[] _retval NS_OUTPARAM) {
++// public int GetObjectPrincipal(long /*int*/ cx, long /*int*/ obj, long /*int*/[] _retval NS_OUTPARAM) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 20, getAddress(), cx, obj, _retval NS_OUTPARAM);
+ // }
+
+@@ -137,23 +137,23 @@ public class nsIScriptSecurityManager_1_9_1 extends nsIXPCSecurityManager {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 21, getAddress(), _retval NS_OUTPARAM);
+ // }
+
+- public int CheckSameOrigin(int /*long*/ aJSContext, int /*long*/ aTargetURI) {
++ public int CheckSameOrigin(long /*int*/ aJSContext, long /*int*/ aTargetURI) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 22, getAddress(), aJSContext, aTargetURI);
+ }
+
+- public int CheckSameOriginURI(int /*long*/ aSourceURI, int /*long*/ aTargetURI, int reportError) {
++ public int CheckSameOriginURI(long /*int*/ aSourceURI, long /*int*/ aTargetURI, int reportError) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 23, getAddress(), aSourceURI, aTargetURI, reportError);
+ }
+
+-// public int GetPrincipalFromContext(int /*long*/ cx, int /*long*/[] _retval NS_OUTPARAM) {
++// public int GetPrincipalFromContext(long /*int*/ cx, long /*int*/[] _retval NS_OUTPARAM) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 24, getAddress(), cx, _retval NS_OUTPARAM);
+ // }
+
+-// public int GetChannelPrincipal(int /*long*/ aChannel, int /*long*/[] _retval NS_OUTPARAM) {
++// public int GetChannelPrincipal(long /*int*/ aChannel, long /*int*/[] _retval NS_OUTPARAM) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 25, getAddress(), aChannel, _retval NS_OUTPARAM);
+ // }
+
+-// public int IsSystemPrincipal(int /*long*/ aPrincipal, int[] _retval NS_OUTPARAM) {
++// public int IsSystemPrincipal(long /*int*/ aPrincipal, int[] _retval NS_OUTPARAM) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 26, getAddress(), aPrincipal, _retval NS_OUTPARAM);
+ // }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java b/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java
+index bc58ffa..d8349d5 100644
+--- a/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java
++++ b/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java
+@@ -11,23 +11,23 @@ public class nsISecurityCheckedComponent extends nsISupports {
+ public static final nsID NS_ISECURITYCHECKEDCOMPONENT_IID =
+ new nsID(NS_ISECURITYCHECKEDCOMPONENT_IID_STR);
+
+- public nsISecurityCheckedComponent(int /*long*/ address) {
++ public nsISecurityCheckedComponent(long /*int*/ address) {
+ super(address);
+ }
+
+- public int CanCreateWrapper(int /*long*/ iid, int /*long*/[] _retval) {
++ public int CanCreateWrapper(long /*int*/ iid, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), iid, _retval);
+ }
+
+- public int CanCallMethod(int /*long*/ iid, char[] methodName, int /*long*/[] _retval) {
++ public int CanCallMethod(long /*int*/ iid, char[] methodName, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), iid, methodName, _retval);
+ }
+
+- public int CanGetProperty(int /*long*/ iid, char[] propertyName, int /*long*/[] _retval) {
++ public int CanGetProperty(long /*int*/ iid, char[] propertyName, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), iid, propertyName, _retval);
+ }
+
+- public int CanSetProperty(int /*long*/ iid, char[] propertyName, int /*long*/[] _retval) {
++ public int CanSetProperty(long /*int*/ iid, char[] propertyName, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), iid, propertyName, _retval);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsISerializable.java b/org/eclipse/swt/internal/mozilla/nsISerializable.java
+index 6e2fed1..882468f 100644
+--- a/org/eclipse/swt/internal/mozilla/nsISerializable.java
++++ b/org/eclipse/swt/internal/mozilla/nsISerializable.java
+@@ -37,15 +37,15 @@ public class nsISerializable extends nsISupports {
+ public static final nsID NS_ISERIALIZABLE_IID =
+ new nsID(NS_ISERIALIZABLE_IID_STR);
+
+- public nsISerializable(int /*long*/ address) {
++ public nsISerializable(long /*int*/ address) {
+ super(address);
+ }
+
+- public int Read(int /*long*/ aInputStream) {
++ public int Read(long /*int*/ aInputStream) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aInputStream);
+ }
+
+- public int Write(int /*long*/ aOutputStream) {
++ public int Write(long /*int*/ aOutputStream) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aOutputStream);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsIServiceManager.java b/org/eclipse/swt/internal/mozilla/nsIServiceManager.java
+index 2f46a69..6b35781 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIServiceManager.java
++++ b/org/eclipse/swt/internal/mozilla/nsIServiceManager.java
+@@ -37,15 +37,15 @@ public class nsIServiceManager extends nsISupports {
+ public static final nsID NS_ISERVICEMANAGER_IID =
+ new nsID(NS_ISERVICEMANAGER_IID_STR);
+
+- public nsIServiceManager(int /*long*/ address) {
++ public nsIServiceManager(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetService(nsID aClass, nsID aIID, int /*long*/[] result) {
++ public int GetService(nsID aClass, nsID aIID, long /*int*/[] result) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result);
+ }
+
+- public int GetServiceByContractID(byte[] aContractID, nsID aIID, int /*long*/[] result) {
++ public int GetServiceByContractID(byte[] aContractID, nsID aIID, long /*int*/[] result) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java b/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java
+index 9f29e75..3a65d38 100644
+--- a/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java
++++ b/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java
+@@ -37,7 +37,7 @@ public class nsISimpleEnumerator extends nsISupports {
+ public static final nsID NS_ISIMPLEENUMERATOR_IID =
+ new nsID(NS_ISIMPLEENUMERATOR_IID_STR);
+
+- public nsISimpleEnumerator(int /*long*/ address) {
++ public nsISimpleEnumerator(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -45,7 +45,7 @@ public class nsISimpleEnumerator extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), _retval);
+ }
+
+- public int GetNext(int /*long*/[] _retval) {
++ public int GetNext(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsISupports.java b/org/eclipse/swt/internal/mozilla/nsISupports.java
+index e5d3d7c..8ec3e6d 100644
+--- a/org/eclipse/swt/internal/mozilla/nsISupports.java
++++ b/org/eclipse/swt/internal/mozilla/nsISupports.java
+@@ -44,17 +44,17 @@ public class nsISupports {
+ public static final nsID NS_ISUPPORTS_IID =
+ new nsID(NS_ISUPPORTS_IID_STR);
+
+- int /*long*/ address;
++ long /*int*/ address;
+
+- public nsISupports(int /*long*/ address) {
++ public nsISupports(long /*int*/ address) {
+ this.address = address;
+ }
+
+- public int /*long*/ getAddress() {
++ public long /*int*/ getAddress() {
+ return this.address;
+ }
+
+- public int QueryInterface(nsID uuid, int /*long*/[] result) {
++ public int QueryInterface(nsID uuid, long /*int*/[] result) {
+ return XPCOM.VtblCall(FIRST_METHOD_ID, getAddress(), uuid, result);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java b/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java
+index 3d34624..1b1ddef 100644
+--- a/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java
++++ b/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java
+@@ -37,11 +37,11 @@ public class nsISupportsWeakReference extends nsISupports {
+ public static final nsID NS_ISUPPORTSWEAKREFERENCE_IID =
+ new nsID(NS_ISUPPORTSWEAKREFERENCE_IID_STR);
+
+- public nsISupportsWeakReference(int /*long*/ address) {
++ public nsISupportsWeakReference(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetWeakReference(int /*long*/[] _retval) {
++ public int GetWeakReference(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), _retval);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsITooltipListener.java b/org/eclipse/swt/internal/mozilla/nsITooltipListener.java
+index e0c58a3..a42c1a7 100644
+--- a/org/eclipse/swt/internal/mozilla/nsITooltipListener.java
++++ b/org/eclipse/swt/internal/mozilla/nsITooltipListener.java
+@@ -37,7 +37,7 @@ public class nsITooltipListener extends nsISupports {
+ public static final nsID NS_ITOOLTIPLISTENER_IID =
+ new nsID(NS_ITOOLTIPLISTENER_IID_STR);
+
+- public nsITooltipListener(int /*long*/ address) {
++ public nsITooltipListener(long /*int*/ address) {
+ super(address);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsITransfer.java b/org/eclipse/swt/internal/mozilla/nsITransfer.java
+index c9f0ba6..454b81f 100644
+--- a/org/eclipse/swt/internal/mozilla/nsITransfer.java
++++ b/org/eclipse/swt/internal/mozilla/nsITransfer.java
+@@ -37,11 +37,11 @@ public class nsITransfer extends nsIWebProgressListener2 {
+ public static final nsID NS_ITRANSFER_IID =
+ new nsID(NS_ITRANSFER_IID_STR);
+
+- public nsITransfer(int /*long*/ address) {
++ public nsITransfer(long /*int*/ address) {
+ super(address);
+ }
+
+- public int Init(int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, long startTime, int /*long*/ aTempFile, int /*long*/ aCancelable) {
++ public int Init(long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long startTime, long /*int*/ aTempFile, long /*int*/ aCancelable) {
+ return XPCOM.VtblCall(nsIWebProgressListener2.LAST_METHOD_ID + 1, getAddress(), aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aTempFile, aCancelable);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIURI.java b/org/eclipse/swt/internal/mozilla/nsIURI.java
+index 6c4bc12..49b9a57 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIURI.java
++++ b/org/eclipse/swt/internal/mozilla/nsIURI.java
+@@ -37,67 +37,67 @@ public class nsIURI extends nsISupports {
+ public static final nsID NS_IURI_IID =
+ new nsID(NS_IURI_IID_STR);
+
+- public nsIURI(int /*long*/ address) {
++ public nsIURI(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetSpec(int /*long*/ aSpec) {
++ public int GetSpec(long /*int*/ aSpec) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);
+ }
+
+- public int SetSpec(int /*long*/ aSpec) {
++ public int SetSpec(long /*int*/ aSpec) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);
+ }
+
+- public int GetPrePath(int /*long*/ aPrePath) {
++ public int GetPrePath(long /*int*/ aPrePath) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aPrePath);
+ }
+
+- public int GetScheme(int /*long*/ aScheme) {
++ public int GetScheme(long /*int*/ aScheme) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aScheme);
+ }
+
+- public int SetScheme(int /*long*/ aScheme) {
++ public int SetScheme(long /*int*/ aScheme) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aScheme);
+ }
+
+- public int GetUserPass(int /*long*/ aUserPass) {
++ public int GetUserPass(long /*int*/ aUserPass) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aUserPass);
+ }
+
+- public int SetUserPass(int /*long*/ aUserPass) {
++ public int SetUserPass(long /*int*/ aUserPass) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aUserPass);
+ }
+
+- public int GetUsername(int /*long*/ aUsername) {
++ public int GetUsername(long /*int*/ aUsername) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aUsername);
+ }
+
+- public int SetUsername(int /*long*/ aUsername) {
++ public int SetUsername(long /*int*/ aUsername) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aUsername);
+ }
+
+- public int GetPassword(int /*long*/ aPassword) {
++ public int GetPassword(long /*int*/ aPassword) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPassword);
+ }
+
+- public int SetPassword(int /*long*/ aPassword) {
++ public int SetPassword(long /*int*/ aPassword) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aPassword);
+ }
+
+- public int GetHostPort(int /*long*/ aHostPort) {
++ public int GetHostPort(long /*int*/ aHostPort) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aHostPort);
+ }
+
+- public int SetHostPort(int /*long*/ aHostPort) {
++ public int SetHostPort(long /*int*/ aHostPort) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aHostPort);
+ }
+
+- public int GetHost(int /*long*/ aHost) {
++ public int GetHost(long /*int*/ aHost) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aHost);
+ }
+
+- public int SetHost(int /*long*/ aHost) {
++ public int SetHost(long /*int*/ aHost) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aHost);
+ }
+
+@@ -109,15 +109,15 @@ public class nsIURI extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aPort);
+ }
+
+- public int GetPath(int /*long*/ aPath) {
++ public int GetPath(long /*int*/ aPath) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPath);
+ }
+
+- public int SetPath(int /*long*/ aPath) {
++ public int SetPath(long /*int*/ aPath) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aPath);
+ }
+
+- public int Equals(int /*long*/ other, int[] _retval) {
++ public int Equals(long /*int*/ other, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), other, _retval);
+ }
+
+@@ -125,23 +125,23 @@ public class nsIURI extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), scheme, _retval);
+ }
+
+- public int Clone(int /*long*/[] _retval) {
++ public int Clone(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);
+ }
+
+- public int Resolve(int /*long*/ relativePath, int /*long*/ _retval) {
++ public int Resolve(long /*int*/ relativePath, long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), relativePath, _retval);
+ }
+
+- public int GetAsciiSpec(int /*long*/ aAsciiSpec) {
++ public int GetAsciiSpec(long /*int*/ aAsciiSpec) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAsciiSpec);
+ }
+
+- public int GetAsciiHost(int /*long*/ aAsciiHost) {
++ public int GetAsciiHost(long /*int*/ aAsciiHost) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAsciiHost);
+ }
+
+- public int GetOriginCharset(int /*long*/ aOriginCharset) {
++ public int GetOriginCharset(long /*int*/ aOriginCharset) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aOriginCharset);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java b/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
+index aa6378e..8b2235f 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
++++ b/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
+@@ -37,39 +37,39 @@ public class nsIURIContentListener extends nsISupports {
+ public static final nsID NS_IURICONTENTLISTENER_IID =
+ new nsID(NS_IURICONTENTLISTENER_IID_STR);
+
+- public nsIURIContentListener(int /*long*/ address) {
++ public nsIURIContentListener(long /*int*/ address) {
+ super(address);
+ }
+
+- public int OnStartURIOpen(int /*long*/ aURI, int[] _retval) {
++ public int OnStartURIOpen(long /*int*/ aURI, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, _retval);
+ }
+
+- public int DoContent(byte[] aContentType, int aIsContentPreferred, int /*long*/ aRequest, int /*long*/[] aContentHandler, int[] _retval) {
++ public int DoContent(byte[] aContentType, int aIsContentPreferred, long /*int*/ aRequest, long /*int*/[] aContentHandler, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContentType, aIsContentPreferred, aRequest, aContentHandler, _retval);
+ }
+
+- public int IsPreferred(byte[] aContentType, int /*long*/[] aDesiredContentType, int[] _retval) {
++ public int IsPreferred(byte[] aContentType, long /*int*/[] aDesiredContentType, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContentType, aDesiredContentType, _retval);
+ }
+
+- public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, int /*long*/[] aDesiredContentType, int[] _retval) {
++ public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, long /*int*/[] aDesiredContentType, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContentType, aIsContentPreferred, aDesiredContentType, _retval);
+ }
+
+- public int GetLoadCookie(int /*long*/[] aLoadCookie) {
++ public int GetLoadCookie(long /*int*/[] aLoadCookie) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLoadCookie);
+ }
+
+- public int SetLoadCookie(int /*long*/ aLoadCookie) {
++ public int SetLoadCookie(long /*int*/ aLoadCookie) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLoadCookie);
+ }
+
+- public int GetParentContentListener(int /*long*/[] aParentContentListener) {
++ public int GetParentContentListener(long /*int*/[] aParentContentListener) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParentContentListener);
+ }
+
+- public int SetParentContentListener(int /*long*/ aParentContentListener) {
++ public int SetParentContentListener(long /*int*/ aParentContentListener) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParentContentListener);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIVariant.java b/org/eclipse/swt/internal/mozilla/nsIVariant.java
+index 2de3baf..2026748 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIVariant.java
++++ b/org/eclipse/swt/internal/mozilla/nsIVariant.java
+@@ -37,7 +37,7 @@ public class nsIVariant extends nsISupports {
+ public static final nsID NS_IVARIANT_IID =
+ new nsID(NS_IVARIANT_IID_STR);
+
+- public nsIVariant(int /*long*/ address) {
++ public nsIVariant(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -45,11 +45,11 @@ public class nsIVariant extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aDataType);
+ }
+
+- public int GetAsInt8(int /*long*/ _retval) {
++ public int GetAsInt8(long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
+ }
+
+- public int GetAsInt16(int /*long*/ _retval) {
++ public int GetAsInt16(long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
+ }
+
+@@ -61,7 +61,7 @@ public class nsIVariant extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);
+ }
+
+- public int GetAsUint8(int /*long*/ _retval) {
++ public int GetAsUint8(long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval);
+ }
+
+@@ -73,7 +73,7 @@ public class nsIVariant extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), _retval);
+ }
+
+- public int GetAsUint64(int /*long*/ _retval) {
++ public int GetAsUint64(long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
+ }
+
+@@ -81,7 +81,7 @@ public class nsIVariant extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval);
+ }
+
+- public int GetAsDouble(int /*long*/ _retval) {
++ public int GetAsDouble(long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), _retval);
+ }
+
+@@ -97,51 +97,51 @@ public class nsIVariant extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), _retval);
+ }
+
+- public int GetAsID(int /*long*/ retval) {
++ public int GetAsID(long /*int*/ retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), retval);
+ }
+
+- public int GetAsAString(int /*long*/ _retval) {
++ public int GetAsAString(long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), _retval);
+ }
+
+- public int GetAsDOMString(int /*long*/ _retval) {
++ public int GetAsDOMString(long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), _retval);
+ }
+
+- public int GetAsACString(int /*long*/ _retval) {
++ public int GetAsACString(long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), _retval);
+ }
+
+- public int GetAsAUTF8String(int /*long*/ _retval) {
++ public int GetAsAUTF8String(long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), _retval);
+ }
+
+- public int GetAsString(int /*long*/[] _retval) {
++ public int GetAsString(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), _retval);
+ }
+
+- public int GetAsWString(int /*long*/[] _retval) {
++ public int GetAsWString(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), _retval);
+ }
+
+- public int GetAsISupports(int /*long*/[] _retval) {
++ public int GetAsISupports(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);
+ }
+
+- public int GetAsInterface(int /*long*/[] iid, int /*long*/[] iface) {
++ public int GetAsInterface(long /*int*/[] iid, long /*int*/[] iface) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), iid, iface);
+ }
+
+- public int GetAsArray(short[] type, int /*long*/ iid, int[] count, int /*long*/[] ptr) {
++ public int GetAsArray(short[] type, long /*int*/ iid, int[] count, long /*int*/[] ptr) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), type, iid, count, ptr);
+ }
+
+- public int GetAsStringWithSize(int[] size, int /*long*/[] str) {
++ public int GetAsStringWithSize(int[] size, long /*int*/[] str) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), size, str);
+ }
+
+- public int GetAsWStringWithSize(int[] size, int /*long*/[] str) {
++ public int GetAsWStringWithSize(int[] size, long /*int*/[] str) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), size, str);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIWeakReference.java b/org/eclipse/swt/internal/mozilla/nsIWeakReference.java
+index faf448b..130e24e 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIWeakReference.java
++++ b/org/eclipse/swt/internal/mozilla/nsIWeakReference.java
+@@ -37,11 +37,11 @@ public class nsIWeakReference extends nsISupports {
+ public static final nsID NS_IWEAKREFERENCE_IID =
+ new nsID(NS_IWEAKREFERENCE_IID_STR);
+
+- public nsIWeakReference(int /*long*/ address) {
++ public nsIWeakReference(long /*int*/ address) {
+ super(address);
+ }
+
+- public int QueryReferent(nsID uuid, int /*long*/[] result) {
++ public int QueryReferent(nsID uuid, long /*int*/[] result) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uuid, result);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java b/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java
+index 22113bd..5d5f269 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java
++++ b/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java
+@@ -37,35 +37,35 @@ public class nsIWebBrowser extends nsISupports {
+ public static final nsID NS_IWEBBROWSER_IID =
+ new nsID(NS_IWEBBROWSER_IID_STR);
+
+- public nsIWebBrowser(int /*long*/ address) {
++ public nsIWebBrowser(long /*int*/ address) {
+ super(address);
+ }
+
+- public int AddWebBrowserListener(int /*long*/ aListener, nsID aIID) {
++ public int AddWebBrowserListener(long /*int*/ aListener, nsID aIID) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aListener, aIID);
+ }
+
+- public int RemoveWebBrowserListener(int /*long*/ aListener, nsID aIID) {
++ public int RemoveWebBrowserListener(long /*int*/ aListener, nsID aIID) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aListener, aIID);
+ }
+
+- public int GetContainerWindow(int /*long*/[] aContainerWindow) {
++ public int GetContainerWindow(long /*int*/[] aContainerWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContainerWindow);
+ }
+
+- public int SetContainerWindow(int /*long*/ aContainerWindow) {
++ public int SetContainerWindow(long /*int*/ aContainerWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContainerWindow);
+ }
+
+- public int GetParentURIContentListener(int /*long*/[] aParentURIContentListener) {
++ public int GetParentURIContentListener(long /*int*/[] aParentURIContentListener) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParentURIContentListener);
+ }
+
+- public int SetParentURIContentListener(int /*long*/ aParentURIContentListener) {
++ public int SetParentURIContentListener(long /*int*/ aParentURIContentListener) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParentURIContentListener);
+ }
+
+- public int GetContentDOMWindow(int /*long*/[] aContentDOMWindow) {
++ public int GetContentDOMWindow(long /*int*/[] aContentDOMWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aContentDOMWindow);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java b/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
+index 823c4a6..8eba1d3 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
++++ b/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
+@@ -37,7 +37,7 @@ public class nsIWebBrowserChrome extends nsISupports {
+ public static final nsID NS_IWEBBROWSERCHROME_IID =
+ new nsID(NS_IWEBBROWSERCHROME_IID_STR);
+
+- public nsIWebBrowserChrome(int /*long*/ address) {
++ public nsIWebBrowserChrome(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -51,11 +51,11 @@ public class nsIWebBrowserChrome extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), statusType, status);
+ }
+
+- public int GetWebBrowser(int /*long*/[] aWebBrowser) {
++ public int GetWebBrowser(long /*int*/[] aWebBrowser) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWebBrowser);
+ }
+
+- public int SetWebBrowser(int /*long*/ aWebBrowser) {
++ public int SetWebBrowser(long /*int*/ aWebBrowser) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aWebBrowser);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java b/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java
+index 6ad6792..146bb70 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java
++++ b/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java
+@@ -37,7 +37,7 @@ public class nsIWebBrowserChromeFocus extends nsISupports {
+ public static final nsID NS_IWEBBROWSERCHROMEFOCUS_IID =
+ new nsID(NS_IWEBBROWSERCHROMEFOCUS_IID_STR);
+
+- public nsIWebBrowserChromeFocus(int /*long*/ address) {
++ public nsIWebBrowserChromeFocus(long /*int*/ address) {
+ super(address);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java b/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java
+index 788f44e..ec078af 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java
++++ b/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java
+@@ -37,7 +37,7 @@ public class nsIWebBrowserFocus extends nsISupports {
+ public static final nsID NS_IWEBBROWSERFOCUS_IID =
+ new nsID(NS_IWEBBROWSERFOCUS_IID_STR);
+
+- public nsIWebBrowserFocus(int /*long*/ address) {
++ public nsIWebBrowserFocus(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -57,19 +57,19 @@ public class nsIWebBrowserFocus extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
+ }
+
+- public int GetFocusedWindow(int /*long*/[] aFocusedWindow) {
++ public int GetFocusedWindow(long /*int*/[] aFocusedWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aFocusedWindow);
+ }
+
+- public int SetFocusedWindow(int /*long*/ aFocusedWindow) {
++ public int SetFocusedWindow(long /*int*/ aFocusedWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aFocusedWindow);
+ }
+
+- public int GetFocusedElement(int /*long*/[] aFocusedElement) {
++ public int GetFocusedElement(long /*int*/[] aFocusedElement) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aFocusedElement);
+ }
+
+- public int SetFocusedElement(int /*long*/ aFocusedElement) {
++ public int SetFocusedElement(long /*int*/ aFocusedElement) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aFocusedElement);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java b/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java
+index 6ea241f..251806a 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java
++++ b/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java
+@@ -37,7 +37,7 @@ public class nsIWebBrowserSetup extends nsISupports {
+ public static final nsID NS_IWEBBROWSERSETUP_IID =
+ new nsID(NS_IWEBBROWSERSETUP_IID_STR);
+
+- public nsIWebBrowserSetup(int /*long*/ address) {
++ public nsIWebBrowserSetup(long /*int*/ address) {
+ super(address);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java b/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
+index 740ab4c..b45672e 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
++++ b/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
+@@ -37,15 +37,15 @@ public class nsIWebBrowserStream extends nsISupports {
+ public static final nsID NS_IWEBBROWSERSTREAM_IID =
+ new nsID(NS_IWEBBROWSERSTREAM_IID_STR);
+
+- public nsIWebBrowserStream(int /*long*/ address) {
++ public nsIWebBrowserStream(long /*int*/ address) {
+ super(address);
+ }
+
+- public int OpenStream(int /*long*/ aBaseURI, int /*long*/ aContentType) {
++ public int OpenStream(long /*int*/ aBaseURI, long /*int*/ aContentType) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aBaseURI, aContentType);
+ }
+
+- public int AppendToStream(int /*long*/ aData, int aLen) {
++ public int AppendToStream(long /*int*/ aData, int aLen) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData, aLen);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java b/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java
+index 24248d2..f6f7d0a 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java
++++ b/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java
+@@ -37,7 +37,7 @@ public class nsIWebNavigation extends nsISupports {
+ public static final nsID NS_IWEBNAVIGATION_IID =
+ new nsID(NS_IWEBNAVIGATION_IID_STR);
+
+- public nsIWebNavigation(int /*long*/ address) {
++ public nsIWebNavigation(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -79,7 +79,7 @@ public class nsIWebNavigation extends nsISupports {
+
+ public static final int LOAD_FLAGS_CHARSET_CHANGE = 1024;
+
+- public int LoadURI(char[] uri, int loadFlags, int /*long*/ referrer, int /*long*/ postData, int /*long*/ headers) {
++ public int LoadURI(char[] uri, int loadFlags, long /*int*/ referrer, long /*int*/ postData, long /*int*/ headers) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), uri, loadFlags, referrer, postData, headers);
+ }
+
+@@ -97,23 +97,23 @@ public class nsIWebNavigation extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), stopFlags);
+ }
+
+- public int GetDocument(int /*long*/[] aDocument) {
++ public int GetDocument(long /*int*/[] aDocument) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDocument);
+ }
+
+- public int GetCurrentURI(int /*long*/[] aCurrentURI) {
++ public int GetCurrentURI(long /*int*/[] aCurrentURI) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aCurrentURI);
+ }
+
+- public int GetReferringURI(int /*long*/[] aReferringURI) {
++ public int GetReferringURI(long /*int*/[] aReferringURI) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aReferringURI);
+ }
+
+- public int GetSessionHistory(int /*long*/[] aSessionHistory) {
++ public int GetSessionHistory(long /*int*/[] aSessionHistory) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aSessionHistory);
+ }
+
+- public int SetSessionHistory(int /*long*/ aSessionHistory) {
++ public int SetSessionHistory(long /*int*/ aSessionHistory) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSessionHistory);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java b/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java
+index e6817fa..1bde34a 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java
++++ b/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java
+@@ -37,7 +37,7 @@ public class nsIWebNavigationInfo extends nsISupports {
+ public static final nsID NS_IWEBNAVIGATIONINFO_IID =
+ new nsID(NS_IWEBNAVIGATIONINFO_IID_STR);
+
+- public nsIWebNavigationInfo(int /*long*/ address) {
++ public nsIWebNavigationInfo(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -49,7 +49,7 @@ public class nsIWebNavigationInfo extends nsISupports {
+
+ public static final int OTHER = 32768;
+
+- public int IsTypeSupported(int /*long*/ aType, int /*long*/ aWebNav, int[] _retval) {
++ public int IsTypeSupported(long /*int*/ aType, long /*int*/ aWebNav, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aType, aWebNav, _retval);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsIWebProgress.java b/org/eclipse/swt/internal/mozilla/nsIWebProgress.java
+index 05fd351..4ada0fb 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIWebProgress.java
++++ b/org/eclipse/swt/internal/mozilla/nsIWebProgress.java
+@@ -37,7 +37,7 @@ public class nsIWebProgress extends nsISupports {
+ public static final nsID NS_IWEBPROGRESS_IID =
+ new nsID(NS_IWEBPROGRESS_IID_STR);
+
+- public nsIWebProgress(int /*long*/ address) {
++ public nsIWebProgress(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -61,15 +61,15 @@ public class nsIWebProgress extends nsISupports {
+
+ public static final int NOTIFY_ALL = 255;
+
+- public int AddProgressListener(int /*long*/ listener, int aNotifyMask) {
++ public int AddProgressListener(long /*int*/ listener, int aNotifyMask) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), listener, aNotifyMask);
+ }
+
+- public int RemoveProgressListener(int /*long*/ listener) {
++ public int RemoveProgressListener(long /*int*/ listener) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), listener);
+ }
+
+- public int GetDOMWindow(int /*long*/[] aDOMWindow) {
++ public int GetDOMWindow(long /*int*/[] aDOMWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDOMWindow);
+ }
+
+diff --git a/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java b/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java
+index 2704c1b..54fbd57 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java
++++ b/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java
+@@ -37,7 +37,7 @@ public class nsIWebProgressListener extends nsISupports {
+ public static final nsID NS_IWEBPROGRESSLISTENER_IID =
+ new nsID(NS_IWEBPROGRESSLISTENER_IID_STR);
+
+- public nsIWebProgressListener(int /*long*/ address) {
++ public nsIWebProgressListener(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -71,23 +71,23 @@ public class nsIWebProgressListener extends nsISupports {
+
+ public static final int STATE_SECURE_LOW = 131072;
+
+- public int OnStateChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {
++ public int OnStateChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aWebProgress, aRequest, aStateFlags, aStatus);
+ }
+
+- public int OnProgressChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
++ public int OnProgressChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
+ }
+
+- public int OnLocationChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ location) {
++ public int OnLocationChange(long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ location) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aWebProgress, aRequest, location);
+ }
+
+- public int OnStatusChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, char[] aMessage) {
++ public int OnStatusChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int aStatus, char[] aMessage) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aWebProgress, aRequest, aStatus, aMessage);
+ }
+
+- public int OnSecurityChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int state) {
++ public int OnSecurityChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int state) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aWebProgress, aRequest, state);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java b/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java
+index d27f486..c1fa07e 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java
++++ b/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java
+@@ -37,11 +37,11 @@ public class nsIWebProgressListener2 extends nsIWebProgressListener {
+ public static final nsID NS_IWEBPROGRESSLISTENER2_IID =
+ new nsID(NS_IWEBPROGRESSLISTENER2_IID_STR);
+
+- public nsIWebProgressListener2(int /*long*/ address) {
++ public nsIWebProgressListener2(long /*int*/ address) {
+ super(address);
+ }
+
+- public int OnProgressChange64(int /*long*/ aWebProgress, int /*long*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) {
++ public int OnProgressChange64(long /*int*/ aWebProgress, long /*int*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) {
+ return XPCOM.VtblCall(nsIWebProgressListener.LAST_METHOD_ID + 1, getAddress(), aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java b/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java
+index d7f5d7f..6693098 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java
++++ b/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java
+@@ -37,11 +37,11 @@ public class nsIWindowCreator extends nsISupports {
+ public static final nsID NS_IWINDOWCREATOR_IID =
+ new nsID(NS_IWINDOWCREATOR_IID_STR);
+
+- public nsIWindowCreator(int /*long*/ address) {
++ public nsIWindowCreator(long /*int*/ address) {
+ super(address);
+ }
+
+- public int CreateChromeWindow(int /*long*/ parent, int chromeFlags, int /*long*/[] _retval) {
++ public int CreateChromeWindow(long /*int*/ parent, int chromeFlags, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, _retval);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java b/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
+index 4bfec46..7596227 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
++++ b/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
+@@ -37,13 +37,13 @@ public class nsIWindowCreator2 extends nsIWindowCreator {
+ public static final nsID NS_IWINDOWCREATOR2_IID =
+ new nsID(NS_IWINDOWCREATOR2_IID_STR);
+
+- public nsIWindowCreator2(int /*long*/ address) {
++ public nsIWindowCreator2(long /*int*/ address) {
+ super(address);
+ }
+
+ public static final int PARENT_IS_LOADING_OR_RUNNING_TIMEOUT = 1;
+
+- public int CreateChromeWindow2(int /*long*/ parent, int chromeFlags, int contextFlags, int /*long*/ uri, int[] cancel, int /*long*/[] _retval) {
++ public int CreateChromeWindow2(long /*int*/ parent, int chromeFlags, int contextFlags, long /*int*/ uri, int[] cancel, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIWindowCreator.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, contextFlags, uri, cancel, _retval);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java b/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java
+index 6a1fc59..b105a9e 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java
++++ b/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java
+@@ -37,51 +37,51 @@ public class nsIWindowWatcher extends nsISupports {
+ public static final nsID NS_IWINDOWWATCHER_IID =
+ new nsID(NS_IWINDOWWATCHER_IID_STR);
+
+- public nsIWindowWatcher(int /*long*/ address) {
++ public nsIWindowWatcher(long /*int*/ address) {
+ super(address);
+ }
+
+- public int OpenWindow(int /*long*/ aParent, byte[] aUrl, byte[] aName, byte[] aFeatures, int /*long*/ aArguments, int /*long*/[] _retval) {
++ public int OpenWindow(long /*int*/ aParent, byte[] aUrl, byte[] aName, byte[] aFeatures, long /*int*/ aArguments, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aUrl, aName, aFeatures, aArguments, _retval);
+ }
+
+- public int RegisterNotification(int /*long*/ aObserver) {
++ public int RegisterNotification(long /*int*/ aObserver) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aObserver);
+ }
+
+- public int UnregisterNotification(int /*long*/ aObserver) {
++ public int UnregisterNotification(long /*int*/ aObserver) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aObserver);
+ }
+
+- public int GetWindowEnumerator(int /*long*/[] _retval) {
++ public int GetWindowEnumerator(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), _retval);
+ }
+
+- public int GetNewPrompter(int /*long*/ aParent, int /*long*/[] _retval) {
++ public int GetNewPrompter(long /*int*/ aParent, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, _retval);
+ }
+
+- public int GetNewAuthPrompter(int /*long*/ aParent, int /*long*/[] _retval) {
++ public int GetNewAuthPrompter(long /*int*/ aParent, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, _retval);
+ }
+
+- public int SetWindowCreator(int /*long*/ creator) {
++ public int SetWindowCreator(long /*int*/ creator) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), creator);
+ }
+
+- public int GetChromeForWindow(int /*long*/ aWindow, int /*long*/[] _retval) {
++ public int GetChromeForWindow(long /*int*/ aWindow, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aWindow, _retval);
+ }
+
+- public int GetWindowByName(char[] aTargetName, int /*long*/ aCurrentWindow, int /*long*/[] _retval) {
++ public int GetWindowByName(char[] aTargetName, long /*int*/ aCurrentWindow, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aTargetName, aCurrentWindow, _retval);
+ }
+
+- public int GetActiveWindow(int /*long*/[] aActiveWindow) {
++ public int GetActiveWindow(long /*int*/[] aActiveWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aActiveWindow);
+ }
+
+- public int SetActiveWindow(int /*long*/ aActiveWindow) {
++ public int SetActiveWindow(long /*int*/ aActiveWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aActiveWindow);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java b/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java
+index 30b340c..33a8769 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java
++++ b/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java
+@@ -11,7 +11,7 @@ public class nsIWritableVariant extends nsIVariant {
+ public static final nsID NS_IWRITABLEVARIANT_IID =
+ new nsID(NS_IWRITABLEVARIANT_IID_STR);
+
+- public nsIWritableVariant(int /*long*/ address) {
++ public nsIWritableVariant(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -75,23 +75,23 @@ public class nsIWritableVariant extends nsIVariant {
+ // return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 15, getAddress(), aValue);
+ // }
+
+- public int SetAsID(int /*long*/ aValue) {
++ public int SetAsID(long /*int*/ aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 16, getAddress(), aValue);
+ }
+
+- public int SetAsAString(int /*long*/ aValue) {
++ public int SetAsAString(long /*int*/ aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 17, getAddress(), aValue);
+ }
+
+- public int SetAsDOMString(int /*long*/ aValue) {
++ public int SetAsDOMString(long /*int*/ aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 18, getAddress(), aValue);
+ }
+
+- public int SetAsACString(int /*long*/ aValue) {
++ public int SetAsACString(long /*int*/ aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 19, getAddress(), aValue);
+ }
+
+- public int SetAsAUTF8String(int /*long*/ aValue) {
++ public int SetAsAUTF8String(long /*int*/ aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 20, getAddress(), aValue);
+ }
+
+@@ -103,15 +103,15 @@ public class nsIWritableVariant extends nsIVariant {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 22, getAddress(), aValue);
+ }
+
+- public int SetAsISupports(int /*long*/ aValue) {
++ public int SetAsISupports(long /*int*/ aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 23, getAddress(), aValue);
+ }
+
+- public int SetAsInterface(nsID iid, int /*long*/ iface) {
++ public int SetAsInterface(nsID iid, long /*int*/ iface) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 24, getAddress(), iid, iface);
+ }
+
+- public int SetAsArray(short type, int /*long*/ iid, int count, int /*long*/ ptr) {
++ public int SetAsArray(short type, long /*int*/ iid, int count, long /*int*/ ptr) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 25, getAddress(), type, iid, count, ptr);
+ }
+
+@@ -135,7 +135,7 @@ public class nsIWritableVariant extends nsIVariant {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 30, getAddress());
+ }
+
+- public int SetFromVariant(int /*long*/ aValue) {
++ public int SetFromVariant(long /*int*/ aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 31, getAddress(), aValue);
+ }
+ }
+diff --git a/org/eclipse/swt/internal/mozilla/nsIX509Cert.java b/org/eclipse/swt/internal/mozilla/nsIX509Cert.java
+index 6023055..7c82afa 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIX509Cert.java
++++ b/org/eclipse/swt/internal/mozilla/nsIX509Cert.java
+@@ -37,87 +37,87 @@ public class nsIX509Cert extends nsISupports {
+ public static final nsID NS_IX509CERT_IID =
+ new nsID(NS_IX509CERT_IID_STR);
+
+- public nsIX509Cert(int /*long*/ address) {
++ public nsIX509Cert(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetNickname(int /*long*/ aNickname) {
++ public int GetNickname(long /*int*/ aNickname) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNickname);
+ }
+
+- public int GetEmailAddress(int /*long*/ aEmailAddress) {
++ public int GetEmailAddress(long /*int*/ aEmailAddress) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEmailAddress);
+ }
+
+- public int GetEmailAddresses(int[] length, int /*long*/[] addresses) {
++ public int GetEmailAddresses(int[] length, long /*int*/[] addresses) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), length, addresses);
+ }
+
+- public int ContainsEmailAddress(int /*long*/ aEmailAddress, int[] _retval) {
++ public int ContainsEmailAddress(long /*int*/ aEmailAddress, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aEmailAddress, _retval);
+ }
+
+- public int GetSubjectName(int /*long*/ aSubjectName) {
++ public int GetSubjectName(long /*int*/ aSubjectName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aSubjectName);
+ }
+
+- public int GetCommonName(int /*long*/ aCommonName) {
++ public int GetCommonName(long /*int*/ aCommonName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCommonName);
+ }
+
+- public int GetOrganization(int /*long*/ aOrganization) {
++ public int GetOrganization(long /*int*/ aOrganization) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aOrganization);
+ }
+
+- public int GetOrganizationalUnit(int /*long*/ aOrganizationalUnit) {
++ public int GetOrganizationalUnit(long /*int*/ aOrganizationalUnit) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aOrganizationalUnit);
+ }
+
+- public int GetSha1Fingerprint(int /*long*/ aSha1Fingerprint) {
++ public int GetSha1Fingerprint(long /*int*/ aSha1Fingerprint) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSha1Fingerprint);
+ }
+
+- public int GetMd5Fingerprint(int /*long*/ aMd5Fingerprint) {
++ public int GetMd5Fingerprint(long /*int*/ aMd5Fingerprint) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aMd5Fingerprint);
+ }
+
+- public int GetTokenName(int /*long*/ aTokenName) {
++ public int GetTokenName(long /*int*/ aTokenName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aTokenName);
+ }
+
+- public int GetIssuerName(int /*long*/ aIssuerName) {
++ public int GetIssuerName(long /*int*/ aIssuerName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aIssuerName);
+ }
+
+- public int GetSerialNumber(int /*long*/ aSerialNumber) {
++ public int GetSerialNumber(long /*int*/ aSerialNumber) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSerialNumber);
+ }
+
+- public int GetIssuerCommonName(int /*long*/ aIssuerCommonName) {
++ public int GetIssuerCommonName(long /*int*/ aIssuerCommonName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aIssuerCommonName);
+ }
+
+- public int GetIssuerOrganization(int /*long*/ aIssuerOrganization) {
++ public int GetIssuerOrganization(long /*int*/ aIssuerOrganization) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aIssuerOrganization);
+ }
+
+- public int GetIssuerOrganizationUnit(int /*long*/ aIssuerOrganizationUnit) {
++ public int GetIssuerOrganizationUnit(long /*int*/ aIssuerOrganizationUnit) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aIssuerOrganizationUnit);
+ }
+
+- public int GetIssuer(int /*long*/[] aIssuer) {
++ public int GetIssuer(long /*int*/[] aIssuer) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aIssuer);
+ }
+
+- public int GetValidity(int /*long*/[] aValidity) {
++ public int GetValidity(long /*int*/[] aValidity) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aValidity);
+ }
+
+- public int GetDbKey(int /*long*/[] aDbKey) {
++ public int GetDbKey(long /*int*/[] aDbKey) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aDbKey);
+ }
+
+- public int GetWindowTitle(int /*long*/[] aWindowTitle) {
++ public int GetWindowTitle(long /*int*/[] aWindowTitle) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aWindowTitle);
+ }
+
+@@ -173,15 +173,15 @@ public class nsIX509Cert extends nsISupports {
+
+ public static final int CERT_USAGE_AnyCA = 11;
+
+- public int GetChain(int /*long*/[] _retval) {
++ public int GetChain(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), _retval);
+ }
+
+- public int GetUsagesArray(int ignoreOcsp, int[] verified, int[] count, int /*long*/[] usages) {
++ public int GetUsagesArray(int ignoreOcsp, int[] verified, int[] count, long /*int*/[] usages) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), ignoreOcsp, verified, count, usages);
+ }
+
+- public int GetUsagesString(int ignoreOcsp, int[] verified, int /*long*/ usages) {
++ public int GetUsagesString(int ignoreOcsp, int[] verified, long /*int*/ usages) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), ignoreOcsp, verified, usages);
+ }
+
+@@ -189,15 +189,15 @@ public class nsIX509Cert extends nsISupports {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), usage, _retval);
+ }
+
+- public int GetASN1Structure(int /*long*/[] aASN1Structure) {
++ public int GetASN1Structure(long /*int*/[] aASN1Structure) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aASN1Structure);
+ }
+
+- public int GetRawDER(int[] length, int /*long*/[] data) {
++ public int GetRawDER(int[] length, long /*int*/[] data) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), length, data);
+ }
+
+- public int Equals(int /*long*/ other, int[] _retval) {
++ public int Equals(long /*int*/ other, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), other, _retval);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java b/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java
+index 2357b4d..feb15fe 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java
++++ b/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java
+@@ -37,39 +37,39 @@ public class nsIX509CertValidity extends nsISupports {
+ public static final nsID NS_IX509CERTVALIDITY_IID =
+ new nsID(NS_IX509CERTVALIDITY_IID_STR);
+
+- public nsIX509CertValidity(int /*long*/ address) {
++ public nsIX509CertValidity(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetNotBefore(int /*long*/ aNotBefore) {
++ public int GetNotBefore(long /*int*/ aNotBefore) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNotBefore);
+ }
+
+- public int GetNotBeforeLocalTime(int /*long*/ aNotBeforeLocalTime) {
++ public int GetNotBeforeLocalTime(long /*int*/ aNotBeforeLocalTime) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aNotBeforeLocalTime);
+ }
+
+- public int GetNotBeforeLocalDay(int /*long*/ aNotBeforeLocalDay) {
++ public int GetNotBeforeLocalDay(long /*int*/ aNotBeforeLocalDay) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aNotBeforeLocalDay);
+ }
+
+- public int GetNotBeforeGMT(int /*long*/ aNotBeforeGMT) {
++ public int GetNotBeforeGMT(long /*int*/ aNotBeforeGMT) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNotBeforeGMT);
+ }
+
+- public int GetNotAfter(int /*long*/ aNotAfter) {
++ public int GetNotAfter(long /*int*/ aNotAfter) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aNotAfter);
+ }
+
+- public int GetNotAfterLocalTime(int /*long*/ aNotAfterLocalTime) {
++ public int GetNotAfterLocalTime(long /*int*/ aNotAfterLocalTime) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aNotAfterLocalTime);
+ }
+
+- public int GetNotAfterLocalDay(int /*long*/ aNotAfterLocalDay) {
++ public int GetNotAfterLocalDay(long /*int*/ aNotAfterLocalDay) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNotAfterLocalDay);
+ }
+
+- public int GetNotAfterGMT(int /*long*/ aNotAfterGMT) {
++ public int GetNotAfterGMT(long /*int*/ aNotAfterGMT) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNotAfterGMT);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java b/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java
+index 884b6d9..3302ac4 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java
++++ b/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java
+@@ -37,7 +37,7 @@ public class nsIXPCSecurityManager extends nsISupports {
+ public static final nsID NS_IXPCSECURITYMANAGER_IID =
+ new nsID(NS_IXPCSECURITYMANAGER_IID_STR);
+
+- public nsIXPCSecurityManager(int /*long*/ address) {
++ public nsIXPCSecurityManager(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -55,15 +55,15 @@ public class nsIXPCSecurityManager extends nsISupports {
+
+ public static final int HOOK_ALL = 63;
+
+- public int CanCreateWrapper(int /*long*/ aJSContext, nsID aIID, int /*long*/ aObj, int /*long*/ aClassInfo, int /*long*/[] aPolicy) {
++ public int CanCreateWrapper(long /*int*/ aJSContext, nsID aIID, long /*int*/ aObj, long /*int*/ aClassInfo, long /*int*/[] aPolicy) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aJSContext, aIID, aObj, aClassInfo, aPolicy);
+ }
+
+- public int CanCreateInstance(int /*long*/ aJSContext, nsID aCID) {
++ public int CanCreateInstance(long /*int*/ aJSContext, nsID aCID) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aJSContext, aCID);
+ }
+
+- public int CanGetService(int /*long*/ aJSContext, nsID aCID) {
++ public int CanGetService(long /*int*/ aJSContext, nsID aCID) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aJSContext, aCID);
+ }
+
+@@ -73,7 +73,7 @@ public class nsIXPCSecurityManager extends nsISupports {
+
+ public static final int ACCESS_SET_PROPERTY = 2;
+
+- public int CanAccess(int aAction, int /*long*/ aCallContext, int /*long*/ aJSContext, int /*long*/ aJSObject, int /*long*/ aObj, int /*long*/ aClassInfo, int /*long*/ aName, int /*long*/[] aPolicy) {
++ public int CanAccess(int aAction, long /*int*/ aCallContext, long /*int*/ aJSContext, long /*int*/ aJSObject, long /*int*/ aObj, long /*int*/ aClassInfo, long /*int*/ aName, long /*int*/[] aPolicy) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aAction, aCallContext, aJSContext, aJSObject, aObj, aClassInfo, aName, aPolicy);
+ }
+ }
+\ No newline at end of file
+diff --git a/org/eclipse/swt/internal/opengl/glx/GLX.java b/org/eclipse/swt/internal/opengl/glx/GLX.java
+index 4f1d979..6e071ff 100644
+--- a/org/eclipse/swt/internal/opengl/glx/GLX.java
++++ b/org/eclipse/swt/internal/opengl/glx/GLX.java
+@@ -231,8 +231,8 @@ public static final void glViewport(int x, int y, int width, int height) {
}
}
/** @param dpy cast=(Display *) */
@@ -32489,7 +32706,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXChooseVisual(dpy, screen, attribList);
-@@ -245,8 +245,8 @@
+@@ -245,8 +245,8 @@ public static final int /*long*/ glXChooseVisual(int /*long*/ dpy, int screen, i
* @param src cast=(GLXContext)
* @param dst cast=(GLXContext)
*/
@@ -32500,7 +32717,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
_glXCopyContext(dpy, src, dst, mask);
-@@ -258,8 +258,8 @@
+@@ -258,8 +258,8 @@ public static final void glXCopyContext(int /*long*/ dpy, int /*long*/ src, int
* @param dpy cast=(Display *)
* @param shareList cast=(GLXContext)
*/
@@ -32511,7 +32728,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXCreateContext(dpy, vis, shareList, direct);
-@@ -271,8 +271,8 @@
+@@ -271,8 +271,8 @@ public static final int /*long*/ glXCreateContext(int /*long*/ dpy, XVisualInfo
* @param dpy cast=(Display *)
* @param pixmap cast=(Pixmap)
*/
@@ -32522,7 +32739,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXCreateGLXPixmap(dpy, vis, pixmap);
-@@ -284,8 +284,8 @@
+@@ -284,8 +284,8 @@ public static final int /*long*/ glXCreateGLXPixmap(int /*long*/ dpy, XVisualInf
* @param dpy cast=(Display *)
* @param ctx cast=(GLXContext)
*/
@@ -32533,7 +32750,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
_glXDestroyContext(dpy, ctx);
-@@ -297,8 +297,8 @@
+@@ -297,8 +297,8 @@ public static final void glXDestroyContext(int /*long*/ dpy, int /*long*/ ctx) {
* @param dpy cast=(Display *)
* @param pix cast=(GLXPixmap)
*/
@@ -32544,7 +32761,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
_glXDestroyGLXPixmap(dpy, pix);
-@@ -307,8 +307,8 @@
+@@ -307,8 +307,8 @@ public static final void glXDestroyGLXPixmap(int /*long*/ dpy, int /*long*/ pix)
}
}
/** @param dpy cast=(Display *) */
@@ -32555,7 +32772,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXGetClientString(dpy, name);
-@@ -317,8 +317,8 @@
+@@ -317,8 +317,8 @@ public static final int /*long*/ glXGetClientString(int /*long*/ dpy, int name)
}
}
/** @param dpy cast=(Display *) */
@@ -32566,7 +32783,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXGetConfig(dpy, vis, attrib, value);
-@@ -326,8 +326,8 @@
+@@ -326,8 +326,8 @@ public static final int glXGetConfig(int /*long*/ dpy, XVisualInfo vis, int attr
lock.unlock();
}
}
@@ -32577,7 +32794,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXGetCurrentContext();
-@@ -335,8 +335,8 @@
+@@ -335,8 +335,8 @@ public static final int /*long*/ glXGetCurrentContext() {
lock.unlock();
}
}
@@ -32588,7 +32805,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXGetCurrentDrawable();
-@@ -348,8 +348,8 @@
+@@ -348,8 +348,8 @@ public static final int /*long*/ glXGetCurrentDrawable() {
* @param dpy cast=(Display *)
* @param ctx cast=(GLXContext)
*/
@@ -32599,7 +32816,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXIsDirect(dpy, ctx);
-@@ -362,8 +362,8 @@
+@@ -362,8 +362,8 @@ public static final boolean glXIsDirect(int /*long*/ dpy, int /*long*/ ctx) {
* @param drawable cast=(GLXDrawable)
* @param ctx cast=(GLXContext)
*/
@@ -32610,7 +32827,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXMakeCurrent(dpy, drawable, ctx);
-@@ -372,8 +372,8 @@
+@@ -372,8 +372,8 @@ public static final boolean glXMakeCurrent(int /*long*/ dpy, int /*long*/ drawab
}
}
/** @param dpy cast=(Display *) */
@@ -32621,7 +32838,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXQueryExtension(dpy, errorBase, eventBase);
-@@ -382,8 +382,8 @@
+@@ -382,8 +382,8 @@ public static final boolean glXQueryExtension(int /*long*/ dpy, int[] errorBase,
}
}
/** @param dpy cast=(Display *) */
@@ -32632,7 +32849,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXQueryExtensionsString(dpy, screen);
-@@ -392,8 +392,8 @@
+@@ -392,8 +392,8 @@ public static final int /*long*/ glXQueryExtensionsString(int /*long*/ dpy, int
}
}
/** @param dpy cast=(Display *) */
@@ -32643,7 +32860,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXQueryServerString(dpy, screen, name);
-@@ -406,8 +406,8 @@
+@@ -406,8 +406,8 @@ public static final int /*long*/ glXQueryServerString(int /*long*/ dpy, int scre
* @param major flags=no_in
* @param minor flags=no_in
*/
@@ -32654,7 +32871,7 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
return _glXQueryVersion(dpy, major, minor);
-@@ -419,8 +419,8 @@
+@@ -419,8 +419,8 @@ public static final boolean glXQueryVersion(int /*long*/ dpy, int[] major, int[]
* @param dpy cast=(Display *)
* @param drawable cast=(GLXDrawable)
*/
@@ -32665,17 +32882,18 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/sw
lock.lock();
try {
_glXSwapBuffers(dpy, drawable);
-@@ -450,5 +450,5 @@
+@@ -450,5 +450,5 @@ public static final void glXWaitX() {
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(XVisualInfo dest, int /*long*/ src, int size);
+public static final native void memmove(XVisualInfo dest, long /*int*/ src, int size);
}
-diff -urN x86/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java x86_64/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java
---- x86/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java 2009-05-29 17:30:32.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java 2009-09-17 08:48:22.000000000 -0400
-@@ -12,7 +12,7 @@
+diff --git a/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java b/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java
+index 8faa6cf..c7b6733 100644
+--- a/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java
++++ b/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java
+@@ -12,7 +12,7 @@ package org.eclipse.swt.internal.opengl.glx;
public class XVisualInfo {
/** @field cast=(Visual *) */
@@ -32684,10 +32902,11 @@ diff -urN x86/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java x86_64/org/ec
public int visualid;
public int screen;
public int depth;
-diff -urN x86/org/eclipse/swt/internal/theme/ButtonDrawData.java x86_64/org/eclipse/swt/internal/theme/ButtonDrawData.java
---- x86/org/eclipse/swt/internal/theme/ButtonDrawData.java 2006-04-26 14:44:02.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/theme/ButtonDrawData.java 2009-09-17 08:48:24.000000000 -0400
-@@ -25,10 +25,10 @@
+diff --git a/org/eclipse/swt/internal/theme/ButtonDrawData.java b/org/eclipse/swt/internal/theme/ButtonDrawData.java
+index a170c1f..1b2442b 100644
+--- a/org/eclipse/swt/internal/theme/ButtonDrawData.java
++++ b/org/eclipse/swt/internal/theme/ButtonDrawData.java
+@@ -25,10 +25,10 @@ public ButtonDrawData() {
void draw(Theme theme, GC gc, Rectangle bounds) {
int state = this.state[DrawData.WIDGET_WHOLE];
@@ -32701,7 +32920,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/ButtonDrawData.java x86_64/org/ecli
theme.transferClipping (gc, gtkStyle);
int indicator_size = theme.getWidgetProperty(radioButtonHandle, "indicator-size");
int indicator_spacing = theme.getWidgetProperty(radioButtonHandle, "indicator-spacing");
-@@ -74,8 +74,8 @@
+@@ -74,8 +74,8 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
}
if ((style & SWT.CHECK) != 0) {
@@ -32712,7 +32931,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/ButtonDrawData.java x86_64/org/ecli
theme.transferClipping (gc, gtkStyle);
int indicator_size = theme.getWidgetProperty(checkButtonHandle, "indicator-size");
int indicator_spacing = theme.getWidgetProperty(checkButtonHandle, "indicator-spacing");
-@@ -122,8 +122,8 @@
+@@ -122,8 +122,8 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
if ((style & SWT.PUSH) != 0) {
@@ -32723,10 +32942,11 @@ diff -urN x86/org/eclipse/swt/internal/theme/ButtonDrawData.java x86_64/org/ecli
theme.transferClipping (gc, gtkStyle);
int focus_line_width = theme.getWidgetProperty(buttonHandle, "focus-line-width");
int focus_padding = theme.getWidgetProperty(buttonHandle, "focus-padding");
-diff -urN x86/org/eclipse/swt/internal/theme/ComboDrawData.java x86_64/org/eclipse/swt/internal/theme/ComboDrawData.java
---- x86/org/eclipse/swt/internal/theme/ComboDrawData.java 2006-04-26 14:44:02.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/theme/ComboDrawData.java 2009-09-17 08:48:24.000000000 -0400
-@@ -24,9 +24,9 @@
+diff --git a/org/eclipse/swt/internal/theme/ComboDrawData.java b/org/eclipse/swt/internal/theme/ComboDrawData.java
+index 3bab8a1..f476292 100644
+--- a/org/eclipse/swt/internal/theme/ComboDrawData.java
++++ b/org/eclipse/swt/internal/theme/ComboDrawData.java
+@@ -24,9 +24,9 @@ public ComboDrawData() {
}
void draw(Theme theme, GC gc, Rectangle bounds) {
@@ -32739,7 +32959,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/ComboDrawData.java x86_64/org/eclip
theme.transferClipping(gc, gtkStyle);
int x = bounds.x;
-@@ -61,10 +61,10 @@
+@@ -61,10 +61,10 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
OS.gtk_paint_box(gtkStyle, drawable, state_type, shadow_type, null, buttonHandle, detail, arrow_button_x, y, arrow_button_width, height);
}
byte[] arrow_detail = Converter.wcsToMbcs(null, "arrow", true);
@@ -32752,7 +32972,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/ComboDrawData.java x86_64/org/eclip
gtkStyle = OS.gtk_widget_get_style(entryHandle);
theme.transferClipping(gc, gtkStyle);
state_type = getStateType(DrawData.WIDGET_WHOLE);
-@@ -100,8 +100,8 @@
+@@ -100,8 +100,8 @@ int getStateType(int part) {
int hit(Theme theme, Point position, Rectangle bounds) {
if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
@@ -32763,10 +32983,11 @@ diff -urN x86/org/eclipse/swt/internal/theme/ComboDrawData.java x86_64/org/eclip
int interior_focus = theme.getWidgetProperty(buttonHandle, "interior-focus");
int focus_line_width = theme.getWidgetProperty(buttonHandle, "focus-line-width");
int focus_padding = theme.getWidgetProperty(buttonHandle, "focus-padding");
-diff -urN x86/org/eclipse/swt/internal/theme/DrawData.java x86_64/org/eclipse/swt/internal/theme/DrawData.java
---- x86/org/eclipse/swt/internal/theme/DrawData.java 2006-04-26 14:44:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/theme/DrawData.java 2009-09-17 08:48:24.000000000 -0400
-@@ -79,21 +79,21 @@
+diff --git a/org/eclipse/swt/internal/theme/DrawData.java b/org/eclipse/swt/internal/theme/DrawData.java
+index f4492b5..40fbec3 100644
+--- a/org/eclipse/swt/internal/theme/DrawData.java
++++ b/org/eclipse/swt/internal/theme/DrawData.java
+@@ -79,21 +79,21 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
}
void drawImage(Theme theme, Image image, GC gc, Rectangle bounds) {
@@ -32794,7 +33015,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/DrawData.java x86_64/org/eclipse/sw
OS.g_object_unref(pixbuf);
//TODO - stretching
if (rendered != 0) {
-@@ -106,12 +106,12 @@
+@@ -106,12 +106,12 @@ void drawImage(Theme theme, Image image, GC gc, Rectangle bounds) {
}
void drawText(Theme theme, String text, int flags, GC gc, Rectangle bounds) {
@@ -32811,7 +33032,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/DrawData.java x86_64/org/eclipse/sw
int[] width = new int[1], height = new int[1];
OS.pango_layout_get_size(layout, width, height);
OS.pango_layout_set_width(layout, bounds.width * OS.PANGO_SCALE);
-@@ -160,7 +160,7 @@
+@@ -160,7 +160,7 @@ int getStateType(int part) {
return state_type;
}
@@ -32820,7 +33041,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/DrawData.java x86_64/org/eclipse/sw
return theme.labelHandle;
}
-@@ -169,9 +169,9 @@
+@@ -169,9 +169,9 @@ int hit(Theme theme, Point position, Rectangle bounds) {
}
Rectangle measureText(Theme theme, String text, int flags, GC gc, Rectangle bounds) {
@@ -32832,10 +33053,11 @@ diff -urN x86/org/eclipse/swt/internal/theme/DrawData.java x86_64/org/eclipse/sw
if (bounds != null) OS.pango_layout_set_width(layout, bounds.width);
if ((flags & DrawData.DRAW_LEFT) != 0) {
OS.pango_layout_set_alignment(layout, OS.PANGO_ALIGN_LEFT);
-diff -urN x86/org/eclipse/swt/internal/theme/ExpanderDrawData.java x86_64/org/eclipse/swt/internal/theme/ExpanderDrawData.java
---- x86/org/eclipse/swt/internal/theme/ExpanderDrawData.java 2006-04-26 14:44:02.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/theme/ExpanderDrawData.java 2009-09-17 08:48:24.000000000 -0400
-@@ -22,9 +22,9 @@
+diff --git a/org/eclipse/swt/internal/theme/ExpanderDrawData.java b/org/eclipse/swt/internal/theme/ExpanderDrawData.java
+index 7553116..3f98b50 100644
+--- a/org/eclipse/swt/internal/theme/ExpanderDrawData.java
++++ b/org/eclipse/swt/internal/theme/ExpanderDrawData.java
+@@ -22,9 +22,9 @@ public ExpanderDrawData() {
}
void draw(Theme theme, GC gc, Rectangle bounds) {
@@ -32848,7 +33070,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/ExpanderDrawData.java x86_64/org/ec
theme.transferClipping(gc, gtkStyle);
int state_type = getStateType(DrawData.WIDGET_WHOLE);
int expander_style = OS.GTK_EXPANDER_COLAPSED;
-@@ -38,7 +38,7 @@
+@@ -38,7 +38,7 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
int hit(Theme theme, Point position, Rectangle bounds) {
if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
@@ -32857,10 +33079,11 @@ diff -urN x86/org/eclipse/swt/internal/theme/ExpanderDrawData.java x86_64/org/ec
int expander_size = theme.getWidgetProperty(treeHandle, "expander-size");
if (new Rectangle(bounds.x, bounds.y, expander_size, expander_size).contains(position)) {
return DrawData.WIDGET_WHOLE;
-diff -urN x86/org/eclipse/swt/internal/theme/GroupDrawData.java x86_64/org/eclipse/swt/internal/theme/GroupDrawData.java
---- x86/org/eclipse/swt/internal/theme/GroupDrawData.java 2006-04-26 14:44:02.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/theme/GroupDrawData.java 2009-09-17 08:48:24.000000000 -0400
-@@ -29,9 +29,9 @@
+diff --git a/org/eclipse/swt/internal/theme/GroupDrawData.java b/org/eclipse/swt/internal/theme/GroupDrawData.java
+index bd18278..fa3d414 100644
+--- a/org/eclipse/swt/internal/theme/GroupDrawData.java
++++ b/org/eclipse/swt/internal/theme/GroupDrawData.java
+@@ -29,9 +29,9 @@ public GroupDrawData() {
static final int GROUP_HEADER_X = 9;
static final int GROUP_HEADER_PAD = 2;
void draw(Theme theme, GC gc, Rectangle bounds) {
@@ -32873,10 +33096,11 @@ diff -urN x86/org/eclipse/swt/internal/theme/GroupDrawData.java x86_64/org/eclip
theme.transferClipping(gc, gtkStyle);
int xthickness = OS.gtk_style_get_xthickness(gtkStyle);
int ythickness = OS.gtk_style_get_ythickness(gtkStyle);
-diff -urN x86/org/eclipse/swt/internal/theme/ProgressBarDrawData.java x86_64/org/eclipse/swt/internal/theme/ProgressBarDrawData.java
---- x86/org/eclipse/swt/internal/theme/ProgressBarDrawData.java 2006-04-26 14:44:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/theme/ProgressBarDrawData.java 2009-09-17 08:48:24.000000000 -0400
-@@ -22,9 +22,9 @@
+diff --git a/org/eclipse/swt/internal/theme/ProgressBarDrawData.java b/org/eclipse/swt/internal/theme/ProgressBarDrawData.java
+index 04d3ea9..e3b843b 100644
+--- a/org/eclipse/swt/internal/theme/ProgressBarDrawData.java
++++ b/org/eclipse/swt/internal/theme/ProgressBarDrawData.java
+@@ -22,9 +22,9 @@ public ProgressBarDrawData() {
}
void draw(Theme theme, GC gc, Rectangle bounds) {
@@ -32889,10 +33113,11 @@ diff -urN x86/org/eclipse/swt/internal/theme/ProgressBarDrawData.java x86_64/org
theme.transferClipping(gc, gtkStyle);
byte[] detail = Converter.wcsToMbcs(null, "trough", true);
int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;
-diff -urN x86/org/eclipse/swt/internal/theme/TabFolderDrawData.java x86_64/org/eclipse/swt/internal/theme/TabFolderDrawData.java
---- x86/org/eclipse/swt/internal/theme/TabFolderDrawData.java 2006-04-26 14:44:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/theme/TabFolderDrawData.java 2009-09-17 08:48:24.000000000 -0400
-@@ -31,9 +31,9 @@
+diff --git a/org/eclipse/swt/internal/theme/TabFolderDrawData.java b/org/eclipse/swt/internal/theme/TabFolderDrawData.java
+index a261ec4..84cabdf 100644
+--- a/org/eclipse/swt/internal/theme/TabFolderDrawData.java
++++ b/org/eclipse/swt/internal/theme/TabFolderDrawData.java
+@@ -31,9 +31,9 @@ public TabFolderDrawData() {
}
void draw(Theme theme, GC gc, Rectangle bounds) {
@@ -32905,10 +33130,11 @@ diff -urN x86/org/eclipse/swt/internal/theme/TabFolderDrawData.java x86_64/org/e
theme.transferClipping(gc, gtkStyle);
int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;
height -= tabsHeight;
-diff -urN x86/org/eclipse/swt/internal/theme/TabItemDrawData.java x86_64/org/eclipse/swt/internal/theme/TabItemDrawData.java
---- x86/org/eclipse/swt/internal/theme/TabItemDrawData.java 2006-04-26 14:44:02.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/theme/TabItemDrawData.java 2009-09-17 08:48:24.000000000 -0400
-@@ -27,8 +27,8 @@
+diff --git a/org/eclipse/swt/internal/theme/TabItemDrawData.java b/org/eclipse/swt/internal/theme/TabItemDrawData.java
+index 00b05e2..b0d7454 100644
+--- a/org/eclipse/swt/internal/theme/TabItemDrawData.java
++++ b/org/eclipse/swt/internal/theme/TabItemDrawData.java
+@@ -27,8 +27,8 @@ public TabItemDrawData() {
}
Rectangle computeTrim(Theme theme, GC gc) {
@@ -32919,7 +33145,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/TabItemDrawData.java x86_64/org/ecl
int hborder, vborder;
if (OS.GTK_VERSION >= OS.VERSION(2, 4, 0)) {
hborder = theme.getWidgetProperty(notebookHandle, "tab-hborder");
-@@ -50,9 +50,9 @@
+@@ -50,9 +50,9 @@ Rectangle computeTrim(Theme theme, GC gc) {
}
void draw(Theme theme, GC gc, Rectangle bounds) {
@@ -32932,10 +33158,11 @@ diff -urN x86/org/eclipse/swt/internal/theme/TabItemDrawData.java x86_64/org/ecl
theme.transferClipping(gc, gtkStyle);
int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;
if ((state[DrawData.WIDGET_WHOLE] & DrawData.SELECTED) == 0) {
-diff -urN x86/org/eclipse/swt/internal/theme/Theme.java x86_64/org/eclipse/swt/internal/theme/Theme.java
---- x86/org/eclipse/swt/internal/theme/Theme.java 2006-04-26 14:44:02.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/theme/Theme.java 2009-09-17 08:48:24.000000000 -0400
-@@ -18,7 +18,7 @@
+diff --git a/org/eclipse/swt/internal/theme/Theme.java b/org/eclipse/swt/internal/theme/Theme.java
+index a174a93..7a7320d 100644
+--- a/org/eclipse/swt/internal/theme/Theme.java
++++ b/org/eclipse/swt/internal/theme/Theme.java
+@@ -18,7 +18,7 @@ import org.eclipse.swt.internal.gtk.*;
public class Theme {
Device device;
@@ -32944,7 +33171,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/Theme.java x86_64/org/eclipse/swt/i
frameHandle, entryHandle, checkButtonHandle, radioButtonHandle,
notebookHandle, treeHandle, progressHandle, toolbarHandle,
labelHandle, separatorHandle;
-@@ -68,29 +68,29 @@
+@@ -68,29 +68,29 @@ public Theme(Device device) {
}
//TODO - share this code
@@ -32982,7 +33209,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/Theme.java x86_64/org/eclipse/swt/i
OS.memmove(maskLine, maskOffset, maskStride);
for (int x=0; x<w[0]; x++) {
if (maskLine[x * 3] == 0) {
-@@ -109,10 +109,10 @@
+@@ -109,10 +109,10 @@ static int /*long*/ createPixbuf(Image image) {
if (hasAlpha) {
byte [] alpha = data.alphaData;
int stride = OS.gdk_pixbuf_get_rowstride (pixbuf);
@@ -32995,7 +33222,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/Theme.java x86_64/org/eclipse/swt/i
OS.memmove (line, offset, stride);
for (int x = 0; x < w [0]; x++) {
line [x*4+3] = alpha [y*w [0]+x];
-@@ -218,18 +218,18 @@
+@@ -218,18 +218,18 @@ public Rectangle measureText(GC gc, Rectangle bounds, DrawData data, String text
return data.measureText(this, text, flags, gc, bounds);
}
@@ -33019,7 +33246,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/Theme.java x86_64/org/eclipse/swt/i
if (damageRgn != 0) {
if (clipping != 0) {
clipping = OS.gdk_region_new();
-@@ -239,7 +239,7 @@
+@@ -239,7 +239,7 @@ void transferClipping(GC gc, int /*long*/ style) {
clipping = damageRgn;
}
}
@@ -33028,10 +33255,11 @@ diff -urN x86/org/eclipse/swt/internal/theme/Theme.java x86_64/org/eclipse/swt/i
for (int i = 0; i < 5; i++) {
OS.gtk_style_get_fg_gc (style, i, curGC);
if (curGC[0] != 0) OS.gdk_gc_set_clip_region (curGC[0], clipping);
-diff -urN x86/org/eclipse/swt/internal/theme/ToolBarDrawData.java x86_64/org/eclipse/swt/internal/theme/ToolBarDrawData.java
---- x86/org/eclipse/swt/internal/theme/ToolBarDrawData.java 2006-04-26 14:44:02.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/theme/ToolBarDrawData.java 2009-09-17 08:48:24.000000000 -0400
-@@ -21,9 +21,9 @@
+diff --git a/org/eclipse/swt/internal/theme/ToolBarDrawData.java b/org/eclipse/swt/internal/theme/ToolBarDrawData.java
+index 4c99b12..584977d 100644
+--- a/org/eclipse/swt/internal/theme/ToolBarDrawData.java
++++ b/org/eclipse/swt/internal/theme/ToolBarDrawData.java
+@@ -21,9 +21,9 @@ public ToolBarDrawData() {
}
void draw(Theme theme, GC gc, Rectangle bounds) {
@@ -33044,10 +33272,11 @@ diff -urN x86/org/eclipse/swt/internal/theme/ToolBarDrawData.java x86_64/org/ecl
theme.transferClipping(gc, gtkStyle);
int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;
byte[] detail = Converter.wcsToMbcs(null, "toolbar", true);
-diff -urN x86/org/eclipse/swt/internal/theme/ToolItemDrawData.java x86_64/org/eclipse/swt/internal/theme/ToolItemDrawData.java
---- x86/org/eclipse/swt/internal/theme/ToolItemDrawData.java 2006-04-26 14:44:02.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/theme/ToolItemDrawData.java 2009-09-17 08:48:24.000000000 -0400
-@@ -27,8 +27,8 @@
+diff --git a/org/eclipse/swt/internal/theme/ToolItemDrawData.java b/org/eclipse/swt/internal/theme/ToolItemDrawData.java
+index 67cc405..40754df 100644
+--- a/org/eclipse/swt/internal/theme/ToolItemDrawData.java
++++ b/org/eclipse/swt/internal/theme/ToolItemDrawData.java
+@@ -27,8 +27,8 @@ public ToolItemDrawData() {
}
Rectangle computeTrim(Theme theme, GC gc) {
@@ -33058,7 +33287,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/ToolItemDrawData.java x86_64/org/ec
int focus_width = theme.getWidgetProperty(buttonHandle, "focus-line-width");
int focus_padding = theme.getWidgetProperty(buttonHandle, "focus-padding");
int xthickness = OS.gtk_style_get_xthickness(gtkStyle);
-@@ -47,13 +47,13 @@
+@@ -47,13 +47,13 @@ Rectangle computeTrim(Theme theme, GC gc) {
void draw(Theme theme, GC gc, Rectangle bounds) {
int state = this.state[DrawData.WIDGET_WHOLE];
@@ -33075,7 +33304,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/ToolItemDrawData.java x86_64/org/ec
theme.transferClipping(gc, gtkStyle);
if ((parent.style & SWT.VERTICAL) != 0) {
OS.gtk_paint_hline(gtkStyle, drawable, state_type, null, separatorHandle, detail, bounds.x, bounds.x + bounds.width, bounds.y + bounds.height / 2);
-@@ -63,8 +63,8 @@
+@@ -63,8 +63,8 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
return;
}
@@ -33086,7 +33315,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/ToolItemDrawData.java x86_64/org/ec
theme.transferClipping (gc, gtkStyle);
int focus_line_width = theme.getWidgetProperty(buttonHandle, "focus-line-width");
int focus_padding = theme.getWidgetProperty(buttonHandle, "focus-padding");
-@@ -83,7 +83,7 @@
+@@ -83,7 +83,7 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
}
int[] relief = new int[1];
@@ -33095,7 +33324,7 @@ diff -urN x86/org/eclipse/swt/internal/theme/ToolItemDrawData.java x86_64/org/ec
OS.gtk_widget_style_get(toolbarHandle, OS.button_relief, relief, 0);
int shadow_type = OS.GTK_SHADOW_OUT;
-@@ -149,8 +149,8 @@
+@@ -149,8 +149,8 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
int hit(Theme theme, Point position, Rectangle bounds) {
if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
if ((style & SWT.DROP_DOWN) != 0) {
@@ -33106,10 +33335,11 @@ diff -urN x86/org/eclipse/swt/internal/theme/ToolItemDrawData.java x86_64/org/ec
int xthickness = OS.gtk_style_get_xthickness(gtkStyle);
int interior_focus = theme.getWidgetProperty(buttonHandle, "interior-focus");
int focus_line_width = theme.getWidgetProperty(buttonHandle, "focus-line-width");
-diff -urN x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl/GLCanvas.java
---- x86/org/eclipse/swt/opengl/GLCanvas.java 2009-05-29 17:30:26.000000000 -0400
-+++ x86_64/org/eclipse/swt/opengl/GLCanvas.java 2009-09-17 08:48:22.000000000 -0400
-@@ -27,9 +27,9 @@
+diff --git a/org/eclipse/swt/opengl/GLCanvas.java b/org/eclipse/swt/opengl/GLCanvas.java
+index af4b7a6..c48546b 100644
+--- a/org/eclipse/swt/opengl/GLCanvas.java
++++ b/org/eclipse/swt/opengl/GLCanvas.java
+@@ -27,9 +27,9 @@ import org.eclipse.swt.internal.opengl.glx.*;
*/
public class GLCanvas extends Canvas {
@@ -33122,7 +33352,7 @@ diff -urN x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl
XVisualInfo vinfo;
static final int MAX_ATTRIBUTES = 32;
-@@ -104,9 +104,9 @@
+@@ -104,9 +104,9 @@ public GLCanvas (Composite parent, int style, GLData data) {
}
glxAttrib [pos++] = 0;
OS.gtk_widget_realize (handle);
@@ -33135,7 +33365,7 @@ diff -urN x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl
if (infoPtr == 0) {
dispose ();
SWT.error (SWT.ERROR_UNSUPPORTED_DEPTH);
-@@ -114,9 +114,9 @@
+@@ -114,9 +114,9 @@ public GLCanvas (Composite parent, int style, GLData data) {
vinfo = new XVisualInfo ();
GLX.memmove (vinfo, infoPtr, XVisualInfo.sizeof);
OS.XFree (infoPtr);
@@ -33148,7 +33378,7 @@ diff -urN x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl
context = GLX.glXCreateContext (xDisplay, vinfo, share, true);
if (context == 0) SWT.error (SWT.ERROR_NO_HANDLES);
GdkWindowAttr attrs = new GdkWindowAttr ();
-@@ -156,8 +156,8 @@
+@@ -156,8 +156,8 @@ public GLCanvas (Composite parent, int style, GLData data) {
OS.gdk_window_resize (glWindow, clientArea.width, clientArea.height);
break;
case SWT.Dispose:
@@ -33159,7 +33389,7 @@ diff -urN x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl
if (context != 0) {
if (GLX.glXGetCurrentContext () == context) {
GLX.glXMakeCurrent (xDisplay, 0, 0);
-@@ -189,8 +189,8 @@
+@@ -189,8 +189,8 @@ public GLCanvas (Composite parent, int style, GLData data) {
*/
public GLData getGLData () {
checkWidget ();
@@ -33170,7 +33400,7 @@ diff -urN x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl
GLData data = new GLData ();
int [] value = new int [1];
GLX.glXGetConfig (xDisplay, vinfo, GLX.GLX_DOUBLEBUFFER, value);
-@@ -252,8 +252,8 @@
+@@ -252,8 +252,8 @@ public boolean isCurrent () {
public void setCurrent () {
checkWidget ();
if (GLX.glXGetCurrentContext () == context) return;
@@ -33181,7 +33411,7 @@ diff -urN x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl
GLX.glXMakeCurrent (xDisplay, xWindow, context);
}
-@@ -267,8 +267,8 @@
+@@ -267,8 +267,8 @@ public void setCurrent () {
*/
public void swapBuffers () {
checkWidget ();
@@ -33192,10 +33422,11 @@ diff -urN x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl
GLX.glXSwapBuffers (xDisplay, xWindow);
}
}
-diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/printing/PrintDialog.java
---- x86/org/eclipse/swt/printing/PrintDialog.java 2009-05-29 17:30:32.000000000 -0400
-+++ x86_64/org/eclipse/swt/printing/PrintDialog.java 2009-09-17 08:48:24.000000000 -0400
-@@ -34,7 +34,7 @@
+diff --git a/org/eclipse/swt/printing/PrintDialog.java b/org/eclipse/swt/printing/PrintDialog.java
+index f8bc7cb..2deec27 100644
+--- a/org/eclipse/swt/printing/PrintDialog.java
++++ b/org/eclipse/swt/printing/PrintDialog.java
+@@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.*;
public class PrintDialog extends Dialog {
PrinterData printerData = new PrinterData();
@@ -33204,7 +33435,7 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
int index;
byte [] settingsData;
-@@ -292,7 +292,7 @@
+@@ -292,7 +292,7 @@ public PrinterData open() {
return Printer.getDefaultPrinterData();
} else {
byte [] titleBytes = Converter.wcsToMbcs (null, getText(), true);
@@ -33213,7 +33444,7 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
while (topHandle != 0 && !OS.GTK_IS_WINDOW(topHandle)) {
topHandle = OS.gtk_widget_get_parent(topHandle);
}
-@@ -305,8 +305,8 @@
+@@ -305,8 +305,8 @@ public PrinterData open() {
OS.GTK_PRINT_CAPABILITY_COLLATE | OS.GTK_PRINT_CAPABILITY_COPIES | OS.GTK_PRINT_CAPABILITY_PAGE_SET);
/* Set state into print dialog settings. */
@@ -33224,7 +33455,7 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
if (printerData.otherData != null) {
Printer.restore(printerData.otherData, settings, page_setup);
-@@ -361,7 +361,7 @@
+@@ -361,7 +361,7 @@ public PrinterData open() {
Display display = getParent() != null ? getParent().getDisplay (): Display.getCurrent ();
int signalId = 0;
@@ -33233,7 +33464,7 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
if ((getStyle () & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, ((LONG) display.getData (GET_EMISSION_PROC_KEY)).value, handle, 0);
-@@ -380,7 +380,7 @@
+@@ -380,7 +380,7 @@ public PrinterData open() {
OS.g_signal_remove_emission_hook (signalId, hookId);
}
if (response == OS.GTK_RESPONSE_OK) {
@@ -33242,7 +33473,7 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
if (printer != 0) {
/* Get state from print dialog. */
settings = OS.gtk_print_unix_dialog_get_settings(handle); // must unref
-@@ -394,7 +394,7 @@
+@@ -394,7 +394,7 @@ public PrinterData open() {
case OS.GTK_PRINT_PAGES_RANGES:
data.scope = PrinterData.PAGE_RANGE;
int[] num_ranges = new int[1];
@@ -33251,7 +33482,7 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
int [] pageRange = new int[2];
int length = num_ranges[0];
int min = Integer.MAX_VALUE, max = 0;
-@@ -416,7 +416,7 @@
+@@ -416,7 +416,7 @@ public PrinterData open() {
data.printToFile = data.name.equals("Print to File"); //$NON-NLS-1$
if (data.printToFile) {
@@ -33260,7 +33491,7 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
int length = OS.strlen (address);
byte [] buffer = new byte [length];
OS.memmove (buffer, address, length);
-@@ -429,7 +429,7 @@
+@@ -429,7 +429,7 @@ public PrinterData open() {
/* Save other print_settings data as key/value pairs in otherData. */
Callback printSettingsCallback = new Callback(this, "GtkPrintSettingsFunc", 3); //$NON-NLS-1$
@@ -33269,7 +33500,7 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
if (GtkPrintSettingsFunc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
index = 0;
settingsData = new byte[1024];
-@@ -445,7 +445,7 @@
+@@ -445,7 +445,7 @@ public PrinterData open() {
store("bottom_margin", OS.gtk_page_setup_get_bottom_margin(page_setup, OS.GTK_UNIT_MM)); //$NON-NLS-1$
store("left_margin", OS.gtk_page_setup_get_left_margin(page_setup, OS.GTK_UNIT_MM)); //$NON-NLS-1$
store("right_margin", OS.gtk_page_setup_get_right_margin(page_setup, OS.GTK_UNIT_MM)); //$NON-NLS-1$
@@ -33278,7 +33509,7 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
storeBytes("paper_size_name", OS.gtk_paper_size_get_name(paper_size)); //$NON-NLS-1$
storeBytes("paper_size_display_name", OS.gtk_paper_size_get_display_name(paper_size)); //$NON-NLS-1$
storeBytes("paper_size_ppd_name", OS.gtk_paper_size_get_ppd_name(paper_size)); //$NON-NLS-1$
-@@ -463,7 +463,7 @@
+@@ -463,7 +463,7 @@ public PrinterData open() {
}
}
@@ -33287,7 +33518,7 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
int length = OS.strlen (key);
byte [] keyBuffer = new byte [length];
OS.memmove (keyBuffer, key, length);
-@@ -486,7 +486,7 @@
+@@ -486,7 +486,7 @@ void store(String key, boolean value) {
store(key, String.valueOf(value));
}
@@ -33296,10 +33527,11 @@ diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/p
int length = OS.strlen (value);
byte [] valueBuffer = new byte [length];
OS.memmove (valueBuffer, value, length);
-diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/printing/Printer.java
---- x86/org/eclipse/swt/printing/Printer.java 2009-05-29 17:30:32.000000000 -0400
-+++ x86_64/org/eclipse/swt/printing/Printer.java 2009-09-17 08:48:24.000000000 -0400
-@@ -46,12 +46,12 @@
+diff --git a/org/eclipse/swt/printing/Printer.java b/org/eclipse/swt/printing/Printer.java
+index 8ff2500..ae0eca7 100644
+--- a/org/eclipse/swt/printing/Printer.java
++++ b/org/eclipse/swt/printing/Printer.java
+@@ -46,12 +46,12 @@ public final class Printer extends Device {
static PrinterData [] printerList;
PrinterData data;
@@ -33318,7 +33550,7 @@ diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/print
/**
* whether or not a GC was created for this printer
-@@ -82,18 +82,18 @@
+@@ -82,18 +82,18 @@ public static PrinterData[] getPrinterList() {
OS.g_thread_init (0);
}
OS.gtk_set_locale();
@@ -33340,7 +33572,7 @@ diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/print
int length = printerList.length;
PrinterData [] newList = new PrinterData [length + 1];
System.arraycopy (printerList, 0, newList, 0, length);
-@@ -129,18 +129,18 @@
+@@ -129,18 +129,18 @@ public static PrinterData getDefaultPrinterData() {
OS.g_thread_init (0);
}
OS.gtk_set_locale();
@@ -33362,7 +33594,7 @@ diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/print
if (OS.gtk_printer_is_default(printer)) {
printerList[0] = printerDataFromGtkPrinter(printer);
return 1;
-@@ -150,9 +150,9 @@
+@@ -150,9 +150,9 @@ static int /*long*/ GtkPrinterFunc_Default (int /*long*/ printer, int /*long*/ u
return 0;
}
@@ -33374,7 +33606,7 @@ diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/print
if (GtkPrinterFunc_FindNamedPrinter == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
printer = 0;
OS.gtk_enumerate_printers(GtkPrinterFunc_FindNamedPrinter, 0, 0, true);
-@@ -160,7 +160,7 @@
+@@ -160,7 +160,7 @@ int /*long*/ gtkPrinterFromPrinterData() {
return printer;
}
@@ -33383,7 +33615,7 @@ diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/print
PrinterData pd = printerDataFromGtkPrinter(printer);
if (pd.driver.equals(data.driver) && pd.name.equals(data.name)) {
this.printer = printer;
-@@ -172,9 +172,9 @@
+@@ -172,9 +172,9 @@ int /*long*/ GtkPrinterFunc_FindNamedPrinter (int /*long*/ printer, int /*long*/
return 0;
}
@@ -33396,7 +33628,7 @@ diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/print
int length = OS.strlen (address);
byte [] buffer = new byte [length];
OS.memmove (buffer, address, length);
-@@ -192,7 +192,7 @@
+@@ -192,7 +192,7 @@ static PrinterData printerDataFromGtkPrinter(int /*long*/ printer) {
/*
* Restore printer settings and page_setup data from data.
*/
@@ -33405,7 +33637,7 @@ diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/print
settingsData = data;
start = end = 0;
while (end < settingsData.length && settingsData[end] != 0) {
-@@ -225,7 +225,7 @@
+@@ -225,7 +225,7 @@ static void restore(byte [] data, int /*long*/ settings, int /*long*/ page_setup
double width = restoreDouble("paper_size_width"); //$NON-NLS-1$
double height = restoreDouble("paper_size_height"); //$NON-NLS-1$
boolean custom = restoreBoolean("paper_size_is_custom"); //$NON-NLS-1$
@@ -33414,7 +33646,7 @@ diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/print
if (custom) {
if (ppd_name.length > 0) {
paper_size = OS.gtk_paper_size_new_from_ppd(ppd_name, display_name, width, height);
-@@ -350,8 +350,8 @@
+@@ -350,8 +350,8 @@ static byte [] restoreBytes(String key, boolean nullTerminate) {
public Font getSystemFont () {
checkDevice ();
if (systemFont != null) return systemFont;
@@ -33425,7 +33657,7 @@ diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/print
return systemFont = Font.gtk_new (this, defaultFont);
}
-@@ -368,11 +368,11 @@
+@@ -368,11 +368,11 @@ public Font getSystemFont () {
* @param data the platform specific GC data
* @return the platform specific GC handle
*/
@@ -33440,7 +33672,7 @@ diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/print
if (gdkGC == 0) SWT.error (SWT.ERROR_NO_HANDLES);
if (data != null) {
if (isGCCreated) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
-@@ -408,7 +408,7 @@
+@@ -408,7 +408,7 @@ public int /*long*/ internal_new_GC(GCData data) {
* @param hDC the platform specific GC handle
* @param data the platform specific GC data
*/
@@ -33449,10 +33681,11 @@ diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/print
if (data != null) isGCCreated = false;
OS.g_object_unref (gdkGC);
if (data != null) {
-diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/program/Program.java
---- x86/org/eclipse/swt/program/Program.java 2008-08-05 10:59:14.000000000 -0400
-+++ x86_64/org/eclipse/swt/program/Program.java 2009-09-17 08:48:24.000000000 -0400
-@@ -42,7 +42,7 @@
+diff --git a/org/eclipse/swt/program/Program.java b/org/eclipse/swt/program/Program.java
+index 57456d5..78b6e07 100644
+--- a/org/eclipse/swt/program/Program.java
++++ b/org/eclipse/swt/program/Program.java
+@@ -42,7 +42,7 @@ public final class Program {
*/
boolean gnomeExpectUri;
@@ -33461,7 +33694,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
static final String[] CDE_ICON_EXT = { ".m.pm", ".l.pm", ".s.pm", ".t.pm" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
static final String[] CDE_MASK_EXT = { ".m_m.bm", ".l_m.bm", ".s_m.bm", ".t_m.bm" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-@@ -70,11 +70,11 @@
+@@ -70,11 +70,11 @@ static int getDesktop(final Display display) {
int desktop = DESKTOP_UNKNOWN;
/* Get the list of properties on the root window. */
@@ -33477,7 +33710,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
if (propList != 0) {
OS.memmove(property, propList, (property.length * OS.PTR_SIZEOF));
OS.XFree(propList);
-@@ -93,10 +93,10 @@
+@@ -93,10 +93,10 @@ static int getDesktop(final Display display) {
*/
if (desktop == DESKTOP_UNKNOWN) {
byte[] gnomeName = Converter.wcsToMbcs(null, "_NET_SUPPORTING_WM_CHECK", true);
@@ -33490,7 +33723,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
display.setData(ICON_THEME_DATA, new LONG(icon_theme));
display.addListener(SWT.Dispose, new Listener() {
public void handleEvent(Event event) {
-@@ -112,10 +112,10 @@
+@@ -112,10 +112,10 @@ static int getDesktop(final Display display) {
});
/* Check for libgnomevfs-2 version 2.4 */
byte[] buffer = Converter.wcsToMbcs(null, "libgnomevfs-2.so.0", true);
@@ -33503,7 +33736,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
if (gnome_vfs_url_show != 0) {
desktop = DESKTOP_GNOME_24;
}
-@@ -131,7 +131,7 @@
+@@ -131,7 +131,7 @@ static int getDesktop(final Display display) {
*/
if (desktop == DESKTOP_UNKNOWN) {
byte[] cdeName = Converter.wcsToMbcs(null, "_DT_SM_PREFERENCES", true);
@@ -33512,7 +33745,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
for (int index = 0; desktop == DESKTOP_UNKNOWN && index < property.length; index++) {
if (property[index] == OS.None) continue; /* do not match atoms that do not exist */
if (property[index] == cde && cde_init(display)) desktop = DESKTOP_CDE;
-@@ -146,7 +146,7 @@
+@@ -146,7 +146,7 @@ boolean cde_execute(String fileName) {
/* Use the character encoding for the default locale */
byte[] action = Converter.wcsToMbcs(null, command, true);
byte[] fileArg = Converter.wcsToMbcs(null, fileName, true);
@@ -33521,7 +33754,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
OS.memmove(ptr, fileArg, fileArg.length);
DtActionArg args = new DtActionArg();
args.argClass = CDE.DtACTION_FILE;
-@@ -176,7 +176,7 @@
+@@ -176,7 +176,7 @@ static String cde_getAttribute(String dataType, String attrName) {
byte[] dataTypeBuf = Converter.wcsToMbcs(null, dataType, true);
byte[] attrNameBuf = Converter.wcsToMbcs(null, attrName, true);
byte[] optNameBuf = null;
@@ -33530,7 +33763,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
if (attrValue == 0) return null;
int length = OS.strlen(attrValue);
byte[] attrValueBuf = new byte[length];
-@@ -189,11 +189,11 @@
+@@ -189,11 +189,11 @@ static String cde_getAttribute(String dataType, String attrName) {
static Hashtable cde_getDataTypeInfo() {
Hashtable dataTypeInfo = new Hashtable();
int index;
@@ -33544,7 +33777,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
OS.memmove(dataType, dataTypeList + (index++ * 4), 4);
while (dataType[0] != 0) {
int length = OS.strlen(dataType[0]);
-@@ -277,13 +277,13 @@
+@@ -277,13 +277,13 @@ static boolean cde_init(Display display) {
/* Use the character encoding for the default locale */
CDE.XtToolkitInitialize();
@@ -33562,7 +33795,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
cdeShell = CDE.XtAppCreateShell (appName, appClass, widgetClass, xDisplay, null, 0);
CDE.XtSetMappedWhenManaged (cdeShell, false);
CDE.XtResizeWidget (cdeShell, 10, 10, 0);
-@@ -343,10 +343,10 @@
+@@ -343,10 +343,10 @@ static String[] parseCommand(String cmd) {
*/
boolean gnome_24_execute(String fileName) {
byte[] mimeTypeBuffer = Converter.wcsToMbcs(null, name, true);
@@ -33576,7 +33809,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
int result = GNOME.gnome_vfs_mime_application_launch(ptr, list);
GNOME.gnome_vfs_mime_application_free(ptr);
GNOME.g_free(uri);
-@@ -359,7 +359,7 @@
+@@ -359,7 +359,7 @@ boolean gnome_24_execute(String fileName) {
*/
static boolean gnome_24_launch(String fileName) {
byte[] fileNameBuffer = Converter.wcsToMbcs(null, fileName, true);
@@ -33585,7 +33818,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
int result = GNOME.gnome_vfs_url_show(uri);
GNOME.g_free(uri);
return (result == GNOME.GNOME_VFS_OK);
-@@ -372,7 +372,7 @@
+@@ -372,7 +372,7 @@ boolean gnome_execute(String fileName) {
if (gnomeExpectUri) {
/* Convert the given path into a URL */
byte[] fileNameBuffer = Converter.wcsToMbcs(null, fileName, true);
@@ -33594,7 +33827,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
if (uri != 0) {
int length = OS.strlen(uri);
if (length > 0) {
-@@ -436,24 +436,24 @@
+@@ -436,24 +436,24 @@ ImageData gnome_getImageData() {
*/
static Hashtable gnome_getMimeInfo() {
Hashtable mimeInfo = new Hashtable();
@@ -33627,7 +33860,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
int extensionLength = OS.strlen(extensionPtr);
byte[] extensionBuffer = new byte[extensionLength];
OS.memmove(extensionBuffer, extensionPtr, extensionLength);
-@@ -475,7 +475,7 @@
+@@ -475,7 +475,7 @@ static String gnome_getMimeType(String extension) {
String mimeType = null;
String fileName = "swt" + extension;
byte[] extensionBuffer = Converter.wcsToMbcs(null, fileName, true);
@@ -33636,7 +33869,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
if (typeName != 0) {
int length = OS.strlen(typeName);
if (length > 0) {
-@@ -490,7 +490,7 @@
+@@ -490,7 +490,7 @@ static String gnome_getMimeType(String extension) {
static Program gnome_getProgram(Display display, String mimeType) {
Program program = null;
byte[] mimeTypeBuffer = Converter.wcsToMbcs(null, mimeType, true);
@@ -33645,7 +33878,7 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
if (ptr != 0) {
program = new Program();
program.display = display;
-@@ -507,9 +507,9 @@
+@@ -507,9 +507,9 @@ static Program gnome_getProgram(Display display, String mimeType) {
buffer = new byte[length + 1];
OS.memmove(buffer, application.id, length);
LONG gnomeIconTheme = (LONG)display.getData(ICON_THEME_DATA);
@@ -33657,10 +33890,11 @@ diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/progra
if (icon_name != 0) path = GNOME.gnome_icon_theme_lookup_icon(gnomeIconTheme.value, icon_name, PREFERRED_ICON_SIZE, null, null);
if (path != 0) {
length = OS.strlen(path);
-diff -urN x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets/Button.java
---- x86/org/eclipse/swt/widgets/Button.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Button.java 2009-09-17 08:48:24.000000000 -0400
-@@ -46,7 +46,7 @@
+diff --git a/org/eclipse/swt/widgets/Button.java b/org/eclipse/swt/widgets/Button.java
+index 41802dc..51f7262 100644
+--- a/org/eclipse/swt/widgets/Button.java
++++ b/org/eclipse/swt/widgets/Button.java
+@@ -46,7 +46,7 @@ import org.eclipse.swt.events.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class Button extends Control {
@@ -33669,7 +33903,7 @@ diff -urN x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets
boolean selected, grayed;
ImageList imageList;
Image image;
-@@ -165,7 +165,7 @@
+@@ -165,7 +165,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
}
if (wHint != SWT.DEFAULT || hHint != SWT.DEFAULT) {
if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_CAN_DEFAULT) != 0) {
@@ -33678,7 +33912,7 @@ diff -urN x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets
GtkBorder border = new GtkBorder ();
OS.gtk_widget_style_get (handle, OS.default_border, buffer, 0);
if (buffer[0] != 0) {
-@@ -266,7 +266,7 @@
+@@ -266,7 +266,7 @@ void deregister () {
if (arrowHandle != 0) display.removeWidget (arrowHandle);
}
@@ -33687,7 +33921,7 @@ diff -urN x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets
if (labelHandle != 0) return labelHandle;
return super.fontHandle ();
}
-@@ -382,14 +382,14 @@
+@@ -382,14 +382,14 @@ public String getText () {
return text;
}
@@ -33705,7 +33939,7 @@ diff -urN x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets
if ((style & SWT.RADIO) != 0) {
if ((parent.getStyle () & SWT.NO_RADIO_GROUP) != 0) {
setSelection (!selected);
-@@ -411,8 +411,8 @@
+@@ -411,8 +411,8 @@ int /*long*/ gtk_clicked (int /*long*/ widget) {
return 0;
}
@@ -33716,7 +33950,7 @@ diff -urN x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets
// widget could be disposed at this point
if (handle == 0) return 0;
if ((style & SWT.PUSH) != 0 && OS.GTK_WIDGET_HAS_DEFAULT (handle)) {
-@@ -422,8 +422,8 @@
+@@ -422,8 +422,8 @@ int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
@@ -33727,7 +33961,7 @@ diff -urN x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets
// widget could be disposed at this point
if (handle == 0) return 0;
if ((style & SWT.PUSH) != 0 && !OS.GTK_WIDGET_HAS_DEFAULT (handle)) {
-@@ -435,8 +435,8 @@
+@@ -435,8 +435,8 @@ int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
@@ -33738,7 +33972,7 @@ diff -urN x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets
if (result != 0) return result;
if ((style & SWT.RADIO) != 0) selected = getSelection ();
return result;
-@@ -640,7 +640,7 @@
+@@ -640,7 +640,7 @@ void setBackgroundColor (GdkColor color) {
if (imageHandle != 0) setBackgroundColor(imageHandle, color);
}
@@ -33747,7 +33981,7 @@ diff -urN x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets
super.setFontDescription (font);
if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font);
if (imageHandle != 0) OS.gtk_widget_modify_font (imageHandle, font);
-@@ -715,7 +715,7 @@
+@@ -715,7 +715,7 @@ public void setImage (Image image) {
if (image.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
imageList = new ImageList ();
int imageIndex = imageList.add (image);
@@ -33756,10 +33990,11 @@ diff -urN x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
if (text.length () == 0) OS.gtk_widget_hide (labelHandle);
OS.gtk_widget_show (imageHandle);
-diff -urN x86/org/eclipse/swt/widgets/Canvas.java x86_64/org/eclipse/swt/widgets/Canvas.java
---- x86/org/eclipse/swt/widgets/Canvas.java 2008-06-05 13:31:08.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Canvas.java 2009-09-17 08:48:24.000000000 -0400
-@@ -147,46 +147,46 @@
+diff --git a/org/eclipse/swt/widgets/Canvas.java b/org/eclipse/swt/widgets/Canvas.java
+index ea6a149..d31f712 100644
+--- a/org/eclipse/swt/widgets/Canvas.java
++++ b/org/eclipse/swt/widgets/Canvas.java
+@@ -147,46 +147,46 @@ public IME getIME () {
return ime;
}
@@ -33818,7 +34053,7 @@ diff -urN x86/org/eclipse/swt/widgets/Canvas.java x86_64/org/eclipse/swt/widgets
if (result != 0) return result;
}
return super.gtk_preedit_changed (imcontext);
-@@ -246,16 +246,16 @@
+@@ -246,16 +246,16 @@ public void scroll (int destX, int destY, int x, int y, int width, int height, b
if (!isVisible ()) return;
boolean isFocus = caret != null && caret.isFocusCaret ();
if (isFocus) caret.killFocus ();
@@ -33839,7 +34074,7 @@ diff -urN x86/org/eclipse/swt/widgets/Canvas.java x86_64/org/eclipse/swt/widgets
OS.gdk_region_subtract (invalidateRegion, visibleRegion);
OS.gdk_region_offset (invalidateRegion, deltaX, deltaY);
GdkRectangle copyRect = new GdkRectangle();
-@@ -272,7 +272,7 @@
+@@ -272,7 +272,7 @@ public void scroll (int destX, int destY, int x, int y, int width, int height, b
// GC gc = new GC (this);
// gc.copyArea (x, y, width, height, destX, destY);
// gc.dispose ();
@@ -33848,7 +34083,7 @@ diff -urN x86/org/eclipse/swt/widgets/Canvas.java x86_64/org/eclipse/swt/widgets
OS.gdk_gc_set_exposures (gdkGC, true);
OS.gdk_draw_drawable (window, gdkGC, window, copyRect.x, copyRect.y, copyRect.x + deltaX, copyRect.y + deltaY, copyRect.width, copyRect.height);
OS.g_object_unref (gdkGC);
-@@ -394,7 +394,7 @@
+@@ -394,7 +394,7 @@ public void setIME (IME ime) {
}
void updateCaret () {
@@ -33857,10 +34092,11 @@ diff -urN x86/org/eclipse/swt/widgets/Canvas.java x86_64/org/eclipse/swt/widgets
if (imHandle == 0) return;
GdkRectangle rect = new GdkRectangle ();
rect.x = caret.x;
-diff -urN x86/org/eclipse/swt/widgets/Caret.java x86_64/org/eclipse/swt/widgets/Caret.java
---- x86/org/eclipse/swt/widgets/Caret.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Caret.java 2009-09-17 08:48:24.000000000 -0400
-@@ -97,13 +97,13 @@
+diff --git a/org/eclipse/swt/widgets/Caret.java b/org/eclipse/swt/widgets/Caret.java
+index 8bfa82f..5f64049 100644
+--- a/org/eclipse/swt/widgets/Caret.java
++++ b/org/eclipse/swt/widgets/Caret.java
+@@ -97,13 +97,13 @@ void createWidget (int index) {
boolean drawCaret () {
if (parent == null) return false;
if (parent.isDisposed ()) return false;
@@ -33877,10 +34113,11 @@ diff -urN x86/org/eclipse/swt/widgets/Caret.java x86_64/org/eclipse/swt/widgets/
OS.gdk_colormap_alloc_color (colormap, color, true, true);
OS.gdk_gc_set_foreground (gc, color);
OS.gdk_gc_set_function (gc, OS.GDK_XOR);
-diff -urN x86/org/eclipse/swt/widgets/ColorDialog.java x86_64/org/eclipse/swt/widgets/ColorDialog.java
---- x86/org/eclipse/swt/widgets/ColorDialog.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/ColorDialog.java 2009-09-17 08:48:24.000000000 -0400
-@@ -114,12 +114,12 @@
+diff --git a/org/eclipse/swt/widgets/ColorDialog.java b/org/eclipse/swt/widgets/ColorDialog.java
+index 257f07a..4d5a46a 100644
+--- a/org/eclipse/swt/widgets/ColorDialog.java
++++ b/org/eclipse/swt/widgets/ColorDialog.java
+@@ -114,12 +114,12 @@ public RGB getRGB () {
*/
public RGB open () {
byte [] buffer = Converter.wcsToMbcs (null, title, true);
@@ -33896,7 +34133,7 @@ diff -urN x86/org/eclipse/swt/widgets/ColorDialog.java x86_64/org/eclipse/swt/wi
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
-@@ -143,7 +143,7 @@
+@@ -143,7 +143,7 @@ public RGB open () {
display.setModalDialog (this);
}
int signalId = 0;
@@ -33905,10 +34142,11 @@ diff -urN x86/org/eclipse/swt/widgets/ColorDialog.java x86_64/org/eclipse/swt/wi
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
-diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/Combo.java
---- x86/org/eclipse/swt/widgets/Combo.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Combo.java 2009-09-17 08:48:24.000000000 -0400
-@@ -57,9 +57,9 @@
+diff --git a/org/eclipse/swt/widgets/Combo.java b/org/eclipse/swt/widgets/Combo.java
+index 6e526d3..5560390 100644
+--- a/org/eclipse/swt/widgets/Combo.java
++++ b/org/eclipse/swt/widgets/Combo.java
+@@ -57,9 +57,9 @@ import org.eclipse.swt.events.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class Combo extends Composite {
@@ -33920,7 +34158,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
int fixStart = -1, fixEnd = -1;
String [] items = new String [0];
boolean ignoreSelect, lockText;
-@@ -182,13 +182,13 @@
+@@ -182,13 +182,13 @@ public void add (String string, int index) {
* stopping the "delete" and "insert_text" signal emission.
*/
ignoreSelect = lockText = true;
@@ -33937,7 +34175,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
OS.gtk_list_insert_items (listHandle, items, index);
ignoreSelect = lockText = false;
}
-@@ -343,9 +343,9 @@
+@@ -343,9 +343,9 @@ void clearText () {
if ((style & SWT.READ_ONLY) != 0) {
int index = OS.gtk_combo_box_get_active (handle);
if (index != -1) {
@@ -33950,7 +34188,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
OS.gtk_tree_model_get (modelHandle, iter, 0, ptr, -1);
OS.g_free (iter);
-@@ -369,10 +369,10 @@
+@@ -369,10 +369,10 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0;
int[] w = new int [1], h = new int [1];
OS.gtk_widget_realize (entryHandle);
@@ -33963,7 +34201,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
xborder += OS.gtk_style_get_xthickness (style);
yborder += OS.gtk_style_get_ythickness (style);
int [] property = new int [1];
-@@ -388,7 +388,7 @@
+@@ -388,7 +388,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
GtkRequisition arrowRequesition = new GtkRequisition ();
OS.gtk_widget_size_request (buttonHandle, arrowRequesition);
GtkRequisition listRequesition = new GtkRequisition ();
@@ -33972,7 +34210,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
OS.gtk_widget_size_request (listParent != 0 ? listParent : listHandle, listRequesition);
width = Math.max (listRequesition.width, width) + arrowRequesition.width + 4;
-@@ -421,7 +421,7 @@
+@@ -421,7 +421,7 @@ void createHandle (int index) {
if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_fixed_set_has_window (fixedHandle, true);
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
@@ -33981,7 +34219,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if ((style & SWT.READ_ONLY) != 0) {
handle = OS.gtk_combo_box_new_text ();
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-@@ -467,9 +467,9 @@
+@@ -467,9 +467,9 @@ void createHandle (int index) {
*/
OS.gtk_container_forall (handle, display.allChildrenProc, 0);
if (display.allChildren != 0) {
@@ -33993,7 +34231,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (OS.GTK_IS_BUTTON (widget)) {
buttonHandle = widget;
break;
-@@ -498,14 +498,14 @@
+@@ -498,14 +498,14 @@ void createHandle (int index) {
listHandle = combo.list;
if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) {
@@ -34011,7 +34249,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (modalGroup != 0) {
OS.gtk_window_group_add_window (modalGroup, popupHandle);
}
-@@ -518,11 +518,11 @@
+@@ -518,11 +518,11 @@ 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.
*/
@@ -34025,7 +34263,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (childHandle != entryHandle && childHandle != listHandle) {
buttonHandle = childHandle;
break;
-@@ -563,15 +563,15 @@
+@@ -563,15 +563,15 @@ void deregister () {
if (buttonHandle != 0) display.removeWidget (buttonHandle);
if (entryHandle != 0) display.removeWidget (entryHandle);
if (listHandle != 0) display.removeWidget (listHandle);
@@ -34044,7 +34282,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (imContext != 0) {
return OS.gtk_im_context_filter_keypress (imContext, event);
}
-@@ -580,18 +580,18 @@
+@@ -580,18 +580,18 @@ boolean filterKey (int keyval, int /*long*/ event) {
return false;
}
@@ -34070,7 +34308,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (newToplevel == oldToplevel) {
isFound = true;
break;
-@@ -609,7 +609,7 @@
+@@ -609,7 +609,7 @@ int /*long*/ findPopupHandle (int /*long*/ oldList) {
return hdl;
}
@@ -34079,7 +34317,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (popupHandle != 0) {
if (group != 0) {
OS.gtk_window_group_add_window (group, popupHandle);
-@@ -631,7 +631,7 @@
+@@ -631,7 +631,7 @@ void fixIM () {
* filter has to be called by SWT.
*/
if (gdkEventKey != 0 && gdkEventKey != -1) {
@@ -34088,7 +34326,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (imContext != 0) {
OS.gtk_im_context_filter_keypress (imContext, gdkEventKey);
gdkEventKey = -1;
-@@ -641,12 +641,12 @@
+@@ -641,12 +641,12 @@ void fixIM () {
gdkEventKey = 0;
}
@@ -34103,7 +34341,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
if ((style & SWT.READ_ONLY) != 0 && buttonHandle != 0) return buttonHandle;
}
-@@ -676,9 +676,9 @@
+@@ -676,9 +676,9 @@ void hookEvents () {
}
int eventMask = OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_PRESS_MASK |
OS.GDK_BUTTON_RELEASE_MASK;
@@ -34115,7 +34353,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (eventHandle != 0) {
/* Connect the mouse signals */
OS.gtk_widget_add_events (eventHandle, eventMask);
-@@ -702,7 +702,7 @@
+@@ -702,7 +702,7 @@ void hookEvents () {
}
}
}
@@ -34124,7 +34362,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (imContext != 0) {
OS.g_signal_connect_closure (imContext, OS.commit, display.closures [COMMIT], false);
int id = OS.g_signal_lookup (OS.commit, OS.gtk_im_context_get_type ());
-@@ -711,7 +711,7 @@
+@@ -711,7 +711,7 @@ void hookEvents () {
}
}
@@ -34133,7 +34371,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
return entryHandle != 0 ? OS.GTK_ENTRY_IM_CONTEXT (entryHandle) : 0;
}
-@@ -736,8 +736,8 @@
+@@ -736,8 +736,8 @@ public void deselect (int index) {
}
} else {
ignoreSelect = true;
@@ -34144,7 +34382,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
boolean selected = OS.GTK_WIDGET_STATE (item) == OS.GTK_STATE_SELECTED;
if (selected) {
OS.gtk_list_unselect_all (listHandle);
-@@ -778,9 +778,9 @@
+@@ -778,9 +778,9 @@ boolean dragDetect(int x, int y, boolean filter, boolean[] consume) {
if (filter && entryHandle != 0) {
int [] index = new int [1];
int [] trailing = new int [1];
@@ -34156,7 +34394,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
int position = (int)/*64*/OS.g_utf8_pointer_to_offset (ptr, ptr + index[0]) + trailing[0];
Point selection = getSelection ();
if (selection.x <= position && position < selection.y) {
-@@ -794,11 +794,11 @@
+@@ -794,11 +794,11 @@ boolean dragDetect(int x, int y, boolean filter, boolean[] consume) {
return super.dragDetect (x, y, filter, consume);
}
@@ -34170,7 +34408,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
return paintWindow ();
}
-@@ -963,7 +963,7 @@
+@@ -963,7 +963,7 @@ public Point getSelection () {
int index = OS.gtk_combo_box_get_active (handle);
if (index != -1) length = getItem (index).length ();
} else {
@@ -34179,7 +34417,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (str != 0) length = (int)/*64*/OS.g_utf8_strlen (str, -1);
}
return new Point (0, length);
-@@ -993,10 +993,10 @@
+@@ -993,10 +993,10 @@ public int getSelectionIndex () {
return OS.gtk_combo_box_get_active (handle);
}
int index = 0, result = -1;
@@ -34193,7 +34431,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (OS.GTK_WIDGET_STATE (item) == OS.GTK_STATE_SELECTED) {
result = index;
break;
-@@ -1023,7 +1023,7 @@
+@@ -1023,7 +1023,7 @@ public int getSelectionIndex () {
public String getText () {
checkWidget();
if (entryHandle != 0) {
@@ -34202,7 +34440,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (str == 0) return "";
int length = OS.strlen (str);
byte [] buffer = new byte [length];
-@@ -1104,12 +1104,12 @@
+@@ -1104,12 +1104,12 @@ public int getVisibleItemCount () {
return visibleCount;
}
@@ -34217,7 +34455,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
/*
* Feature in GTK. Depending on where the user clicks, GTK prevents
* the left mouse button event from being propagated. The fix is to
-@@ -1125,7 +1125,7 @@
+@@ -1125,7 +1125,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
return super.gtk_button_press_event (widget, event);
}
@@ -34226,7 +34464,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
if (widget == handle) {
if (entryHandle == 0) {
-@@ -1149,7 +1149,7 @@
+@@ -1149,7 +1149,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
}
} else {
if (!ignoreSelect) {
@@ -34235,7 +34473,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
int length = OS.strlen (ptr);
byte [] buffer = new byte [length];
OS.memmove (buffer, ptr, length);
-@@ -1170,7 +1170,7 @@
+@@ -1170,7 +1170,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
* is to post the modify event when the user is typing.
*/
boolean keyPress = false;
@@ -34244,7 +34482,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-@@ -1189,7 +1189,7 @@
+@@ -1189,7 +1189,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
return 0;
}
@@ -34253,7 +34491,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (text == 0) return 0;
if (!OS.gtk_editable_get_editable (entryHandle)) return 0;
int length = OS.strlen (text);
-@@ -1227,7 +1227,7 @@
+@@ -1227,7 +1227,7 @@ int /*long*/ gtk_commit (int /*long*/ imContext, int /*long*/ text) {
return 0;
}
@@ -34262,7 +34500,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (lockText) {
OS.gtk_list_unselect_item (listHandle, 0);
OS.g_signal_stop_emission_by_name (entryHandle, OS.delete_text);
-@@ -1253,7 +1253,7 @@
+@@ -1253,7 +1253,7 @@ int /*long*/ gtk_delete_text (int /*long*/ widget, int /*long*/ start_pos, int /
return 0;
}
@@ -34271,7 +34509,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
/*
* Feature in GTK. Depending on where the user clicks, GTK prevents
* the left mouse button event from being propagated. The fix is to
-@@ -1305,12 +1305,12 @@
+@@ -1305,12 +1305,12 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
return super.gtk_event_after(widget, gdkEvent);
}
@@ -34286,7 +34524,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (lockText) {
OS.gtk_list_unselect_item (listHandle, 0);
OS.g_signal_stop_emission_by_name (entryHandle, OS.insert_text);
-@@ -1324,7 +1324,7 @@
+@@ -1324,7 +1324,7 @@ int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*
int [] pos = new int [1];
OS.memmove (pos, position, 4);
if (pos [0] == -1) {
@@ -34295,7 +34533,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1);
}
String newText = verifyText (oldText, pos [0], pos [0]);
-@@ -1356,8 +1356,8 @@
+@@ -1356,8 +1356,8 @@ int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*
return 0;
}
@@ -34306,7 +34544,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (result != 0) fixIM ();
if (gdkEventKey == -1) result = 1;
gdkEventKey = 0;
-@@ -1403,7 +1403,7 @@
+@@ -1403,7 +1403,7 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
@@ -34315,7 +34553,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
OS.gtk_widget_set_direction (menu, OS.GTK_TEXT_DIR_RTL);
OS.gtk_container_forall (menu, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);
-@@ -1470,14 +1470,14 @@
+@@ -1470,14 +1470,14 @@ boolean isFocusHandle(int widget) {
return super.isFocusHandle (widget);
}
@@ -34334,7 +34572,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (children != 0) window = OS.g_list_data (children);
OS.g_list_free (children);
return window;
-@@ -1502,7 +1502,7 @@
+@@ -1502,7 +1502,7 @@ public void paste () {
if (entryHandle != 0) OS.gtk_editable_paste_clipboard (entryHandle);
}
@@ -34343,7 +34581,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
return fixedHandle;
}
-@@ -1511,7 +1511,7 @@
+@@ -1511,7 +1511,7 @@ void register () {
if (buttonHandle != 0) display.addWidget (buttonHandle, this);
if (entryHandle != 0) display.addWidget (entryHandle, this);
if (listHandle != 0) display.addWidget (listHandle, this);
@@ -34352,7 +34590,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (imContext != 0) display.addWidget (imContext, this);
}
-@@ -1555,10 +1555,10 @@
+@@ -1555,10 +1555,10 @@ public void remove (int index) {
OS.gtk_combo_box_remove_text (handle, index);
} else {
ignoreSelect = true;
@@ -34366,7 +34604,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
OS.gtk_list_remove_items (listHandle, items);
OS.g_list_free (items);
OS.g_list_free (children);
-@@ -1605,10 +1605,10 @@
+@@ -1605,10 +1605,10 @@ public void remove (int start, int end) {
} else {
boolean selected = false;
ignoreSelect = true;
@@ -34380,7 +34618,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
selected |= OS.GTK_WIDGET_STATE (item) == OS.GTK_STATE_SELECTED;
items = OS.g_list_append (items, item);
}
-@@ -1798,7 +1798,7 @@
+@@ -1798,7 +1798,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
return super.setBounds (x, y, width, newHeight, move, resize);
}
@@ -34389,7 +34627,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
super.setFontDescription (font);
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
if (entryHandle != 0) OS.gtk_widget_modify_font (entryHandle, font);
-@@ -1819,11 +1819,11 @@
+@@ -1819,11 +1819,11 @@ void setFontDescription (int /*long*/ font) {
OS.gtk_widget_modify_font (entryHandle, font);
if (listHandle != 0) {
OS.gtk_widget_modify_font (listHandle, font);
@@ -34403,7 +34641,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
OS.gtk_widget_modify_font (widget, font);
}
OS.g_list_free (itemsList);
-@@ -1841,11 +1841,11 @@
+@@ -1841,11 +1841,11 @@ void setForegroundColor (GdkColor color) {
setForegroundColor (entryHandle, color);
if (listHandle != 0) {
setForegroundColor (listHandle, color);
@@ -34417,7 +34655,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
setForegroundColor (widget, color);
}
OS.g_list_free (itemsList);
-@@ -1886,9 +1886,9 @@
+@@ -1886,9 +1886,9 @@ public void setItem (int index, String string) {
}
} else {
ignoreSelect = true;
@@ -34430,7 +34668,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
OS.gtk_label_set_text (label, buffer);
OS.g_list_free (children);
ignoreSelect = false;
-@@ -1934,15 +1934,15 @@
+@@ -1934,15 +1934,15 @@ public void setItems (String [] items) {
} else {
lockText = ignoreSelect = true;
OS.gtk_list_clear_items (listHandle, 0, -1);
@@ -34449,7 +34687,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
setForegroundColor (label, color);
OS.gtk_widget_modify_font (label, font);
OS.gtk_widget_set_direction (label, direction);
-@@ -2020,11 +2020,11 @@
+@@ -2020,11 +2020,11 @@ public void setOrientation (int orientation) {
if (entryHandle != 0) OS.gtk_widget_set_direction (entryHandle, dir);
if (listHandle != 0) {
OS.gtk_widget_set_direction (listHandle, dir);
@@ -34463,7 +34701,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
OS.gtk_widget_set_direction (widget, dir);
}
OS.g_list_free (itemsList);
-@@ -2111,7 +2111,7 @@
+@@ -2111,7 +2111,7 @@ public void setText (String string) {
* fix is to block the firing of these events and fire them ourselves in a consistent manner.
*/
if (hooks (SWT.Verify) || filters (SWT.Verify)) {
@@ -34472,7 +34710,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
string = verifyText (string, 0, (int)/*64*/OS.g_utf8_strlen (ptr, -1));
if (string == null) return;
}
-@@ -2195,9 +2195,9 @@
+@@ -2195,9 +2195,9 @@ boolean translateTraversal (GdkEventKey keyEvent) {
switch (key) {
case OS.GDK_KP_Enter:
case OS.GDK_Return: {
@@ -34484,7 +34722,7 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);
if (preeditString [0] != 0) {
int length = OS.strlen (preeditString [0]);
-@@ -2216,7 +2216,7 @@
+@@ -2216,7 +2216,7 @@ String verifyText (String string, int start, int end) {
event.text = string;
event.start = start;
event.end = end;
@@ -34493,10 +34731,11 @@ diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widgets/Composite.java
---- x86/org/eclipse/swt/widgets/Composite.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Composite.java 2009-09-17 08:48:24.000000000 -0400
-@@ -47,8 +47,8 @@
+diff --git a/org/eclipse/swt/widgets/Composite.java b/org/eclipse/swt/widgets/Composite.java
+index 62cda31..25295c4 100644
+--- a/org/eclipse/swt/widgets/Composite.java
++++ b/org/eclipse/swt/widgets/Composite.java
+@@ -47,8 +47,8 @@ import org.eclipse.swt.graphics.*;
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
*/
public class Composite extends Scrollable {
@@ -34507,7 +34746,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
Layout layout;
Control[] tabList;
int layoutCount, backgroundMode;
-@@ -101,15 +101,15 @@
+@@ -101,15 +101,15 @@ static int checkStyle (int style) {
}
Control [] _getChildren () {
@@ -34527,7 +34766,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (handle != 0) {
Widget widget = display.getWidget (handle);
if (widget != null && widget != this) {
-@@ -203,7 +203,7 @@
+@@ -203,7 +203,7 @@ protected void checkSubclass () {
/* Do nothing - Subclassing is allowed */
}
@@ -34536,7 +34775,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (scrolledHandle != 0) return 0;
return super.childStyle ();
}
-@@ -263,9 +263,9 @@
+@@ -263,9 +263,9 @@ void createHandle (int index, boolean fixed, boolean scrolled) {
if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_fixed_set_has_window (fixedHandle, true);
}
@@ -34548,7 +34787,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (hadj == 0) error (SWT.ERROR_NO_HANDLES);
scrolledHandle = OS.gtk_scrolled_window_new (hadj, vadj);
if (scrolledHandle == 0) SWT.error (SWT.ERROR_NO_HANDLES);
-@@ -333,7 +333,7 @@
+@@ -333,7 +333,7 @@ void drawBackground (GC gc, int x, int y, int width, int height) {
Control control = findBackgroundControl ();
if (control != null) {
GCData data = gc.getGCData ();
@@ -34557,7 +34796,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (cairo != 0) {
Cairo.cairo_save (cairo);
if (control.backgroundImage != null) {
-@@ -341,15 +341,15 @@
+@@ -341,15 +341,15 @@ void drawBackground (GC gc, int x, int y, int width, int height) {
Cairo.cairo_translate (cairo, -pt.x, -pt.y);
x += pt.x;
y += pt.y;
@@ -34579,7 +34818,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (pattern == 0) error (SWT.ERROR_NO_HANDLES);
Cairo.cairo_pattern_set_extend (pattern, Cairo.CAIRO_EXTEND_REPEAT);
if ((data.style & SWT.MIRRORED) != 0) {
-@@ -367,7 +367,7 @@
+@@ -367,7 +367,7 @@ void drawBackground (GC gc, int x, int y, int width, int height) {
Cairo.cairo_fill (cairo);
Cairo.cairo_restore (cairo);
} else {
@@ -34588,7 +34827,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
GdkGCValues values = new GdkGCValues ();
OS.gdk_gc_get_values (gdkGC, values);
if (control.backgroundImage != null) {
-@@ -425,7 +425,7 @@
+@@ -425,7 +425,7 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De
}
}
@@ -34597,7 +34836,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
Control[] controls = _getChildren ();
for (int i = 0; i < controls.length; i++) {
controls[i].fixModal (group, modalGroup);
-@@ -464,15 +464,15 @@
+@@ -464,15 +464,15 @@ void fixTabList (Control control) {
void fixZOrder () {
if ((state & CANVAS) != 0) return;
@@ -34619,7 +34858,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (window != redrawWindow) {
OS.gdk_window_get_user_data (window, userData);
if (userData [0] == 0 || OS.G_OBJECT_TYPE (userData [0]) != display.gtk_fixed_get_type ()) {
-@@ -485,12 +485,12 @@
+@@ -485,12 +485,12 @@ void fixZOrder () {
}
}
@@ -34634,7 +34873,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (socketHandle != 0) OS.GTK_WIDGET_SET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);
boolean result = super.forceFocus (focusHandle);
if (socketHandle != 0) OS.GTK_WIDGET_UNSET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);
-@@ -551,7 +551,7 @@
+@@ -551,7 +551,7 @@ int getChildrenCount () {
* NOTE: The current implementation will count
* non-registered children.
*/
@@ -34643,7 +34882,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (list == 0) return 0;
int count = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -565,7 +565,7 @@
+@@ -565,7 +565,7 @@ public Rectangle getClientArea () {
return new Rectangle (0, 0, 0, 0);
}
forceResize ();
@@ -34652,7 +34891,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle);
int height = (state & ZERO_HEIGHT) != 0 ? 0 : OS.GTK_WIDGET_HEIGHT (clientHandle);
return new Rectangle (0, 0, width, height);
-@@ -646,8 +646,8 @@
+@@ -646,8 +646,8 @@ public Control [] getTabList () {
return tabList;
}
@@ -34663,7 +34902,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (result != 0) return result;
if ((state & CANVAS) != 0) {
if ((style & SWT.NO_FOCUS) == 0 && hooksKeys ()) {
-@@ -661,7 +661,7 @@
+@@ -661,7 +661,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
@@ -34672,7 +34911,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if ((state & OBSCURED) != 0) return 0;
if ((state & CANVAS) == 0) {
return super.gtk_expose_event (widget, eventPtr);
-@@ -672,7 +672,7 @@
+@@ -672,7 +672,7 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
if (!hooks (SWT.Paint) && !filters (SWT.Paint)) return 0;
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove(gdkEvent, eventPtr, GdkEventExpose.sizeof);
@@ -34681,7 +34920,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
int [] n_rectangles = new int [1];
OS.gdk_region_get_rectangles (gdkEvent.region, rectangles, n_rectangles);
GdkRectangle rect = new GdkRectangle ();
-@@ -684,7 +684,7 @@
+@@ -684,7 +684,7 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
event.width = rect.width;
event.height = rect.height;
if ((style & SWT.MIRRORED) != 0) event.x = getClientWidth () - event.width - event.x;
@@ -34690,7 +34929,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
OS.gdk_region_union_with_rect (damageRgn, rect);
GCData data = new GCData ();
data.damageRgn = damageRgn;
-@@ -699,8 +699,8 @@
+@@ -699,8 +699,8 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
return 0;
}
@@ -34701,7 +34940,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (result != 0) return result;
/*
* Feature in GTK. The default behavior when the return key
-@@ -720,30 +720,30 @@
+@@ -720,30 +720,30 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
@@ -34741,7 +34980,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (window != 0) OS.gdk_window_set_back_pixmap (window, 0, false);
}
if (socketHandle != 0) {
-@@ -752,16 +752,16 @@
+@@ -752,16 +752,16 @@ int /*long*/ gtk_realize (int /*long*/ widget) {
return result;
}
@@ -34762,7 +35001,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
if (window != 0) OS.gdk_window_set_back_pixmap (window, 0, false);
}
return result;
-@@ -785,7 +785,7 @@
+@@ -785,7 +785,7 @@ boolean hooksKeys () {
return hooks (SWT.KeyDown) || hooks (SWT.KeyUp);
}
@@ -34771,7 +35010,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
return imHandle;
}
-@@ -1003,16 +1003,16 @@
+@@ -1003,16 +1003,16 @@ void markLayout (boolean changed, boolean all) {
}
}
@@ -34794,7 +35033,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
while (temp != 0) {
OS.memmove (data, temp, OS.PTR_SIZEOF);
OS.memmove (widget, data [0], OS.PTR_SIZEOF);
-@@ -1040,20 +1040,20 @@
+@@ -1040,20 +1040,20 @@ void moveAbove (int /*long*/ child, int /*long*/ sibling) {
OS.memmove (parentHandle, fixed);
}
@@ -34821,7 +35060,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
while (temp != 0) {
OS.memmove (data, temp, OS.PTR_SIZEOF);
OS.memmove (widget, data [0], OS.PTR_SIZEOF);
-@@ -1085,7 +1085,7 @@
+@@ -1085,7 +1085,7 @@ void moveChildren(int oldWidth) {
Control[] children = _getChildren ();
for (int i = 0; i < children.length; i++) {
Control child = children[i];
@@ -34830,7 +35069,7 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
int x = OS.GTK_WIDGET_X (topHandle);
int y = OS.GTK_WIDGET_Y (topHandle);
int controlWidth = (child.state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (topHandle);
-@@ -1127,12 +1127,12 @@
+@@ -1127,12 +1127,12 @@ Point minimumSize (int wHint, int hHint, boolean changed) {
return new Point (width, height);
}
@@ -34845,10 +35084,11 @@ diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widg
Region oldClip = new Region (gc.getDevice ());
Region newClip = new Region (gc.getDevice ());
gc.getClipping (oldClip);
-diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets/Control.java
---- x86/org/eclipse/swt/widgets/Control.java 2009-08-07 14:50:38.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Control.java 2009-09-17 08:48:24.000000000 -0400
-@@ -44,8 +44,8 @@
+diff --git a/org/eclipse/swt/widgets/Control.java b/org/eclipse/swt/widgets/Control.java
+index cabd66b..a31abae 100644
+--- a/org/eclipse/swt/widgets/Control.java
++++ b/org/eclipse/swt/widgets/Control.java
+@@ -44,8 +44,8 @@ import org.eclipse.swt.internal.gtk.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public abstract class Control extends Widget implements Drawable {
@@ -34859,7 +35099,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int drawCount;
Composite parent;
Cursor cursor;
-@@ -105,13 +105,13 @@
+@@ -105,13 +105,13 @@ Font defaultFont () {
void deregister () {
super.deregister ();
if (fixedHandle != 0) display.removeWidget (fixedHandle);
@@ -34876,7 +35116,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (window == 0) return false;
int orientation = vertical ? OS.GTK_ORIENTATION_HORIZONTAL : OS.GTK_ORIENTATION_VERTICAL;
if ((style & SWT.MIRRORED) != 0) x = getClientWidth () - width - x;
-@@ -123,16 +123,16 @@
+@@ -123,16 +123,16 @@ void enableWidget (boolean enabled) {
OS.gtk_widget_set_sensitive (handle, enabled);
}
@@ -34897,7 +35137,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_realize (eventHandle);
return OS.GTK_WIDGET_WINDOW (eventHandle);
}
-@@ -144,7 +144,7 @@
+@@ -144,7 +144,7 @@ void fixFocus (Control focusControl) {
if (control.setFocus ()) return;
}
shell.setSavedFocus (focusControl);
@@ -34906,7 +35146,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.GTK_WIDGET_SET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);
OS.gtk_widget_grab_focus (focusHandle);
OS.GTK_WIDGET_UNSET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);
-@@ -154,7 +154,7 @@
+@@ -154,7 +154,7 @@ void fixStyle () {
if (fixedHandle != 0) fixStyle (fixedHandle);
}
@@ -34915,7 +35155,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
/*
* Feature in GTK. Some GTK themes apply a different background to
* the contents of a GtkNotebook. However, in an SWT TabFolder, the
-@@ -168,7 +168,7 @@
+@@ -168,7 +168,7 @@ void fixStyle (int /*long*/ handle) {
*/
if ((state & BACKGROUND) != 0) return;
if ((state & THEME_BACKGROUND) == 0) return;
@@ -34924,7 +35164,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (childStyle != 0) {
GdkColor color = new GdkColor();
OS.gtk_style_get_bg (childStyle, 0, color);
-@@ -176,11 +176,11 @@
+@@ -176,11 +176,11 @@ void fixStyle (int /*long*/ handle) {
}
}
@@ -34938,7 +35178,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
return handle;
}
-@@ -190,7 +190,7 @@
+@@ -190,7 +190,7 @@ boolean hasFocus () {
void hookEvents () {
/* Connect the keyboard signals */
@@ -34947,7 +35187,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int focusMask = OS.GDK_KEY_PRESS_MASK | OS.GDK_KEY_RELEASE_MASK | OS.GDK_FOCUS_CHANGE_MASK;
OS.gtk_widget_add_events (focusHandle, focusMask);
OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [POPUP_MENU], 0, display.closures [POPUP_MENU], false);
-@@ -202,7 +202,7 @@
+@@ -202,7 +202,7 @@ void hookEvents () {
OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [FOCUS_OUT_EVENT], 0, display.closures [FOCUS_OUT_EVENT], false);
/* Connect the mouse signals */
@@ -34956,7 +35196,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int eventMask = OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_PRESS_MASK | OS.GDK_BUTTON_RELEASE_MASK;
OS.gtk_widget_add_events (eventHandle, eventMask);
OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [BUTTON_PRESS_EVENT], 0, display.closures [BUTTON_PRESS_EVENT], false);
-@@ -211,7 +211,7 @@
+@@ -211,7 +211,7 @@ void hookEvents () {
OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [SCROLL_EVENT], 0, display.closures [SCROLL_EVENT], false);
/* Connect enter/exit signals */
@@ -34965,7 +35205,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int enterExitMask = OS.GDK_ENTER_NOTIFY_MASK | OS.GDK_LEAVE_NOTIFY_MASK;
OS.gtk_widget_add_events (enterExitHandle, enterExitMask);
OS.g_signal_connect_closure_by_id (enterExitHandle, display.signalIds [ENTER_NOTIFY_EVENT], 0, display.closures [ENTER_NOTIFY_EVENT], false);
-@@ -227,7 +227,7 @@
+@@ -227,7 +227,7 @@ void hookEvents () {
* The signal is hooked to the fixedHandle to catch events sent to
* lightweight widgets.
*/
@@ -34974,7 +35214,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.g_signal_connect_closure_by_id (blockHandle, display.signalIds [BUTTON_PRESS_EVENT], 0, display.closures [BUTTON_PRESS_EVENT_INVERSE], true);
OS.g_signal_connect_closure_by_id (blockHandle, display.signalIds [BUTTON_RELEASE_EVENT], 0, display.closures [BUTTON_RELEASE_EVENT_INVERSE], true);
OS.g_signal_connect_closure_by_id (blockHandle, display.signalIds [MOTION_NOTIFY_EVENT], 0, display.closures [MOTION_NOTIFY_EVENT_INVERSE], true);
-@@ -239,7 +239,7 @@
+@@ -239,7 +239,7 @@ void hookEvents () {
}
/* Connect the paint signal */
@@ -34983,7 +35223,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int paintMask = OS.GDK_EXPOSURE_MASK | OS.GDK_VISIBILITY_NOTIFY_MASK;
OS.gtk_widget_add_events (paintHandle, paintMask);
OS.g_signal_connect_closure_by_id (paintHandle, display.signalIds [EXPOSE_EVENT], 0, display.closures [EXPOSE_EVENT_INVERSE], false);
-@@ -249,7 +249,7 @@
+@@ -249,7 +249,7 @@ void hookEvents () {
/* Connect the Input Method signals */
OS.g_signal_connect_closure_by_id (handle, display.signalIds [REALIZE], 0, display.closures [REALIZE], true);
OS.g_signal_connect_closure_by_id (handle, display.signalIds [UNREALIZE], 0, display.closures [UNREALIZE], false);
@@ -34992,7 +35232,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (imHandle != 0) {
OS.g_signal_connect_closure (imHandle, OS.commit, display.closures [COMMIT], false);
OS.g_signal_connect_closure (imHandle, OS.preedit_changed, display.closures [PREEDIT_CHANGED], false);
-@@ -257,11 +257,11 @@
+@@ -257,11 +257,11 @@ void hookEvents () {
OS.g_signal_connect_closure_by_id (paintHandle, display.signalIds [STYLE_SET], 0, display.closures [STYLE_SET], false);
@@ -35006,7 +35246,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int [] x = new int [1], y = new int [1], mask = new int [1];
OS.gdk_window_get_pointer (0, x, y, mask);
sendMouseEvent (SWT.MouseHover, 0, /*time*/0, x [0], y [0], false, mask [0]);
-@@ -269,14 +269,14 @@
+@@ -269,14 +269,14 @@ int /*long*/ hoverProc (int /*long*/ widget) {
return 0;
}
@@ -35025,7 +35265,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
while (paintHandle != topHandle) {
if ((OS.GTK_WIDGET_FLAGS (paintHandle) & OS.GTK_NO_WINDOW) == 0) break;
paintHandle = OS.gtk_widget_get_parent (paintHandle);
-@@ -284,8 +284,8 @@
+@@ -284,8 +284,8 @@ int /*long*/ paintHandle () {
return paintHandle;
}
@@ -35036,7 +35276,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_realize (paintHandle);
return OS.GTK_WIDGET_WINDOW (paintHandle);
}
-@@ -311,25 +311,25 @@
+@@ -311,25 +311,25 @@ public boolean print (GC gc) {
checkWidget ();
if (gc == null) error (SWT.ERROR_NULL_ARGUMENT);
if (gc.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
@@ -35068,7 +35308,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (OS.gdk_drawable_get_depth (window) != depth) return;
GdkRectangle rect = new GdkRectangle ();
int [] width = new int [1], height = new int [1];
-@@ -337,13 +337,13 @@
+@@ -337,13 +337,13 @@ void printWindow (boolean first, Control control, GC gc, int /*long*/ drawable,
rect.width = width [0];
rect.height = height [0];
OS.gdk_window_begin_paint_rect (window, rect);
@@ -35085,7 +35325,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
GdkEventExpose event = new GdkEventExpose ();
event.type = OS.GDK_EXPOSE;
event.window = OS.g_object_ref (window);
-@@ -359,7 +359,7 @@
+@@ -359,7 +359,7 @@ void printWindow (boolean first, Control control, GC gc, int /*long*/ drawable,
if (!first) {
int [] cX = new int [1], cY = new int [1];
OS.gdk_window_get_position (window, cX, cY);
@@ -35094,7 +35334,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int [] pW = new int [1], pH = new int [1];
OS.gdk_drawable_get_size (parentWindow, pW, pH);
srcX = x_offset [0] - cX [0];
-@@ -370,18 +370,18 @@
+@@ -370,18 +370,18 @@ void printWindow (boolean first, Control control, GC gc, int /*long*/ drawable,
destHeight = Math.min (cY [0] + height [0], pH [0]);
}
GCData gcData = gc.getGCData();
@@ -35119,7 +35359,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (pattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_pattern_set_filter(pattern, Cairo.CAIRO_FILTER_BEST);
Cairo.cairo_set_source(cairo, pattern);
-@@ -397,13 +397,13 @@
+@@ -397,13 +397,13 @@ void printWindow (boolean first, Control control, GC gc, int /*long*/ drawable,
OS.gdk_draw_drawable (drawable, gc.handle, real_drawable [0], srcX, srcY, destX, destY, destWidth, destHeight);
}
OS.gdk_window_end_paint (window);
@@ -35137,7 +35377,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gdk_window_get_user_data (child, data);
if (data [0] != 0) {
Widget widget = display.findWidget (data [0]);
-@@ -517,7 +517,7 @@
+@@ -517,7 +517,7 @@ void checkMirrored () {
if ((style & SWT.RIGHT_TO_LEFT) != 0) style |= SWT.MIRRORED;
}
@@ -35146,7 +35386,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
return parent.childStyle ();
}
-@@ -577,7 +577,7 @@
+@@ -577,7 +577,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
return computeNativeSize (handle, wHint, hHint, changed);
}
@@ -35155,7 +35395,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int width = wHint, height = hHint;
if (wHint == SWT.DEFAULT && hHint == SWT.DEFAULT) {
GtkRequisition requisition = new GtkRequisition ();
-@@ -603,7 +603,7 @@
+@@ -603,7 +603,7 @@ void forceResize () {
* topHandle. Note that all calls to gtk_widget_size_allocate()
* must be preceded by a call to gtk_widget_size_request().
*/
@@ -35164,7 +35404,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
GtkRequisition requisition = new GtkRequisition ();
gtk_widget_size_request (topHandle, requisition);
GtkAllocation allocation = new GtkAllocation ();
-@@ -654,7 +654,7 @@
+@@ -654,7 +654,7 @@ public Accessible getAccessible () {
*/
public Rectangle getBounds () {
checkWidget();
@@ -35173,7 +35413,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int x = OS.GTK_WIDGET_X (topHandle);
int y = OS.GTK_WIDGET_Y (topHandle);
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (topHandle);
-@@ -719,7 +719,7 @@
+@@ -719,7 +719,7 @@ void markLayout (boolean changed, boolean all) {
/* Do nothing */
}
@@ -35182,7 +35422,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
super.modifyStyle(handle, style);
/*
* Bug in GTK. When changing the style of a control that
-@@ -730,8 +730,8 @@
+@@ -730,8 +730,8 @@ void modifyStyle (int /*long*/ handle, int /*long*/ style) {
}
void moveHandle (int x, int y) {
@@ -35193,7 +35433,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
/*
* Feature in GTK. Calling gtk_fixed_move() to move a child causes
* the whole parent to redraw. This is a performance problem. The
-@@ -749,13 +749,13 @@
+@@ -749,13 +749,13 @@ void moveHandle (int x, int y) {
}
void resizeHandle (int width, int height) {
@@ -35209,7 +35449,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
boolean sendMove = move;
if ((parent.style & SWT.MIRRORED) != 0) {
int clientWidth = parent.getClientWidth ();
-@@ -879,7 +879,7 @@
+@@ -879,7 +879,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
*/
public Point getLocation () {
checkWidget();
@@ -35218,7 +35458,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int x = OS.GTK_WIDGET_X (topHandle);
int y = OS.GTK_WIDGET_Y (topHandle);
if ((parent.style & SWT.MIRRORED) != 0) {
-@@ -944,7 +944,7 @@
+@@ -944,7 +944,7 @@ public void setLocation(int x, int y) {
*/
public Point getSize () {
checkWidget();
@@ -35227,7 +35467,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (topHandle);
int height = (state & ZERO_HEIGHT) != 0 ? 0 : OS.GTK_WIDGET_HEIGHT (topHandle);
return new Point (width, height);
-@@ -994,15 +994,15 @@
+@@ -994,15 +994,15 @@ public void setSize (Point size) {
public void setRegion (Region region) {
checkWidget ();
if (region != null && region.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
@@ -35247,7 +35487,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (list == 0) return;
int count = OS.g_list_length (list);
if (count > 1) {
-@@ -1010,7 +1010,7 @@
+@@ -1010,7 +1010,7 @@ void setRelations () {
* the receiver is the last item in the list, so its predecessor will
* be the second-last item in the list
*/
@@ -35256,7 +35496,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (handle != 0) {
Widget widget = display.getWidget (handle);
if (widget != null && widget != this) {
-@@ -1058,7 +1058,7 @@
+@@ -1058,7 +1058,7 @@ boolean isDescribedByLabel () {
return true;
}
@@ -35265,7 +35505,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
return widget == focusHandle ();
}
-@@ -1197,7 +1197,7 @@
+@@ -1197,7 +1197,7 @@ public void setLayoutData (Object layoutData) {
*/
public Point toControl (int x, int y) {
checkWidget ();
@@ -35274,7 +35514,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
x -= origin_x [0];
-@@ -1246,7 +1246,7 @@
+@@ -1246,7 +1246,7 @@ public Point toControl (Point point) {
*/
public Point toDisplay (int x, int y) {
checkWidget();
@@ -35283,7 +35523,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
if ((style & SWT.MIRRORED) != 0) x = getClientWidth () - x;
-@@ -1894,12 +1894,12 @@
+@@ -1894,12 +1894,12 @@ public void removePaintListener(PaintListener listener) {
*/
void removeRelation () {
if (!isDescribedByLabel ()) return; /* there will not be any */
@@ -35299,7 +35539,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
ATK.atk_relation_set_remove (set, relation);
}
OS.g_object_unref (set);
-@@ -2022,7 +2022,7 @@
+@@ -2022,7 +2022,7 @@ boolean dragDetect (int button, int count, int stateMask, int x, int y) {
boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
boolean quit = false, dragging = false;
while (!quit) {
@@ -35308,7 +35548,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
/*
* There should be an event on the queue already, but
* in cases where there isn't one, stop trying after
-@@ -2077,8 +2077,8 @@
+@@ -2077,8 +2077,8 @@ boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
return dragging;
}
@@ -35319,7 +35559,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (imHandle != 0) {
return OS.gtk_im_context_filter_keypress (imHandle, event);
}
-@@ -2100,13 +2100,13 @@
+@@ -2100,13 +2100,13 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De
oldDecorations.fixDecorations (newDecorations, this, menus);
}
@@ -35337,7 +35577,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (OS.GTK_WIDGET_VISIBLE (child) && OS.gtk_widget_get_child_visible (child) && !OS.GTK_WIDGET_MAPPED (child)) {
OS.gtk_widget_map (child);
}
-@@ -2120,7 +2120,7 @@
+@@ -2120,7 +2120,7 @@ int /*long*/ fixedMapProc (int /*long*/ widget) {
return 0;
}
@@ -35346,7 +35586,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
}
/**
-@@ -2146,14 +2146,14 @@
+@@ -2146,14 +2146,14 @@ public boolean forceFocus () {
return forceFocus (focusHandle ());
}
@@ -35364,7 +35604,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
while (handle != 0) {
if (handle == focusHandle) {
/* Cancel any previous ignoreFocus requests */
-@@ -2214,7 +2214,7 @@
+@@ -2214,7 +2214,7 @@ public Image getBackgroundImage () {
}
GdkColor getBgColor () {
@@ -35373,7 +35613,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_realize (fontHandle);
GdkColor color = new GdkColor ();
OS.gtk_style_get_bg (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color);
-@@ -2222,7 +2222,7 @@
+@@ -2222,7 +2222,7 @@ GdkColor getBgColor () {
}
GdkColor getBaseColor () {
@@ -35382,7 +35622,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_realize (fontHandle);
GdkColor color = new GdkColor ();
OS.gtk_style_get_base (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color);
-@@ -2327,8 +2327,8 @@
+@@ -2327,8 +2327,8 @@ public Font getFont () {
return font != null ? font : defaultFont ();
}
@@ -35393,7 +35633,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_realize (fontHandle);
return OS.gtk_style_get_font_desc (OS.gtk_widget_get_style (fontHandle));
}
-@@ -2353,7 +2353,7 @@
+@@ -2353,7 +2353,7 @@ GdkColor getForegroundColor () {
}
GdkColor getFgColor () {
@@ -35402,7 +35642,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_realize (fontHandle);
GdkColor color = new GdkColor ();
OS.gtk_style_get_fg (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color);
-@@ -2365,7 +2365,7 @@
+@@ -2365,7 +2365,7 @@ Point getIMCaretPos () {
}
GdkColor getTextColor () {
@@ -35411,7 +35651,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_realize (fontHandle);
GdkColor color = new GdkColor ();
OS.gtk_style_get_text (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color);
-@@ -2417,7 +2417,7 @@
+@@ -2417,7 +2417,7 @@ public Menu getMenu () {
public Monitor getMonitor () {
checkWidget();
Monitor monitor = null;
@@ -35420,7 +35660,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (screen != 0) {
int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, paintWindow ());
GdkRectangle dest = new GdkRectangle ();
-@@ -2560,11 +2560,11 @@
+@@ -2560,11 +2560,11 @@ public boolean getVisible () {
return (state & HIDDEN) == 0;
}
@@ -35434,7 +35674,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
if (gdkEvent.type == OS.GDK_3BUTTON_PRESS) return 0;
-@@ -2579,10 +2579,10 @@
+@@ -2579,10 +2579,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event, bo
if (((shell.style & SWT.ON_TOP) != 0) && (((shell.style & SWT.NO_FOCUS) == 0) || ((style & SWT.NO_FOCUS) == 0))) {
shell.forceActive();
}
@@ -35447,7 +35687,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (nextEvent != 0) {
int eventType = OS.GDK_EVENT_TYPE (nextEvent);
if (eventType == OS.GDK_2BUTTON_PRESS) display.clickCount = 2;
-@@ -2629,7 +2629,7 @@
+@@ -2629,7 +2629,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event, bo
return result;
}
@@ -35456,7 +35696,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
/*
-@@ -2648,7 +2648,7 @@
+@@ -2648,7 +2648,7 @@ int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event)
return sendMouseEvent (SWT.MouseUp, button, display.clickCount, 0, false, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state) ? 0 : 1;
}
@@ -35465,7 +35705,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (text == 0) return 0;
int length = OS.strlen (text);
if (length == 0) return 0;
-@@ -2659,7 +2659,7 @@
+@@ -2659,7 +2659,7 @@ int /*long*/ gtk_commit (int /*long*/ imcontext, int /*long*/ text) {
return 0;
}
@@ -35474,7 +35714,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (OS.GTK_VERSION >= OS.VERSION (2, 12, 0)) {
/*
* Feature in GTK. Children of a shell will inherit and display the shell's
-@@ -2672,7 +2672,7 @@
+@@ -2672,7 +2672,7 @@ int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {
char [] chars = fixMnemonic (toolTipText, false);
buffer = Converter.wcsToMbcs (null, chars, true);
}
@@ -35483,7 +35723,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_set_tooltip_text (toolHandle, buffer);
}
if (display.currentControl == this) return 0;
-@@ -2702,7 +2702,7 @@
+@@ -2702,7 +2702,7 @@ boolean checkSubwindow () {
return false;
}
@@ -35492,7 +35732,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
GdkEvent event = new GdkEvent ();
OS.memmove (event, gdkEvent, GdkEvent.sizeof);
switch (event.type) {
-@@ -2744,7 +2744,7 @@
+@@ -2744,7 +2744,7 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
}
} else {
display.ignoreFocus = false;
@@ -35501,7 +35741,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (grabHandle != 0) {
if (OS.G_OBJECT_TYPE (grabHandle) == OS.GTK_TYPE_MENU ()) {
display.ignoreFocus = true;
-@@ -2760,7 +2760,7 @@
+@@ -2760,7 +2760,7 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
return 0;
}
@@ -35510,7 +35750,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if ((state & OBSCURED) != 0) return 0;
if (!hooks (SWT.Paint) && !filters (SWT.Paint)) return 0;
GdkEventExpose gdkEvent = new GdkEventExpose ();
-@@ -2782,34 +2782,34 @@
+@@ -2782,34 +2782,34 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
return 0;
}
@@ -35551,7 +35791,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (imHandle != 0) {
OS.gtk_im_context_focus_out (imHandle);
}
-@@ -2818,7 +2818,7 @@
+@@ -2818,7 +2818,7 @@ int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {
return 0;
}
@@ -35560,7 +35800,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (!hasFocus ()) return 0;
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, event, GdkEventKey.sizeof);
-@@ -2837,16 +2837,16 @@
+@@ -2837,16 +2837,16 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
return super.gtk_key_press_event (widget, event);
}
@@ -35580,7 +35820,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (display.currentControl != this) return 0;
display.removeMouseHoverTimeout (handle);
int result = 0;
-@@ -2861,15 +2861,15 @@
+@@ -2861,15 +2861,15 @@ int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
@@ -35599,7 +35839,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (focusHandle != 0) {
display.mnemonicControl = this;
OS.gtk_widget_event (focusHandle, eventPtr);
-@@ -2882,7 +2882,7 @@
+@@ -2882,7 +2882,7 @@ int /*long*/ gtk_mnemonic_activate (int /*long*/ widget, int /*long*/ arg1) {
return result;
}
@@ -35608,7 +35848,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
GdkEventMotion gdkEvent = new GdkEventMotion ();
OS.memmove (gdkEvent, event, GdkEventMotion.sizeof);
if (this == display.currentControl && (hooks (SWT.MouseHover) || filters (SWT.MouseHover))) {
-@@ -2892,7 +2892,7 @@
+@@ -2892,7 +2892,7 @@ int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) {
int state = gdkEvent.state;
if (gdkEvent.is_hint != 0) {
int [] pointer_x = new int [1], pointer_y = new int [1], mask = new int [1];
@@ -35617,7 +35857,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gdk_window_get_pointer (window, pointer_x, pointer_y, mask);
x = pointer_x [0];
y = pointer_y [0];
-@@ -2902,32 +2902,32 @@
+@@ -2902,32 +2902,32 @@ int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
@@ -35657,7 +35897,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
GdkEventScroll gdkEvent = new GdkEventScroll ();
OS.memmove (gdkEvent, eventPtr, GdkEventScroll.sizeof);
switch (gdkEvent.direction) {
-@@ -2943,29 +2943,29 @@
+@@ -2943,29 +2943,29 @@ int /*long*/ gtk_scroll_event (int /*long*/ widget, int /*long*/ eventPtr) {
return 0;
}
@@ -35694,7 +35934,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (window == paintWindow) {
if (gdkEvent.state == OS.GDK_VISIBILITY_FULLY_OBSCURED) {
state |= OBSCURED;
-@@ -2984,7 +2984,7 @@
+@@ -2984,7 +2984,7 @@ int /*long*/ gtk_visibility_notify_event (int /*long*/ widget, int /*long*/ even
return 0;
}
@@ -35703,7 +35943,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_size_request (widget, requisition);
}
-@@ -3001,11 +3001,11 @@
+@@ -3001,11 +3001,11 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {
* @param data the platform specific GC data
* @return the platform specific GC handle
*/
@@ -35718,7 +35958,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (gdkGC == 0) error (SWT.ERROR_NO_HANDLES);
if (data != null) {
int mask = SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT;
-@@ -3027,7 +3027,7 @@
+@@ -3027,7 +3027,7 @@ public int /*long*/ internal_new_GC (GCData data) {
return gdkGC;
}
@@ -35727,7 +35967,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
return 0;
}
-@@ -3044,7 +3044,7 @@
+@@ -3044,7 +3044,7 @@ int /*long*/ imHandle () {
* @param hDC the platform specific GC handle
* @param data the platform specific GC data
*/
@@ -35736,7 +35976,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
checkWidget ();
OS.g_object_unref (gdkGC);
}
-@@ -3184,7 +3184,7 @@
+@@ -3184,7 +3184,7 @@ boolean mnemonicMatch (char key) {
void register () {
super.register ();
if (fixedHandle != 0) display.addWidget (fixedHandle, this);
@@ -35745,7 +35985,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (imHandle != 0) display.addWidget (imHandle, this);
}
-@@ -3260,7 +3260,7 @@
+@@ -3260,7 +3260,7 @@ void redrawChildren () {
void redrawWidget (int x, int y, int width, int height, boolean redrawAll, boolean all, boolean trim) {
if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_REALIZED) == 0) return;
@@ -35754,7 +35994,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
GdkRectangle rect = new GdkRectangle ();
if (redrawAll) {
int [] w = new int [1], h = new int [1];
-@@ -3310,7 +3310,7 @@
+@@ -3310,7 +3310,7 @@ void releaseWidget () {
super.releaseWidget ();
if (display.currentControl == this) display.currentControl = null;
display.removeMouseHoverTimeout (handle);
@@ -35763,7 +36003,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (imHandle != 0) {
OS.gtk_im_context_reset (imHandle);
OS.gtk_im_context_set_client_window (imHandle, 0);
-@@ -3376,7 +3376,7 @@
+@@ -3376,7 +3376,7 @@ void sendFocusEvent (int type) {
}
}
@@ -35772,7 +36012,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
Control control = this;
while (control != null) {
if (control.hooks (SWT.Help)) {
-@@ -3407,7 +3407,7 @@
+@@ -3407,7 +3407,7 @@ boolean sendMouseEvent (int type, int button, int count, int detail, boolean sen
event.x = (int)x;
event.y = (int)y;
} else {
@@ -35781,7 +36021,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
event.x = (int)x - origin_x [0];
-@@ -3461,7 +3461,7 @@
+@@ -3461,7 +3461,7 @@ public void setBackground (Color color) {
}
boolean set = false;
if (gdkColor == null) {
@@ -35790,7 +36030,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
set = (OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_NORMAL) & OS.GTK_RC_BG) != 0;
} else {
GdkColor oldColor = getBackgroundColor ();
-@@ -3478,10 +3478,10 @@
+@@ -3478,10 +3478,10 @@ public void setBackground (Color color) {
}
}
@@ -35804,7 +36044,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (ptr != 0) OS.g_free (ptr);
String name = color == null ? "<parent>" : "<none>";
byte[] buffer = Converter.wcsToMbcs (null, name, true);
-@@ -3535,8 +3535,8 @@
+@@ -3535,8 +3535,8 @@ public void setBackgroundImage (Image image) {
redrawChildren ();
}
@@ -35815,7 +36055,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (window != 0) OS.gdk_window_set_back_pixmap (window, backgroundImage.pixmap, false);
}
-@@ -3590,14 +3590,14 @@
+@@ -3590,14 +3590,14 @@ public void setCursor (Cursor cursor) {
setCursor (cursor != null ? cursor.handle : 0);
}
@@ -35833,7 +36073,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.XFlush (xDisplay);
}
}
-@@ -3665,9 +3665,9 @@
+@@ -3665,9 +3665,9 @@ public void setEnabled (boolean enabled) {
}
} else {
OS.gtk_widget_realize (handle);
@@ -35846,7 +36086,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
GdkWindowAttr attributes = new GdkWindowAttr ();
attributes.x = OS.GTK_WIDGET_X (topHandle);
attributes.y = OS.GTK_WIDGET_Y (topHandle);
-@@ -3682,9 +3682,9 @@
+@@ -3682,9 +3682,9 @@ public void setEnabled (boolean enabled) {
if (!OS.GDK_WINDOWING_X11 ()) {
OS.gdk_window_raise (enableWindow);
} else {
@@ -35859,7 +36099,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int xScreen = OS.XDefaultScreen (xDisplay);
int flags = OS.CWStackMode | OS.CWSibling;
XWindowChanges changes = new XWindowChanges ();
-@@ -3737,7 +3737,7 @@
+@@ -3737,7 +3737,7 @@ public void setFont (Font font) {
checkWidget();
if (((state & FONT) == 0) && font == null) return;
this.font = font;
@@ -35868,7 +36108,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (font == null) {
fontDesc = defaultFont ().handle;
} else {
-@@ -3752,7 +3752,7 @@
+@@ -3752,7 +3752,7 @@ public void setFont (Font font) {
setFontDescription (fontDesc);
}
@@ -35877,7 +36117,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_modify_font (handle, font);
}
-@@ -3783,7 +3783,7 @@
+@@ -3783,7 +3783,7 @@ public void setForeground (Color color) {
}
boolean set = false;
if (gdkColor == null) {
@@ -35886,7 +36126,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
set = (OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_NORMAL) & OS.GTK_RC_FG) != 0;
} else {
GdkColor oldColor = getForegroundColor ();
-@@ -3811,7 +3811,7 @@
+@@ -3811,7 +3811,7 @@ void setInitialBounds () {
* first sized. The fix is to set the value to (0, 0) as
* expected by SWT.
*/
@@ -35895,7 +36135,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if ((parent.style & SWT.MIRRORED) != 0) {
OS.GTK_WIDGET_SET_X (topHandle, parent.getClientWidth ());
} else {
-@@ -3893,7 +3893,7 @@
+@@ -3893,7 +3893,7 @@ public boolean setParent (Composite parent) {
if (this.parent == parent) return true;
if (!isReparentable ()) return false;
OS.gtk_widget_realize (parent.handle);
@@ -35904,7 +36144,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int x = OS.GTK_WIDGET_X (topHandle);
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (topHandle);
if ((this.parent.style & SWT.MIRRORED) != 0) {
-@@ -3912,7 +3912,7 @@
+@@ -3912,7 +3912,7 @@ public boolean setParent (Composite parent) {
newDecorations.fixAccelGroup ();
oldDecorations.fixAccelGroup ();
}
@@ -35913,7 +36153,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_reparent (topHandle, newParent);
OS.gtk_fixed_move (newParent, topHandle, x, y);
this.parent = parent;
-@@ -3925,7 +3925,7 @@
+@@ -3925,7 +3925,7 @@ void setParentBackground () {
if (fixedHandle != 0) setBackgroundColor (fixedHandle, null);
}
@@ -35922,7 +36162,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
}
boolean setRadioSelection (boolean value) {
-@@ -3960,7 +3960,7 @@
+@@ -3960,7 +3960,7 @@ public void setRedraw (boolean redraw) {
if (redraw) {
if (--drawCount == 0) {
if (redrawWindow != 0) {
@@ -35931,7 +36171,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
/* Explicitly hiding the window avoids flicker on GTK+ >= 2.6 */
OS.gdk_window_hide (redrawWindow);
OS.gdk_window_destroy (redrawWindow);
-@@ -3971,7 +3971,7 @@
+@@ -3971,7 +3971,7 @@ public void setRedraw (boolean redraw) {
} else {
if (drawCount++ == 0) {
if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_REALIZED) != 0) {
@@ -35940,7 +36180,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
Rectangle rect = getBounds ();
GdkWindowAttr attributes = new GdkWindowAttr ();
attributes.width = rect.width;
-@@ -4066,7 +4066,7 @@
+@@ -4066,7 +4066,7 @@ void setToolTipText (Shell shell, String newString) {
public void setVisible (boolean visible) {
checkWidget();
if (((state & HIDDEN) == 0) == visible) return;
@@ -35949,7 +36189,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (visible) {
/*
* It is possible (but unlikely), that application
-@@ -4147,11 +4147,11 @@
+@@ -4147,11 +4147,11 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations, boolean fi
}
}
@@ -35965,7 +36205,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (sibling != null) {
if (above && sibling.enableWindow != 0) {
siblingWindow = enableWindow;
-@@ -4159,7 +4159,7 @@
+@@ -4159,7 +4159,7 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations, boolean fi
siblingWindow = OS.GTK_WIDGET_WINDOW (siblingHandle);
}
}
@@ -35974,7 +36214,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (!OS.GDK_WINDOWING_X11 () || (siblingWindow == 0 && (!above || redrawWindow == 0))) {
if (above) {
OS.gdk_window_raise (window);
-@@ -4174,8 +4174,8 @@
+@@ -4174,8 +4174,8 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations, boolean fi
changes.sibling = OS.gdk_x11_drawable_get_xid (siblingWindow != 0 ? siblingWindow : redrawWindow);
changes.stack_mode = above ? OS.Above : OS.Below;
if (redrawWindow != 0 && siblingWindow == 0) changes.stack_mode = OS.Below;
@@ -35985,7 +36225,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
int xScreen = OS.XDefaultScreen (xDisplay);
int flags = OS.CWStackMode | OS.CWSibling;
/*
-@@ -4242,10 +4242,10 @@
+@@ -4242,10 +4242,10 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations, boolean fi
void setWidgetBackground () {
if (fixedHandle != 0) {
@@ -35998,7 +36238,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
modifyStyle (handle, style);
}
-@@ -4273,8 +4273,8 @@
+@@ -4273,8 +4273,8 @@ boolean showMenu (int x, int y) {
void showWidget () {
// Comment this line to disable zero-sized widgets
state |= ZERO_WIDTH | ZERO_HEIGHT;
@@ -36009,7 +36249,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
parent.setParentWindow (topHandle);
OS.gtk_container_add (parentHandle, topHandle);
if (handle != 0 && handle != topHandle) OS.gtk_widget_show (handle);
-@@ -4541,7 +4541,7 @@
+@@ -4541,7 +4541,7 @@ void update (boolean all, boolean flush) {
// checkWidget();
if (!OS.GTK_WIDGET_VISIBLE (topHandle ())) return;
if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_REALIZED) == 0) return;
@@ -36018,7 +36258,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
if (flush) display.flushExposes (window, all);
OS.gdk_window_process_updates (window, all);
OS.gdk_flush ();
-@@ -4559,7 +4559,7 @@
+@@ -4559,7 +4559,7 @@ void updateLayout (boolean all) {
/* Do nothing */
}
@@ -36027,7 +36267,7 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
switch ((int)/*64*/user_data) {
case EXPOSE_EVENT_INVERSE: {
if ((OS.GTK_VERSION < OS.VERSION (2, 8, 0)) && ((state & OBSCURED) == 0)) {
-@@ -4567,10 +4567,10 @@
+@@ -4567,10 +4567,10 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ us
if (control != null && control.backgroundImage != null) {
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove (gdkEvent, arg0, GdkEventExpose.sizeof);
@@ -36041,10 +36281,11 @@ diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widget
OS.gdk_gc_set_clip_region (gdkGC, gdkEvent.region);
int[] dest_x = new int[1], dest_y = new int[1];
OS.gtk_widget_translate_coordinates (paintHandle (), control.paintHandle (), 0, 0, dest_x, dest_y);
-diff -urN x86/org/eclipse/swt/widgets/DateTime.java x86_64/org/eclipse/swt/widgets/DateTime.java
---- x86/org/eclipse/swt/widgets/DateTime.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/DateTime.java 2009-09-17 08:48:24.000000000 -0400
-@@ -483,17 +483,17 @@
+diff --git a/org/eclipse/swt/widgets/DateTime.java b/org/eclipse/swt/widgets/DateTime.java
+index 11248e3..b257294 100644
+--- a/org/eclipse/swt/widgets/DateTime.java
++++ b/org/eclipse/swt/widgets/DateTime.java
+@@ -483,17 +483,17 @@ public int getYear () {
}
}
@@ -36065,10 +36306,11 @@ diff -urN x86/org/eclipse/swt/widgets/DateTime.java x86_64/org/eclipse/swt/widge
sendSelectionEvent ();
return 0;
}
-diff -urN x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/widgets/Decorations.java
---- x86/org/eclipse/swt/widgets/Decorations.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Decorations.java 2009-09-17 08:48:24.000000000 -0400
-@@ -102,7 +102,7 @@
+diff --git a/org/eclipse/swt/widgets/Decorations.java b/org/eclipse/swt/widgets/Decorations.java
+index 38ed5a2..d95979b 100644
+--- a/org/eclipse/swt/widgets/Decorations.java
++++ b/org/eclipse/swt/widgets/Decorations.java
+@@ -102,7 +102,7 @@ public class Decorations extends Canvas {
Menu [] menus;
Control savedFocus;
Button defaultButton, saveDefault;
@@ -36077,7 +36319,7 @@ diff -urN x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/wi
Decorations () {
/* Do nothing */
-@@ -171,17 +171,17 @@
+@@ -171,17 +171,17 @@ void _setImages (Image [] images) {
sort (bestImages);
images = bestImages;
}
@@ -36099,7 +36341,7 @@ diff -urN x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/wi
while (temp != 0) {
OS.memmove (data, temp, OS.PTR_SIZEOF);
OS.g_object_unref (data [0]);
-@@ -232,7 +232,7 @@
+@@ -232,7 +232,7 @@ void createAccelGroup () {
accelGroup = OS.gtk_accel_group_new ();
if (accelGroup == 0) SWT.error (SWT.ERROR_NO_HANDLES);
//FIXME - what should we do for Decorations
@@ -36108,7 +36350,7 @@ diff -urN x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/wi
OS.gtk_window_add_accel_group (shellHandle, accelGroup);
}
-@@ -243,7 +243,7 @@
+@@ -243,7 +243,7 @@ void createWidget (int index) {
void destroyAccelGroup () {
if (accelGroup == 0) return;
@@ -36117,7 +36359,7 @@ diff -urN x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/wi
OS.gtk_window_remove_accel_group (shellHandle, accelGroup);
//TEMPORARY CODE
// OS.g_object_unref (accelGroup);
-@@ -533,7 +533,7 @@
+@@ -533,7 +533,7 @@ boolean restoreFocus () {
*/
public void setDefaultButton (Button button) {
checkWidget();
@@ -36126,7 +36368,7 @@ diff -urN x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/wi
if (button != null) {
if (button.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
if (button.menuShell () != this) error (SWT.ERROR_INVALID_PARENT);
-@@ -745,7 +745,7 @@
+@@ -745,7 +745,7 @@ boolean traverseReturn () {
* key.
*/
if (!button.isVisible () || !button.isEnabled ()) return true;
@@ -36135,10 +36377,11 @@ diff -urN x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/wi
return OS.gtk_window_activate_default (shellHandle);
}
-diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/swt/widgets/DirectoryDialog.java
---- x86/org/eclipse/swt/widgets/DirectoryDialog.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/DirectoryDialog.java 2009-09-17 08:48:24.000000000 -0400
-@@ -125,16 +125,16 @@
+diff --git a/org/eclipse/swt/widgets/DirectoryDialog.java b/org/eclipse/swt/widgets/DirectoryDialog.java
+index 8b31222..9458aaf 100644
+--- a/org/eclipse/swt/widgets/DirectoryDialog.java
++++ b/org/eclipse/swt/widgets/DirectoryDialog.java
+@@ -125,16 +125,16 @@ public String open () {
}
String openChooserDialog () {
byte [] titleBytes = Converter.wcsToMbcs (null, title, true);
@@ -36158,7 +36401,7 @@ diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/sw
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
-@@ -152,7 +152,7 @@
+@@ -152,7 +152,7 @@ String openChooserDialog () {
* when setting a file name that is not a true canonical path.
* The fix is to use the canonical path.
*/
@@ -36167,7 +36410,7 @@ diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/sw
if (ptr != 0) {
OS.gtk_file_chooser_set_current_folder (handle, ptr);
OS.g_free (ptr);
-@@ -160,9 +160,9 @@
+@@ -160,9 +160,9 @@ String openChooserDialog () {
}
if (message.length () > 0) {
byte [] buffer = Converter.wcsToMbcs (null, message, true);
@@ -36179,7 +36422,7 @@ diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/sw
if (label == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_container_add (box, label);
OS.gtk_widget_show (label);
-@@ -178,7 +178,7 @@
+@@ -178,7 +178,7 @@ String openChooserDialog () {
display.setModalDialog (this);
}
int signalId = 0;
@@ -36188,7 +36431,7 @@ diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/sw
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
-@@ -191,13 +191,13 @@
+@@ -191,13 +191,13 @@ String openChooserDialog () {
display.setModalDialog (oldModal);
}
if (response == OS.GTK_RESPONSE_OK) {
@@ -36206,7 +36449,7 @@ diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/sw
OS.g_free (utf8Ptr);
if (utf16Ptr != 0) {
int clength = (int)/*64*/items_written [0];
-@@ -216,11 +216,11 @@
+@@ -216,11 +216,11 @@ String openChooserDialog () {
}
String openClassicDialog () {
byte [] titleBytes = Converter.wcsToMbcs (null, title, true);
@@ -36221,7 +36464,7 @@ diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/sw
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
-@@ -236,8 +236,8 @@
+@@ -236,8 +236,8 @@ String openClassicDialog () {
int length = path.length ();
char [] buffer = new char [length + 1];
path.getChars (0, length, buffer, 0);
@@ -36232,7 +36475,7 @@ diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/sw
OS.gtk_file_selection_set_filename (handle, fileNamePtr);
OS.g_free (utf8Ptr);
OS.g_free (fileNamePtr);
-@@ -245,12 +245,12 @@
+@@ -245,12 +245,12 @@ String openClassicDialog () {
GtkFileSelection selection = new GtkFileSelection ();
OS.memmove (selection, handle);
OS.gtk_file_selection_hide_fileop_buttons (handle);
@@ -36247,7 +36490,7 @@ diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/sw
OS.gtk_label_set_line_wrap (labelHandle, true);
OS.gtk_misc_set_alignment (labelHandle, 0.0f, 0.0f);
OS.gtk_container_add (selection.main_vbox, labelHandle);
-@@ -266,7 +266,7 @@
+@@ -266,7 +266,7 @@ String openClassicDialog () {
display.setModalDialog (this);
}
int signalId = 0;
@@ -36256,7 +36499,7 @@ diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/sw
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
-@@ -279,11 +279,11 @@
+@@ -279,11 +279,11 @@ String openClassicDialog () {
display.setModalDialog (oldModal);
}
if (response == OS.GTK_RESPONSE_OK) {
@@ -36272,10 +36515,11 @@ diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/sw
if (utf16Ptr != 0) {
int length = (int)/*64*/items_written [0];
char [] buffer = new char [length];
-diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets/Display.java
---- x86/org/eclipse/swt/widgets/Display.java 2009-05-29 17:20:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Display.java 2009-09-17 08:48:24.000000000 -0400
-@@ -98,29 +98,29 @@
+diff --git a/org/eclipse/swt/widgets/Display.java b/org/eclipse/swt/widgets/Display.java
+index 0e1945f..0f08ad2 100644
+--- a/org/eclipse/swt/widgets/Display.java
++++ b/org/eclipse/swt/widgets/Display.java
+@@ -98,29 +98,29 @@ public class Display extends Device {
/* Events Dispatching and Callback */
int gdkEventCount;
@@ -36311,7 +36555,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
Widget lastWidget;
Widget [] widgetTable;
final static int GROW_SIZE = 1024;
-@@ -151,7 +151,7 @@
+@@ -151,7 +151,7 @@ public class Display extends Device {
/* Input method resources */
Control imControl;
@@ -36320,7 +36564,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
/* Sync/Async Widget Communication */
Synchronizer synchronizer = new Synchronizer (this);
-@@ -167,40 +167,40 @@
+@@ -167,40 +167,40 @@ public class Display extends Device {
int [] timerIds;
Runnable [] timerList;
Callback timerCallback;
@@ -36370,7 +36614,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
int idleHandle;
Callback idleCallback;
static final String ADD_IDLE_PROC_KEY = "org.eclipse.swt.internal.gtk.addIdleProc"; //$NON-NLS-1$
-@@ -211,29 +211,29 @@
+@@ -211,29 +211,29 @@ public class Display extends Device {
/* GtkTreeView callbacks */
int[] treeSelection;
int treeSelectionLength;
@@ -36407,7 +36651,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
boolean settingsChanged, runSettings;
/* Entry focus behaviour */
-@@ -243,14 +243,14 @@
+@@ -243,14 +243,14 @@ public class Display extends Device {
Control currentControl;
/* Flush exposes */
@@ -36425,7 +36669,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
/* System Resources */
Font systemFont;
-@@ -280,20 +280,20 @@
+@@ -280,20 +280,20 @@ public class Display extends Device {
int lastEventTime, lastUserEventTime;
/* Pango layout constructor */
@@ -36453,7 +36697,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
/* Key Mappings */
static final int [] [] KeyTable = {
-@@ -522,16 +522,16 @@
+@@ -522,16 +522,16 @@ public void addFilter (int eventType, Listener listener) {
filterTable.hook (eventType, listener);
}
@@ -36473,7 +36717,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
System.arraycopy (gdkEvents, 0, newEvents, 0, gdkEventCount);
gdkEvents = newEvents;
Widget [] newWidgets = new Widget [length];
-@@ -539,7 +539,7 @@
+@@ -539,7 +539,7 @@ void addGdkEvent (int /*long*/ event) {
gdkEventWidgets = newWidgets;
}
Widget widget = null;
@@ -36482,7 +36726,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (handle != 0) {
do {
widget = getWidget (handle);
-@@ -590,7 +590,7 @@
+@@ -590,7 +590,7 @@ public void addListener (int eventType, Listener listener) {
eventTable.hook (eventType, listener);
}
@@ -36491,7 +36735,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
allChildren = OS.g_list_append (allChildren, widget);
if (recurse != 0 && OS.GTK_IS_CONTAINER (widget)) {
OS.gtk_container_forall (widget, allChildrenProc, recurse);
-@@ -598,7 +598,7 @@
+@@ -598,7 +598,7 @@ int /*long*/ allChildrenProc (int /*long*/ widget, int /*long*/ recurse) {
return 0;
}
@@ -36500,7 +36744,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (mouseHoverId != 0) OS.gtk_timeout_remove (mouseHoverId);
mouseHoverId = OS.gtk_timeout_add (400, mouseHoverProc, handle);
mouseHoverHandle = handle;
-@@ -623,7 +623,7 @@
+@@ -623,7 +623,7 @@ void addPopup (Menu menu) {
popups [index] = menu;
}
@@ -36509,7 +36753,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (handle == 0) return;
if (freeSlot == -1) {
int length = (freeSlot = indexTable.length) + GROW_SIZE;
-@@ -696,12 +696,12 @@
+@@ -696,12 +696,12 @@ public void beep () {
if (!OS.GDK_WINDOWING_X11 ()) {
OS.gdk_flush ();
} else {
@@ -36524,7 +36768,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
Widget widget = getWidget (data);
if (widget == null) return 0;
return widget.cellDataProc (tree_column, cell, tree_model, iter, data);
-@@ -724,7 +724,7 @@
+@@ -724,7 +724,7 @@ static void checkDisplay (Thread thread, boolean multiple) {
}
}
@@ -36533,7 +36777,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
int type = OS.X_EVENT_TYPE (xEvent);
switch (type) {
case OS.VisibilityNotify:
-@@ -734,11 +734,11 @@
+@@ -734,11 +734,11 @@ int /*long*/ checkIfEventProc (int /*long*/ display, int /*long*/ xEvent, int /*
default:
return 0;
}
@@ -36547,7 +36791,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
do {
if (tempWindow == flushWindow) break;
} while ((tempWindow = OS.gdk_window_get_parent (tempWindow)) != 0);
-@@ -763,7 +763,7 @@
+@@ -763,7 +763,7 @@ int /*long*/ checkIfEventProc (int /*long*/ display, int /*long*/ xEvent, int /*
case OS.VisibilityNotify: {
OS.memmove (visibilityEvent, xEvent, XVisibilityEvent.sizeof);
OS.gdk_window_get_user_data (window, flushData);
@@ -36556,7 +36800,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
Widget widget = handle != 0 ? getWidget (handle) : null;
if (widget != null && widget instanceof Control) {
Control control = (Control) widget;
-@@ -859,11 +859,11 @@
+@@ -859,11 +859,11 @@ void createDisplay (DeviceData data) {
OS.g_thread_init (0);
}
OS.gtk_set_locale();
@@ -36570,7 +36814,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (ptr != 0) {
int length = OS.strlen (ptr);
byte [] buffer = new byte [length];
-@@ -963,9 +963,9 @@
+@@ -963,9 +963,9 @@ void createDisplay (DeviceData data) {
}
Image createImage (String name) {
@@ -36582,7 +36826,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.gtk_icon_factory_lookup_default (buffer), style,
OS.GTK_TEXT_DIR_NONE, OS.GTK_STATE_NORMAL, OS.GTK_ICON_SIZE_DIALOG, 0, 0);
if (pixbuf == 0) return null;
-@@ -973,7 +973,7 @@
+@@ -973,7 +973,7 @@ Image createImage (String name) {
int height = OS.gdk_pixbuf_get_height (pixbuf);
int stride = OS.gdk_pixbuf_get_rowstride (pixbuf);
boolean hasAlpha = OS.gdk_pixbuf_get_has_alpha (pixbuf);
@@ -36591,7 +36835,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
byte [] data = new byte [stride * height];
OS.memmove (data, pixels, data.length);
OS.g_object_unref (pixbuf);
-@@ -998,29 +998,29 @@
+@@ -998,29 +998,29 @@ Image createImage (String name) {
return new Image (this, imageData);
}
@@ -36629,7 +36873,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.memmove(maskLine, maskOffset, maskStride);
for (int x=0; x<w[0]; x++) {
if (maskLine[x * 3] == 0) {
-@@ -1039,10 +1039,10 @@
+@@ -1039,10 +1039,10 @@ static int /*long*/ createPixbuf(Image image) {
if (hasAlpha) {
byte [] alpha = data.alphaData;
int stride = OS.gdk_pixbuf_get_rowstride (pixbuf);
@@ -36642,7 +36886,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.memmove (line, offset, stride);
for (int x = 0; x < w [0]; x++) {
line [x*4+3] = alpha [y*w [0]+x];
-@@ -1081,7 +1081,7 @@
+@@ -1081,7 +1081,7 @@ protected void destroy () {
void destroyDisplay () {
}
@@ -36651,7 +36895,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (OS.gtk_widget_get_toplevel (OS.g_value_peek_pointer(param_values)) == data) {
OS.gtk_widget_set_direction (OS.g_value_peek_pointer(param_values), OS.GTK_TEXT_DIR_RTL);
}
-@@ -1150,7 +1150,7 @@
+@@ -1150,7 +1150,7 @@ void error (int code) {
SWT.error (code);
}
@@ -36660,7 +36904,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
/*
* Use gdk_event_get_time() rather than event.time or
* gtk_get_current_event_time(). If the event does not
-@@ -1205,7 +1205,7 @@
+@@ -1205,7 +1205,7 @@ int /*long*/ eventProc (int /*long*/ event, int /*long*/ data) {
* <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
* </ul>
*/
@@ -36669,7 +36913,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
checkDevice ();
return getWidget (handle);
}
-@@ -1232,7 +1232,7 @@
+@@ -1232,7 +1232,7 @@ public Widget findWidget (int /*long*/ handle) {
*
* @since 3.1
*/
@@ -36678,7 +36922,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
checkDevice ();
return null;
}
-@@ -1254,12 +1254,12 @@
+@@ -1254,12 +1254,12 @@ public Widget findWidget (int /*long*/ handle, int /*long*/ id) {
*
* @since 3.3
*/
@@ -36693,7 +36937,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
GtkWidgetClass klass = new GtkWidgetClass ();
OS.memmove (klass, g_class);
klass.map = fixedMapProc;
-@@ -1269,21 +1269,21 @@
+@@ -1269,21 +1269,21 @@ static int /*long*/ fixedClassInitProc (int /*long*/ g_class, int /*long*/ class
return 0;
}
@@ -36718,7 +36962,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
GtkCellRendererClass klass = new GtkCellRendererClass ();
OS.memmove (klass, g_class);
klass.render = rendererRenderProc;
-@@ -1292,28 +1292,28 @@
+@@ -1292,28 +1292,28 @@ static int /*long*/ rendererClassInitProc (int /*long*/ g_class, int /*long*/ cl
return 0;
}
@@ -36752,7 +36996,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.XCheckIfEvent (xDisplay, xEvent, checkIfEventProc, 0);
OS.g_free (xEvent);
this.flushWindow = 0;
-@@ -1366,7 +1366,7 @@
+@@ -1366,7 +1366,7 @@ public static Display getCurrent () {
int getCaretBlinkTime () {
// checkDevice ();
@@ -36761,7 +37005,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (settings == 0) return 500;
int [] buffer = new int [1];
OS.g_object_get (settings, OS.gtk_cursor_blink, buffer, 0);
-@@ -1396,9 +1396,9 @@
+@@ -1396,9 +1396,9 @@ int getCaretBlinkTime () {
public Control getCursorControl () {
checkDevice();
int[] x = new int[1], y = new int[1];
@@ -36774,7 +37018,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (window != 0) {
OS.gdk_window_get_user_data (window, user_data);
handle = user_data [0];
-@@ -1411,8 +1411,8 @@
+@@ -1411,8 +1411,8 @@ public Control getCursorControl () {
if (!OS.GDK_WINDOWING_X11 ()) return null;
OS.gdk_error_trap_push ();
int[] unusedInt = new int[1];
@@ -36785,7 +37029,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
do {
if (OS.XQueryPointer (xDisplay, xParent, unusedPtr, buffer, unusedInt, unusedInt, unusedInt, unusedInt, unusedInt) == 0) {
handle = 0;
-@@ -1420,7 +1420,7 @@
+@@ -1420,7 +1420,7 @@ public Control getCursorControl () {
}
if ((xWindow = buffer [0]) != 0) {
xParent = xWindow;
@@ -36794,7 +37038,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (gdkWindow != 0) {
OS.gdk_window_get_user_data (gdkWindow, user_data);
if (user_data[0] != 0) handle = user_data[0];
-@@ -1440,15 +1440,15 @@
+@@ -1440,15 +1440,15 @@ public Control getCursorControl () {
return null;
}
@@ -36813,7 +37057,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_style_get (handle, OS.inner_border, borderPtr,0);
if (borderPtr[0] != 0) {
OS.memmove (gtkBorder, borderPtr[0], GtkBorder.sizeof);
-@@ -1473,7 +1473,7 @@
+@@ -1473,7 +1473,7 @@ boolean filters (int eventType) {
return filterTable.hooks (eventType);
}
@@ -36822,7 +37066,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (data == 0) {
/*
* Feature in GTK. When button 4, 5, 6, or 7 is released, GTK
-@@ -1630,19 +1630,19 @@
+@@ -1630,19 +1630,19 @@ public Point getDPI () {
return new Point (dpi, dpi);
}
@@ -36846,7 +37090,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
return toggle_renderer_type;
}
-@@ -1687,7 +1687,7 @@
+@@ -1687,7 +1687,7 @@ public int getDismissalAlignment () {
checkDevice ();
int [] buffer = new int [1];
if (OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) {
@@ -36855,7 +37099,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.g_object_get (settings, OS.gtk_alternative_button_order, buffer, 0);
}
return buffer [0] == 1 ? SWT.LEFT : SWT.RIGHT;
-@@ -1707,7 +1707,7 @@
+@@ -1707,7 +1707,7 @@ public int getDismissalAlignment () {
*/
public int getDoubleClickTime () {
checkDevice ();
@@ -36864,7 +37108,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
int [] buffer = new int [1];
OS.g_object_get (settings, OS.gtk_double_click_time, buffer, 0);
return buffer [0];
-@@ -1732,8 +1732,8 @@
+@@ -1732,8 +1732,8 @@ public Control getFocusControl () {
return focusControl;
}
if (activeShell == null) return null;
@@ -36875,7 +37119,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (handle == 0) return null;
do {
Widget widget = getWidget (handle);
-@@ -1830,12 +1830,12 @@
+@@ -1830,12 +1830,12 @@ Dialog getModalDialog () {
*/
Rectangle getWorkArea() {
byte[] name = Converter.wcsToMbcs (null, "_NET_WORKAREA", true); //$NON-NLS-1$
@@ -36891,7 +37135,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (!OS.gdk_property_get (OS.GDK_ROOT_PARENT (), atom, OS.GDK_NONE, 0, 16, 0, actualType, actualFormat, actualLength, data)) {
return null;
}
-@@ -1866,7 +1866,7 @@
+@@ -1866,7 +1866,7 @@ public Monitor [] getMonitors () {
checkDevice ();
Monitor [] monitors = null;
Rectangle workArea = getWorkArea();
@@ -36900,7 +37144,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (screen != 0) {
int monitorCount = OS.gdk_screen_get_n_monitors (screen);
if (monitorCount > 0) {
-@@ -2168,12 +2168,12 @@
+@@ -2168,12 +2168,12 @@ void initializeSystemColors () {
GdkColor gdkColor;
/* Get Tooltip resources */
@@ -36915,7 +37159,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
gdkColor = new GdkColor();
OS.gtk_style_get_fg (tooltipStyle, OS.GTK_STATE_NORMAL, gdkColor);
COLOR_INFO_FOREGROUND = gdkColor;
-@@ -2183,7 +2183,7 @@
+@@ -2183,7 +2183,7 @@ void initializeSystemColors () {
OS.gtk_widget_destroy (tooltipShellHandle);
/* Get Shell resources */
@@ -36924,7 +37168,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
gdkColor = new GdkColor();
OS.gtk_style_get_black (style, gdkColor);
COLOR_WIDGET_DARK_SHADOW = gdkColor;
-@@ -2264,8 +2264,8 @@
+@@ -2264,8 +2264,8 @@ void initializeSystemColors () {
public Font getSystemFont () {
checkDevice ();
if (systemFont != null) return systemFont;
@@ -36935,7 +37179,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
return systemFont = Font.gtk_new (this, defaultFont);
}
-@@ -2303,10 +2303,10 @@
+@@ -2303,10 +2303,10 @@ public Thread getThread () {
}
}
@@ -36948,7 +37192,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (0 <= index && index < widgetTable.length) {
lastHandle = handle;
return lastWidget = widgetTable [(int)/*64*/index];
-@@ -2314,7 +2314,7 @@
+@@ -2314,7 +2314,7 @@ Widget getWidget (int /*long*/ handle) {
return null;
}
@@ -36957,7 +37201,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
boolean result = runAsyncMessages (false);
if (!result) {
synchronized (idleLock) {
-@@ -2344,7 +2344,7 @@
+@@ -2344,7 +2344,7 @@ protected void init () {
}
void initializeCallbacks () {
@@ -36966,7 +37210,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
signalIds = new int [Widget.LAST_SIGNAL];
/* Cache signals for GtkWidget */
-@@ -2540,8 +2540,8 @@
+@@ -2540,8 +2540,8 @@ void initializeSubclasses () {
pangoLayoutNewCallback = new Callback (this, "pangoLayoutNewProc", 3); //$NON-NLS-1$
pangoLayoutNewProc = pangoLayoutNewCallback.getAddress ();
if (pangoLayoutNewProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
@@ -36977,7 +37221,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
pangoLayoutNewDefaultProc = OS.G_OBJECT_CLASS_CONSTRUCTOR (pangoLayoutClass);
OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, pangoLayoutNewProc);
OS.g_type_class_unref (pangoLayoutClass);
-@@ -2563,10 +2563,10 @@
+@@ -2563,10 +2563,10 @@ void initializeSystemSettings () {
* fix is to for the initializaion by creating
* a temporary GtkEntry.
*/
@@ -36990,7 +37234,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.g_object_get (settings, OS.gtk_entry_select_on_focus, buffer2, 0);
entrySelectOnFocus = buffer2 [0] != 0;
}
-@@ -2582,9 +2582,9 @@
+@@ -2582,9 +2582,9 @@ void initializeWindowManager () {
/* Get the window manager name */
windowManager = ""; //$NON-NLS-1$
if (OS.GTK_VERSION >= OS.VERSION (2, 2, 0)) {
@@ -37002,7 +37246,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (ptr2 != 0) {
int length = OS.strlen (ptr2);
if (length > 0) {
-@@ -2610,7 +2610,7 @@
+@@ -2610,7 +2610,7 @@ void initializeWindowManager () {
* @param hDC the platform specific GC handle
* @param data the platform specific GC data
*/
@@ -37011,7 +37255,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.g_object_unref (gdkGC);
}
-@@ -2634,10 +2634,10 @@
+@@ -2634,10 +2634,10 @@ public void internal_dispose_GC (int /*long*/ gdkGC, GCData data) {
* <li>ERROR_NO_HANDLES if a handle could not be obtained for gc creation</li>
* </ul>
*/
@@ -37025,7 +37269,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (gdkGC == 0) SWT.error (SWT.ERROR_NO_HANDLES);
OS.gdk_gc_set_subwindow (gdkGC, OS.GDK_INCLUDE_INFERIORS);
if (data != null) {
-@@ -2743,7 +2743,7 @@
+@@ -2743,7 +2743,7 @@ public Point map (Control from, Control to, int x, int y) {
Point point = new Point (x, y);
if (from == to) return point;
if (from != null) {
@@ -37034,7 +37278,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
if ((from.style & SWT.MIRRORED) != 0) point.x = from.getClientWidth () - point.x;
-@@ -2751,7 +2751,7 @@
+@@ -2751,7 +2751,7 @@ public Point map (Control from, Control to, int x, int y) {
point.y += origin_y [0];
}
if (to != null) {
@@ -37043,7 +37287,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
point.x -= origin_x [0];
-@@ -2820,7 +2820,7 @@
+@@ -2820,7 +2820,7 @@ static char mbcsToWcs (char ch) {
return result [0];
}
@@ -37052,7 +37296,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
Widget widget = getWidget (menu);
if (widget == null) return 0;
return widget.menuPositionProc (menu, x, y, push_in, user_data);
-@@ -2872,7 +2872,7 @@
+@@ -2872,7 +2872,7 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei
if (from == to) return rect;
boolean fromRTL = false, toRTL = false;
if (from != null) {
@@ -37061,7 +37305,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
if (fromRTL = (from.style & SWT.MIRRORED) != 0) rect.x = from.getClientWidth() - rect.x;
-@@ -2880,7 +2880,7 @@
+@@ -2880,7 +2880,7 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei
rect.y += origin_y [0];
}
if (to != null) {
@@ -37070,7 +37314,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
rect.x -= origin_x [0];
-@@ -2891,14 +2891,14 @@
+@@ -2891,14 +2891,14 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei
return rect;
}
@@ -37088,7 +37332,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.pango_layout_set_auto_dir (layout, false);
return layout;
}
-@@ -2977,13 +2977,13 @@
+@@ -2977,13 +2977,13 @@ public boolean post (Event event) {
if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
if (event == null) error (SWT.ERROR_NULL_ARGUMENT);
if (!OS.GDK_WINDOWING_X11()) return false;
@@ -37104,7 +37348,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (keysym != 0) keyCode = OS.XKeysymToKeycode (xDisplay, keysym);
if (keyCode == 0) {
char key = event.character;
-@@ -3065,7 +3065,7 @@
+@@ -3065,7 +3065,7 @@ void postEvent (Event event) {
void putGdkEvents () {
if (gdkEventCount != 0) {
for (int i = 0; i < gdkEventCount; i++) {
@@ -37113,7 +37357,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
Widget widget = gdkEventWidgets [i];
if (widget == null || !widget.isDisposed ()) {
OS.gdk_event_put (event);
-@@ -3318,8 +3318,8 @@
+@@ -3318,8 +3318,8 @@ void releaseDisplay () {
/* Dispose subclass */
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
@@ -37124,7 +37368,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, pangoLayoutNewDefaultProc);
OS.g_type_class_unref (pangoLayoutClass);
pangoLayoutNewCallback.dispose ();
-@@ -3381,9 +3381,9 @@
+@@ -3381,9 +3381,9 @@ public void removeFilter (int eventType, Listener listener) {
if (filterTable.size () == 0) filterTable = null;
}
@@ -37136,7 +37380,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
--gdkEventCount;
System.arraycopy (gdkEvents, 1, gdkEvents, 0, gdkEventCount);
System.arraycopy (gdkEventWidgets, 1, gdkEventWidgets, 0, gdkEventCount);
-@@ -3432,7 +3432,7 @@
+@@ -3432,7 +3432,7 @@ public void removeListener (int eventType, Listener listener) {
eventTable.unhook (eventType, listener);
}
@@ -37145,7 +37389,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (handle != mouseHoverHandle) return;
if (mouseHoverId != 0) OS.gtk_timeout_remove (mouseHoverId);
mouseHoverId = 0;
-@@ -3449,7 +3449,7 @@
+@@ -3449,7 +3449,7 @@ void removePopup (Menu menu) {
}
}
@@ -37154,7 +37398,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (handle == 0) return null;
lastWidget = null;
Widget widget = null;
-@@ -3571,8 +3571,8 @@
+@@ -3571,8 +3571,8 @@ public static void setAppName (String name) {
public void setCursorLocation (int x, int y) {
checkDevice ();
if (OS.GDK_WINDOWING_X11 ()) {
@@ -37165,7 +37409,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.XWarpPointer (xDisplay, OS.None, xWindow, 0, 0, 0, 0, x, y);
}
}
-@@ -3640,7 +3640,7 @@
+@@ -3640,7 +3640,7 @@ public void setData (String key, Object value) {
}
if (key.equals (ADD_WIDGET_KEY)) {
Object [] data = (Object []) value;
@@ -37174,7 +37418,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
Widget widget = (Widget) data [1];
if (widget != null) {
addWidget (handle, widget);
-@@ -3729,10 +3729,10 @@
+@@ -3729,10 +3729,10 @@ public void setData (Object data) {
this.data = data;
}
@@ -37187,7 +37431,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (submenu != 0) {
OS.gtk_widget_set_direction (submenu, (int)/*64*/ direction);
OS.gtk_container_forall (submenu, setDirectionProc, direction);
-@@ -3807,9 +3807,9 @@
+@@ -3807,9 +3807,9 @@ void showIMWindow (Control control) {
OS.gtk_container_add (preeditWindow, preeditLabel);
OS.gtk_widget_show (preeditLabel);
}
@@ -37200,7 +37444,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
OS.gtk_im_context_get_preedit_string (imHandle, preeditString, pangoAttrs, null);
if (preeditString [0] != 0 && OS.strlen (preeditString [0]) > 0) {
Control widget = control.findBackgroundControl ();
-@@ -3863,7 +3863,7 @@
+@@ -3863,7 +3863,7 @@ public boolean sleep () {
fds = OS.g_malloc (OS.GPollFD_sizeof () * allocated_nfds);
}
max_priority [0] = timeout [0] = 0;
@@ -37209,7 +37453,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
boolean result = false;
do {
if (OS.g_main_context_acquire (context)) {
-@@ -3874,7 +3874,7 @@
+@@ -3874,7 +3874,7 @@ public boolean sleep () {
allocated_nfds = nfds;
fds = OS.g_malloc (OS.GPollFD_sizeof() * allocated_nfds);
}
@@ -37218,7 +37462,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (poll != 0) {
if (nfds > 0 || timeout [0] != 0) {
/*
-@@ -3968,7 +3968,7 @@
+@@ -3968,7 +3968,7 @@ public void timerExec (int milliseconds, Runnable runnable) {
}
}
@@ -37227,7 +37471,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
if (timerList == null) return 0;
int index = (int)/*64*/i;
if (0 <= index && index < timerList.length) {
-@@ -3980,7 +3980,7 @@
+@@ -3980,7 +3980,7 @@ int /*long*/ timerProc (int /*long*/ i) {
return 0;
}
@@ -37236,7 +37480,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
caretId = 0;
if (currentCaret == null) {
return 0;
-@@ -3995,19 +3995,19 @@
+@@ -3995,19 +3995,19 @@ int /*long*/ caretProc (int /*long*/ clientData) {
return 0;
}
@@ -37259,7 +37503,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
Widget widget = getWidget (data);
if (widget == null) return 0;
return widget.treeSelectionProc (model, path, iter, treeSelection, treeSelectionLength++);
-@@ -4065,13 +4065,13 @@
+@@ -4065,13 +4065,13 @@ void setCurrentCaret (Caret caret) {
caretId = OS.gtk_timeout_add (blinkRate, caretProc, 0);
}
@@ -37275,7 +37519,7 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
settingsChanged = true;
return 0;
}
-@@ -4179,31 +4179,31 @@
+@@ -4179,31 +4179,31 @@ static char wcsToMbcs (char ch) {
return 0;
}
@@ -37312,10 +37556,11 @@ diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widget
Widget widget = getWidget (handle);
if (widget == null) return 0;
return widget.timerProc (handle);
-diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widgets/ExpandBar.java
---- x86/org/eclipse/swt/widgets/ExpandBar.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/ExpandBar.java 2009-09-17 08:48:24.000000000 -0400
-@@ -160,14 +160,14 @@
+diff --git a/org/eclipse/swt/widgets/ExpandBar.java b/org/eclipse/swt/widgets/ExpandBar.java
+index b3584f8..3ae57b2 100644
+--- a/org/eclipse/swt/widgets/ExpandBar.java
++++ b/org/eclipse/swt/widgets/ExpandBar.java
+@@ -160,14 +160,14 @@ void createHandle (int index) {
OS.gtk_scrolled_window_set_policy (scrolledHandle, OS.GTK_POLICY_NEVER, OS.GTK_POLICY_AUTOMATIC);
OS.gtk_container_add (fixedHandle, scrolledHandle);
OS.gtk_scrolled_window_add_with_viewport (scrolledHandle, handle);
@@ -37332,7 +37577,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widg
if (topHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_fixed_set_has_window (topHandle, true);
if ((style & SWT.V_SCROLL) != 0) {
-@@ -241,11 +241,11 @@
+@@ -241,11 +241,11 @@ void destroyItem (ExpandItem item) {
layoutItems (index, true);
}
@@ -37346,7 +37591,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widg
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
if (lastFocus != null && lastFocus.setFocus ()) return true;
for (int i = 0; i < itemCount; i++) {
-@@ -366,7 +366,7 @@
+@@ -366,7 +366,7 @@ public int getSpacing () {
return spacing;
}
@@ -37355,7 +37600,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widg
if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) {
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
-@@ -387,7 +387,7 @@
+@@ -387,7 +387,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
return super.gtk_button_press_event (widget, event);
}
@@ -37364,7 +37609,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widg
if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) {
if (lastFocus != null) {
GdkEventButton gdkEvent = new GdkEventButton ();
-@@ -407,7 +407,7 @@
+@@ -407,7 +407,7 @@ int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event)
return super.gtk_button_release_event (widget, event);
}
@@ -37373,7 +37618,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widg
if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) {
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove(gdkEvent, eventPtr, GdkEventExpose.sizeof);
-@@ -425,24 +425,24 @@
+@@ -425,24 +425,24 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
return super.gtk_expose_event (widget, eventPtr);
}
@@ -37402,7 +37647,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widg
if (result != 0) return result;
int index = 0;
while (index < itemCount) {
-@@ -556,13 +556,13 @@
+@@ -556,13 +556,13 @@ void layoutItems (int index, boolean setScrollbar) {
}
}
@@ -37419,7 +37664,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widg
return OS.GTK_VERSION >= OS.VERSION (2, 4, 0) ? fixedHandle : handle;
}
-@@ -621,7 +621,7 @@
+@@ -621,7 +621,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
return result;
}
@@ -37428,7 +37673,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widg
super.setFontDescription (font);
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
for (int i = 0; i < itemCount; i++) {
-@@ -647,7 +647,7 @@
+@@ -647,7 +647,7 @@ void setScrollbar () {
ExpandItem item = items [itemCount - 1];
int maxHeight = item.y + getBandHeight () + spacing;
if (item.expanded) maxHeight += item.height;
@@ -37437,7 +37682,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widg
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, adjustmentHandle);
yCurrentScroll = (int)adjustment.value;
-@@ -667,7 +667,7 @@
+@@ -667,7 +667,7 @@ void setScrollbar () {
OS.gtk_scrolled_window_set_policy (scrolledHandle, OS.GTK_POLICY_NEVER, policy);
int width = OS.GTK_WIDGET_WIDTH (fixedHandle) - spacing * 2;
if (policy == OS.GTK_POLICY_ALWAYS) {
@@ -37446,10 +37691,11 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widg
GtkRequisition requisition = new GtkRequisition ();
OS.gtk_widget_size_request (vHandle, requisition);
width -= requisition.width;
-diff -urN x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/widgets/ExpandItem.java
---- x86/org/eclipse/swt/widgets/ExpandItem.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/ExpandItem.java 2009-09-17 08:48:24.000000000 -0400
-@@ -39,7 +39,7 @@
+diff --git a/org/eclipse/swt/widgets/ExpandItem.java b/org/eclipse/swt/widgets/ExpandItem.java
+index e141b60..39b8013 100644
+--- a/org/eclipse/swt/widgets/ExpandItem.java
++++ b/org/eclipse/swt/widgets/ExpandItem.java
+@@ -39,7 +39,7 @@ public class ExpandItem extends Item {
ExpandBar parent;
Control control;
ImageList imageList;
@@ -37458,7 +37704,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/wid
boolean expanded;
int x, y, width, height;
int imageHeight, imageWidth;
-@@ -316,7 +316,7 @@
+@@ -316,7 +316,7 @@ int getPreferredWidth (GC gc) {
return width;
}
@@ -37467,7 +37713,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/wid
Event event = new Event ();
event.item = this;
int type = OS.gtk_expander_get_expanded (handle) ? SWT.Collapse : SWT.Expand;
-@@ -324,23 +324,23 @@
+@@ -324,23 +324,23 @@ int /*long*/ gtk_activate (int /*long*/ widget) {
return 0;
}
@@ -37495,7 +37741,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/wid
parent.gtk_enter_notify_event(widget, event);
return 0;
}
-@@ -518,7 +518,7 @@
+@@ -518,7 +518,7 @@ boolean setFocus () {
return result;
}
@@ -37504,7 +37750,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/wid
OS.gtk_widget_modify_font (handle, font);
if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font);
if (imageHandle != 0) OS.gtk_widget_modify_font (imageHandle, font);
-@@ -563,7 +563,7 @@
+@@ -563,7 +563,7 @@ public void setImage (Image image) {
if (image.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
imageList = new ImageList ();
int imageIndex = imageList.add (image);
@@ -37513,7 +37759,7 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/wid
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
if (text.length () == 0) OS.gtk_widget_hide (labelHandle);
OS.gtk_widget_show (imageHandle);
-@@ -618,7 +618,7 @@
+@@ -618,7 +618,7 @@ void showWidget (int index) {
}
}
@@ -37522,10 +37768,11 @@ diff -urN x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/wid
switch ((int)/*64*/user_data) {
case ACTIVATE_INVERSE: {
expanded = OS.gtk_expander_get_expanded (handle);
-diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/widgets/FileDialog.java
---- x86/org/eclipse/swt/widgets/FileDialog.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/FileDialog.java 2009-09-17 08:48:24.000000000 -0400
-@@ -46,7 +46,7 @@
+diff --git a/org/eclipse/swt/widgets/FileDialog.java b/org/eclipse/swt/widgets/FileDialog.java
+index 6cbca21..3c71ef8 100644
+--- a/org/eclipse/swt/widgets/FileDialog.java
++++ b/org/eclipse/swt/widgets/FileDialog.java
+@@ -46,7 +46,7 @@ public class FileDialog extends Dialog {
int filterIndex = -1;
boolean overwrite = false;
boolean uriMode;
@@ -37534,7 +37781,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
static final char SEPARATOR = System.getProperty ("file.separator").charAt (0);
static final char EXTENSION_SEPARATOR = ';';
-@@ -102,7 +102,7 @@
+@@ -102,7 +102,7 @@ String computeResultChooserDialog () {
/* MULTI is only valid if the native dialog's action is Open */
fullPath = null;
if ((style & (SWT.SAVE | SWT.MULTI)) == SWT.MULTI) {
@@ -37543,7 +37790,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
if (uriMode) {
list = OS.gtk_file_chooser_get_uris (handle);
} else {
-@@ -110,11 +110,11 @@
+@@ -110,11 +110,11 @@ String computeResultChooserDialog () {
}
int listLength = OS.g_slist_length (list);
fileNames = new String [listLength];
@@ -37558,7 +37805,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
if (uriMode) {
utf8Ptr = name;
} else {
-@@ -122,8 +122,8 @@
+@@ -122,8 +122,8 @@ String computeResultChooserDialog () {
OS.g_free (name);
}
if (utf8Ptr != 0) {
@@ -37569,7 +37816,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
OS.g_free (utf8Ptr);
if (utf16Ptr != 0) {
int clength = (int)/*64*/items_written [0];
-@@ -143,19 +143,19 @@
+@@ -143,19 +143,19 @@ String computeResultChooserDialog () {
}
OS.g_slist_free (list);
} else {
@@ -37593,7 +37840,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
OS.g_free (utf8Ptr);
if (utf16Ptr != 0) {
int clength = (int)/*64*/items_written [0];
-@@ -169,9 +169,9 @@
+@@ -169,9 +169,9 @@ String computeResultChooserDialog () {
}
}
filterIndex = -1;
@@ -37605,7 +37852,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
if (filterNamePtr != 0) {
int length = OS.strlen (filterNamePtr);
byte[] buffer = new byte [length];
-@@ -204,23 +204,23 @@
+@@ -204,23 +204,23 @@ String computeResultClassicDialog () {
filterIndex = -1;
GtkFileSelection selection = new GtkFileSelection ();
OS.memmove (selection, handle);
@@ -37638,7 +37885,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
if (OS.gtk_tree_model_get_iter (model [0], iter, path)) {
OS.gtk_tree_model_get (model [0], iter, 0, ptr, -1);
}
-@@ -237,10 +237,10 @@
+@@ -237,10 +237,10 @@ String computeResultClassicDialog () {
OS.gtk_entry_set_text (entry, buffer);
}
@@ -37653,7 +37900,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
entryLength = (int)/*64*/items_written [0];
char [] buffer = new char [entryLength];
OS.memmove (buffer, utf16Ptr, entryLength * 2);
-@@ -258,9 +258,9 @@
+@@ -258,9 +258,9 @@ String computeResultClassicDialog () {
if ((style & SWT.MULTI) == 0) {
fileNames = new String[] {fileName};
} else {
@@ -37666,7 +37913,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
OS.memmove (namePtr, namesPtr1, OS.PTR_SIZEOF);
int length = 0;
while (namePtr[0] != 0) {
-@@ -269,11 +269,11 @@
+@@ -269,11 +269,11 @@ String computeResultClassicDialog () {
OS.memmove(namePtr, namesPtr1, OS.PTR_SIZEOF);
}
fileNames = new String [length];
@@ -37680,7 +37927,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
buffer = new char [(int)/*64*/items_written [0]];
OS.memmove (buffer, utf16Ptr, items_written [0] * 2);
-@@ -391,7 +391,7 @@
+@@ -391,7 +391,7 @@ String openChooserDialog () {
int action = (style & SWT.SAVE) != 0 ?
OS.GTK_FILE_CHOOSER_ACTION_SAVE :
OS.GTK_FILE_CHOOSER_ACTION_OPEN;
@@ -37689,7 +37936,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();
if (display.getDismissalAlignment() == SWT.RIGHT) {
handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, action, OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL, OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK, 0);
-@@ -399,7 +399,7 @@
+@@ -399,7 +399,7 @@ String openChooserDialog () {
handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, action, OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK, OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL, 0);
}
OS.gtk_window_set_modal (handle, true);
@@ -37698,7 +37945,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
-@@ -416,7 +416,7 @@
+@@ -416,7 +416,7 @@ String openChooserDialog () {
display.setModalDialog (this);
}
int signalId = 0;
@@ -37707,7 +37954,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
-@@ -439,9 +439,9 @@
+@@ -439,9 +439,9 @@ String openClassicDialog () {
byte [] titleBytes = Converter.wcsToMbcs (null, title, true);
handle = OS.gtk_file_selection_new (titleBytes);
if (parent != null) {
@@ -37719,7 +37966,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
-@@ -458,7 +458,7 @@
+@@ -458,7 +458,7 @@ String openClassicDialog () {
display.setModalDialog (this);
}
int signalId = 0;
@@ -37728,7 +37975,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
-@@ -498,7 +498,7 @@
+@@ -498,7 +498,7 @@ void presetChooserDialog () {
* when setting a file name that is not a true canonical path.
* The fix is to use the canonical path.
*/
@@ -37737,7 +37984,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
OS.gtk_file_chooser_set_current_folder (handle, ptr);
OS.g_free (ptr);
}
-@@ -529,7 +529,7 @@
+@@ -529,7 +529,7 @@ void presetChooserDialog () {
* when setting a file name that is not a true canonical path.
* The fix is to use the canonical path.
*/
@@ -37746,7 +37993,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
if (ptr != 0) {
OS.gtk_file_chooser_set_filename (handle, ptr);
OS.g_free (ptr);
-@@ -547,10 +547,10 @@
+@@ -547,10 +547,10 @@ void presetChooserDialog () {
/* Set the extension filters */
if (filterNames == null) filterNames = new String [0];
if (filterExtensions == null) filterExtensions = new String [0];
@@ -37759,7 +38006,7 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
if (filterNames.length > i && filterNames [i] != null) {
byte [] name = Converter.wcsToMbcs (null, filterNames [i], true);
OS.gtk_file_filter_set_name (filter, name);
-@@ -606,8 +606,8 @@
+@@ -606,8 +606,8 @@ void presetClassicDialog () {
int length = fullPath.length ();
char [] buffer = new char [length + 1];
fullPath.getChars (0, length, buffer, 0);
@@ -37770,10 +38017,11 @@ diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/wid
OS.gtk_file_selection_set_filename (handle, fileNamePtr);
OS.g_free (utf8Ptr);
OS.g_free (fileNamePtr);
-diff -urN x86/org/eclipse/swt/widgets/FontDialog.java x86_64/org/eclipse/swt/widgets/FontDialog.java
---- x86/org/eclipse/swt/widgets/FontDialog.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/FontDialog.java 2009-09-17 08:48:24.000000000 -0400
-@@ -134,15 +134,15 @@
+diff --git a/org/eclipse/swt/widgets/FontDialog.java b/org/eclipse/swt/widgets/FontDialog.java
+index d2c7d32..96dcad2 100644
+--- a/org/eclipse/swt/widgets/FontDialog.java
++++ b/org/eclipse/swt/widgets/FontDialog.java
+@@ -134,15 +134,15 @@ public RGB getRGB () {
* </ul>
*/
public FontData open () {
@@ -37792,7 +38040,7 @@ diff -urN x86/org/eclipse/swt/widgets/FontDialog.java x86_64/org/eclipse/swt/wid
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
-@@ -151,7 +151,7 @@
+@@ -151,7 +151,7 @@ public FontData open () {
OS.gtk_window_set_modal (handle, true);
if (fontData != null) {
Font font = new Font (display, fontData);
@@ -37801,7 +38049,7 @@ diff -urN x86/org/eclipse/swt/widgets/FontDialog.java x86_64/org/eclipse/swt/wid
int length = OS.strlen (fontName);
byte [] buffer = new byte [length + 1];
OS.memmove (buffer, fontName, length);
-@@ -166,7 +166,7 @@
+@@ -166,7 +166,7 @@ public FontData open () {
display.setModalDialog (this);
}
int signalId = 0;
@@ -37810,7 +38058,7 @@ diff -urN x86/org/eclipse/swt/widgets/FontDialog.java x86_64/org/eclipse/swt/wid
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
-@@ -180,12 +180,12 @@
+@@ -180,12 +180,12 @@ public FontData open () {
}
boolean success = response == OS.GTK_RESPONSE_OK;
if (success) {
@@ -37825,10 +38073,11 @@ diff -urN x86/org/eclipse/swt/widgets/FontDialog.java x86_64/org/eclipse/swt/wid
Font font = Font.gtk_new (display, fontDesc);
fontData = font.getFontData () [0];
OS.pango_font_description_free (fontDesc);
-diff -urN x86/org/eclipse/swt/widgets/Group.java x86_64/org/eclipse/swt/widgets/Group.java
---- x86/org/eclipse/swt/widgets/Group.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Group.java 2009-09-17 08:48:24.000000000 -0400
-@@ -41,7 +41,7 @@
+diff --git a/org/eclipse/swt/widgets/Group.java b/org/eclipse/swt/widgets/Group.java
+index f2b75d0..1e7d2df 100644
+--- a/org/eclipse/swt/widgets/Group.java
++++ b/org/eclipse/swt/widgets/Group.java
+@@ -41,7 +41,7 @@ import org.eclipse.swt.graphics.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class Group extends Composite {
@@ -37837,7 +38086,7 @@ diff -urN x86/org/eclipse/swt/widgets/Group.java x86_64/org/eclipse/swt/widgets/
String text = "";
/**
-@@ -96,7 +96,7 @@
+@@ -96,7 +96,7 @@ protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
@@ -37846,7 +38095,7 @@ diff -urN x86/org/eclipse/swt/widgets/Group.java x86_64/org/eclipse/swt/widgets/
return clientHandle;
}
-@@ -157,7 +157,7 @@
+@@ -157,7 +157,7 @@ void enableWidget (boolean enabled) {
OS.gtk_widget_set_sensitive (labelHandle, enabled);
}
@@ -37855,7 +38104,7 @@ diff -urN x86/org/eclipse/swt/widgets/Group.java x86_64/org/eclipse/swt/widgets/
return fixedHandle;
}
-@@ -201,7 +201,7 @@
+@@ -201,7 +201,7 @@ boolean mnemonicMatch (char key) {
return mnemonicMatch (labelHandle, key);
}
@@ -37864,7 +38113,7 @@ diff -urN x86/org/eclipse/swt/widgets/Group.java x86_64/org/eclipse/swt/widgets/
return fixedHandle;
}
-@@ -227,7 +227,7 @@
+@@ -227,7 +227,7 @@ void setBackgroundColor (GdkColor color) {
setBackgroundColor(fixedHandle, color);
}
@@ -37873,77 +38122,11 @@ diff -urN x86/org/eclipse/swt/widgets/Group.java x86_64/org/eclipse/swt/widgets/
super.setFontDescription (font);
OS.gtk_widget_modify_font (labelHandle, font);
}
-diff -urN x86/org/eclipse/swt/widgets/ImageList.java x86_64/org/eclipse/swt/widgets/ImageList.java
---- x86/org/eclipse/swt/widgets/ImageList.java 2005-06-23 10:51:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/ImageList.java 2009-09-17 08:48:24.000000000 -0400
-@@ -15,13 +15,13 @@
- import org.eclipse.swt.graphics.*;
-
- class ImageList {
-- int /*long*/ [] pixbufs;
-+ long /*int*/ [] pixbufs;
- int width = -1, height = -1;
- Image [] images;
-
- public ImageList() {
- images = new Image [4];
-- pixbufs = new int /*long*/ [4];
-+ pixbufs = new long /*int*/ [4];
- }
-
- public int add (Image image) {
-@@ -41,7 +41,7 @@
- Image [] newImages = new Image [images.length + 4];
- System.arraycopy (images, 0, newImages, 0, images.length);
- images = newImages;
-- int /*long*/ [] newPixbufs = new int /*long*/ [pixbufs.length + 4];
-+ long /*int*/ [] newPixbufs = new long /*int*/ [pixbufs.length + 4];
- System.arraycopy (pixbufs, 0, newPixbufs, 0, pixbufs.length);
- pixbufs = newPixbufs;
- }
-@@ -62,7 +62,7 @@
- return images [index];
- }
-
--int /*long*/ getPixbuf (int index) {
-+long /*int*/ getPixbuf (int index) {
- return pixbufs [index];
- }
-
-@@ -74,7 +74,7 @@
- return -1;
- }
-
--int indexOf (int /*long*/ pixbuf) {
-+int indexOf (long /*int*/ pixbuf) {
- if (pixbuf == 0) return -1;
- for (int index=0; index<images.length; index++) {
- if (pixbuf == pixbufs [index]) return index;
-@@ -112,17 +112,17 @@
- void set (int index, Image image) {
- int [] w = new int [1], h = new int [1];
- OS.gdk_drawable_get_size (image.pixmap, w, h);
-- int /*long*/ pixbuf = Display.createPixbuf (image);
-+ long /*int*/ pixbuf = Display.createPixbuf (image);
- if (width == -1 || height == -1) {
- width = w [0];
- height = h [0];
- }
- if (w [0] != width || h [0] != height) {
-- int /*long*/ scaledPixbuf = OS.gdk_pixbuf_scale_simple(pixbuf, width, height, OS.GDK_INTERP_BILINEAR);
-+ long /*int*/ scaledPixbuf = OS.gdk_pixbuf_scale_simple(pixbuf, width, height, OS.GDK_INTERP_BILINEAR);
- OS.g_object_unref (pixbuf);
- pixbuf = scaledPixbuf;
- }
-- int /*long*/ oldPixbuf = pixbufs [index];
-+ long /*int*/ oldPixbuf = pixbufs [index];
- if (oldPixbuf != 0) {
- if (images [index] == image) {
- OS.gdk_pixbuf_copy_area (pixbuf, 0, 0, width, height, oldPixbuf, 0, 0);
-diff -urN x86/org/eclipse/swt/widgets/IME.java x86_64/org/eclipse/swt/widgets/IME.java
---- x86/org/eclipse/swt/widgets/IME.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/IME.java 2009-09-17 08:48:24.000000000 -0400
-@@ -242,14 +242,14 @@
+diff --git a/org/eclipse/swt/widgets/IME.java b/org/eclipse/swt/widgets/IME.java
+index cc0036e..d846047 100644
+--- a/org/eclipse/swt/widgets/IME.java
++++ b/org/eclipse/swt/widgets/IME.java
+@@ -242,14 +242,14 @@ public boolean getWideCaret () {
return false;
}
@@ -37961,7 +38144,7 @@ diff -urN x86/org/eclipse/swt/widgets/IME.java x86_64/org/eclipse/swt/widgets/IM
if (!isInlineEnabled ()) return 0;
boolean doit = true;
ranges = null;
-@@ -278,14 +278,14 @@
+@@ -278,14 +278,14 @@ int /*long*/ gtk_commit (int /*long*/ imcontext, int /*long*/ textPtr) {
return doit ? 0 : 1;
}
@@ -37980,7 +38163,7 @@ diff -urN x86/org/eclipse/swt/widgets/IME.java x86_64/org/eclipse/swt/widgets/IM
int [] cursorPos = new int [1];
OS.gtk_im_context_get_preedit_string (imHandle, preeditString, pangoAttrs, cursorPos);
caretOffset = cursorPos [0];
-@@ -297,7 +297,7 @@
+@@ -297,7 +297,7 @@ int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) {
chars = Converter.mbcsToWcs (null, buffer);
if (pangoAttrs [0] != 0) {
int count = 0;
@@ -37989,7 +38172,7 @@ diff -urN x86/org/eclipse/swt/widgets/IME.java x86_64/org/eclipse/swt/widgets/IM
while (OS.pango_attr_iterator_next (iterator)) count++;
OS.pango_attr_iterator_destroy (iterator);
ranges = new int [count * 2];
-@@ -312,7 +312,7 @@
+@@ -312,7 +312,7 @@ int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) {
ranges [i * 2] = (int)/*64*/OS.g_utf8_pointer_to_offset (preeditString [0], preeditString [0] + start [0]);
ranges [i * 2 + 1] = (int)/*64*/OS.g_utf8_pointer_to_offset (preeditString [0], preeditString [0] + end [0]) - 1;
styles [i] = new TextStyle (null, null, null);
@@ -37998,7 +38181,7 @@ diff -urN x86/org/eclipse/swt/widgets/IME.java x86_64/org/eclipse/swt/widgets/IM
if (attr != 0) {
OS.memmove (attrColor, attr, PangoAttrColor.sizeof);
GdkColor color = new GdkColor ();
-@@ -395,7 +395,7 @@
+@@ -395,7 +395,7 @@ int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) {
return 1;
}
@@ -38007,10 +38190,79 @@ diff -urN x86/org/eclipse/swt/widgets/IME.java x86_64/org/eclipse/swt/widgets/IM
return parent.imHandle ();
}
-diff -urN x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/Label.java
---- x86/org/eclipse/swt/widgets/Label.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Label.java 2009-09-17 08:48:24.000000000 -0400
-@@ -50,7 +50,7 @@
+diff --git a/org/eclipse/swt/widgets/ImageList.java b/org/eclipse/swt/widgets/ImageList.java
+index cab405e..d34b314 100644
+--- a/org/eclipse/swt/widgets/ImageList.java
++++ b/org/eclipse/swt/widgets/ImageList.java
+@@ -15,13 +15,13 @@ import org.eclipse.swt.internal.gtk.*;
+ import org.eclipse.swt.graphics.*;
+
+ class ImageList {
+- int /*long*/ [] pixbufs;
++ long /*int*/ [] pixbufs;
+ int width = -1, height = -1;
+ Image [] images;
+
+ public ImageList() {
+ images = new Image [4];
+- pixbufs = new int /*long*/ [4];
++ pixbufs = new long /*int*/ [4];
+ }
+
+ public int add (Image image) {
+@@ -41,7 +41,7 @@ public int add (Image image) {
+ Image [] newImages = new Image [images.length + 4];
+ System.arraycopy (images, 0, newImages, 0, images.length);
+ images = newImages;
+- int /*long*/ [] newPixbufs = new int /*long*/ [pixbufs.length + 4];
++ long /*int*/ [] newPixbufs = new long /*int*/ [pixbufs.length + 4];
+ System.arraycopy (pixbufs, 0, newPixbufs, 0, pixbufs.length);
+ pixbufs = newPixbufs;
+ }
+@@ -62,7 +62,7 @@ public Image get (int index) {
+ return images [index];
+ }
+
+-int /*long*/ getPixbuf (int index) {
++long /*int*/ getPixbuf (int index) {
+ return pixbufs [index];
+ }
+
+@@ -74,7 +74,7 @@ public int indexOf (Image image) {
+ return -1;
+ }
+
+-int indexOf (int /*long*/ pixbuf) {
++int indexOf (long /*int*/ pixbuf) {
+ if (pixbuf == 0) return -1;
+ for (int index=0; index<images.length; index++) {
+ if (pixbuf == pixbufs [index]) return index;
+@@ -112,17 +112,17 @@ public void remove (Image image) {
+ void set (int index, Image image) {
+ int [] w = new int [1], h = new int [1];
+ OS.gdk_drawable_get_size (image.pixmap, w, h);
+- int /*long*/ pixbuf = Display.createPixbuf (image);
++ long /*int*/ pixbuf = Display.createPixbuf (image);
+ if (width == -1 || height == -1) {
+ width = w [0];
+ height = h [0];
+ }
+ if (w [0] != width || h [0] != height) {
+- int /*long*/ scaledPixbuf = OS.gdk_pixbuf_scale_simple(pixbuf, width, height, OS.GDK_INTERP_BILINEAR);
++ long /*int*/ scaledPixbuf = OS.gdk_pixbuf_scale_simple(pixbuf, width, height, OS.GDK_INTERP_BILINEAR);
+ OS.g_object_unref (pixbuf);
+ pixbuf = scaledPixbuf;
+ }
+- int /*long*/ oldPixbuf = pixbufs [index];
++ long /*int*/ oldPixbuf = pixbufs [index];
+ if (oldPixbuf != 0) {
+ if (images [index] == image) {
+ OS.gdk_pixbuf_copy_area (pixbuf, 0, 0, width, height, oldPixbuf, 0, 0);
+diff --git a/org/eclipse/swt/widgets/Label.java b/org/eclipse/swt/widgets/Label.java
+index 82ec5be..0ca491e 100644
+--- a/org/eclipse/swt/widgets/Label.java
++++ b/org/eclipse/swt/widgets/Label.java
+@@ -50,7 +50,7 @@ import org.eclipse.swt.graphics.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class Label extends Control {
@@ -38019,7 +38271,7 @@ diff -urN x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/
ImageList imageList;
Image image;
String text;
-@@ -108,8 +108,8 @@
+@@ -108,8 +108,8 @@ static int checkStyle (int style) {
void addRelation (Control control) {
if (!control.isDescribedByLabel ()) return;
if (labelHandle == 0) return;
@@ -38030,7 +38282,7 @@ diff -urN x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/
if (accessible != 0 && controlAccessible != 0) {
OS.atk_object_add_relationship (controlAccessible, OS.ATK_RELATION_LABELLED_BY, accessible);
}
-@@ -135,7 +135,7 @@
+@@ -135,7 +135,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
boolean fixWrap = labelHandle != 0 && (style & SWT.WRAP) != 0 && (OS.GTK_WIDGET_FLAGS (labelHandle) & OS.GTK_VISIBLE) != 0;
if (fixWrap || frameHandle != 0) forceResize ();
if (fixWrap) {
@@ -38039,7 +38291,7 @@ diff -urN x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/
int pangoWidth = OS.pango_layout_get_width (labelLayout);
if (wHint != SWT.DEFAULT) {
OS.pango_layout_set_width (labelLayout, wHint * OS.PANGO_SCALE);
-@@ -179,11 +179,11 @@
+@@ -179,11 +179,11 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
* muliple lines of text.
*/
if (hHint == SWT.DEFAULT && labelHandle != 0) {
@@ -38056,7 +38308,7 @@ diff -urN x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/
int ascent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_ascent (metrics));
int descent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_descent (metrics));
OS.pango_font_metrics_unref (metrics);
-@@ -192,7 +192,7 @@
+@@ -192,7 +192,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
OS.g_object_get (labelHandle, OS.ypad, buffer, 0);
fontHeight += 2 * buffer [0];
if (frameHandle != 0) {
@@ -38065,7 +38317,7 @@ diff -urN x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/
fontHeight += 2 * OS.gtk_style_get_ythickness (style);
fontHeight += 2 * OS.gtk_container_get_border_width (frameHandle);
}
-@@ -254,7 +254,7 @@
+@@ -254,7 +254,7 @@ void deregister () {
if (imageHandle != 0) display.removeWidget (imageHandle);
}
@@ -38074,7 +38326,7 @@ diff -urN x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/
return fixedHandle;
}
-@@ -487,7 +487,7 @@
+@@ -487,7 +487,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
return result;
}
@@ -38083,7 +38335,7 @@ diff -urN x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/
super.setFontDescription (font);
if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font);
if (imageHandle != 0) OS.gtk_widget_modify_font (imageHandle, font);
-@@ -531,7 +531,7 @@
+@@ -531,7 +531,7 @@ public void setImage (Image image) {
if (image != null) {
imageList = new ImageList ();
int imageIndex = imageList.add (image);
@@ -38092,10 +38344,11 @@ diff -urN x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
OS.gtk_widget_hide (labelHandle);
OS.gtk_widget_show (imageHandle);
-diff -urN x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/Link.java
---- x86/org/eclipse/swt/widgets/Link.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Link.java 2009-09-17 08:48:24.000000000 -0400
-@@ -282,8 +282,8 @@
+diff --git a/org/eclipse/swt/widgets/Link.java b/org/eclipse/swt/widgets/Link.java
+index 265b3dc..d5c59db 100644
+--- a/org/eclipse/swt/widgets/Link.java
++++ b/org/eclipse/swt/widgets/Link.java
+@@ -282,8 +282,8 @@ public String getText () {
return text;
}
@@ -38106,7 +38359,7 @@ diff -urN x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/L
if (result != 0) return result;
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
-@@ -321,8 +321,8 @@
+@@ -321,8 +321,8 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
@@ -38117,7 +38370,7 @@ diff -urN x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/L
if (result != 0) return result;
if (focusIndex == -1) return result;
GdkEventButton gdkEvent = new GdkEventButton ();
-@@ -345,8 +345,8 @@
+@@ -345,8 +345,8 @@ int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event)
return result;
}
@@ -38128,7 +38381,7 @@ diff -urN x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/L
GdkEvent event = new GdkEvent ();
OS.memmove (event, gdkEvent, GdkEvent.sizeof);
switch (event.type) {
-@@ -357,7 +357,7 @@
+@@ -357,7 +357,7 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
return result;
}
@@ -38137,7 +38390,7 @@ diff -urN x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/L
if ((state & OBSCURED) != 0) return 0;
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove (gdkEvent, eventPtr, GdkEventExpose.sizeof);
-@@ -398,8 +398,8 @@
+@@ -398,8 +398,8 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
return 0;
}
@@ -38148,7 +38401,7 @@ diff -urN x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/L
if (result != 0) return result;
if (focusIndex == -1) return result;
GdkEventKey gdkEvent = new GdkEventKey ();
-@@ -428,8 +428,8 @@
+@@ -428,8 +428,8 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
return result;
}
@@ -38159,7 +38412,7 @@ diff -urN x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/L
if (result != 0) return result;
GdkEventMotion gdkEvent = new GdkEventMotion ();
OS.memmove (gdkEvent, event, GdkEventMotion.sizeof);
-@@ -662,7 +662,7 @@
+@@ -662,7 +662,7 @@ int setBounds(int x, int y, int width, int height, boolean move, boolean resize)
return result;
}
@@ -38168,10 +38421,11 @@ diff -urN x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/L
super.setFontDescription (font);
layout.setFont (Font.gtk_new (display, font));
}
-diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/List.java
---- x86/org/eclipse/swt/widgets/List.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/List.java 2009-09-17 08:48:24.000000000 -0400
-@@ -40,7 +40,7 @@
+diff --git a/org/eclipse/swt/widgets/List.java b/org/eclipse/swt/widgets/List.java
+index b1df97f..c1a3357 100644
+--- a/org/eclipse/swt/widgets/List.java
++++ b/org/eclipse/swt/widgets/List.java
+@@ -40,7 +40,7 @@ import org.eclipse.swt.events.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class List extends Scrollable {
@@ -38180,7 +38434,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
static final int TEXT_COLUMN = 0;
-@@ -96,7 +96,7 @@
+@@ -96,7 +96,7 @@ public void add (String string) {
checkWidget();
if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
byte [] buffer = Converter.wcsToMbcs (null, string, true);
@@ -38189,7 +38443,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (iter == 0) error (SWT.ERROR_ITEM_NOT_ADDED);
OS.gtk_list_store_append (modelHandle, iter);
OS.gtk_list_store_set (modelHandle, iter, TEXT_COLUMN, buffer, -1);
-@@ -134,7 +134,7 @@
+@@ -134,7 +134,7 @@ public void add (String string, int index) {
error (SWT.ERROR_INVALID_RANGE);
}
byte [] buffer = Converter.wcsToMbcs (null, string, true);
@@ -38198,7 +38452,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (iter == 0) error (SWT.ERROR_ITEM_NOT_ADDED);
/*
* Feature in GTK. It is much faster to append to a list store
-@@ -196,14 +196,14 @@
+@@ -196,14 +196,14 @@ void createHandle (int index) {
* Columns:
* 0 - text
*/
@@ -38216,7 +38470,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (columnHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_tree_view_column_pack_start (columnHandle, textRenderer, true);
OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.text, TEXT_COLUMN);
-@@ -212,7 +212,7 @@
+@@ -212,7 +212,7 @@ void createHandle (int index) {
OS.gtk_container_add (scrolledHandle, handle);
int mode = (style & SWT.MULTI) != 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE;
@@ -38225,7 +38479,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
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;
-@@ -276,8 +276,8 @@
+@@ -276,8 +276,8 @@ void deregister() {
public void deselect (int index) {
checkWidget();
if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) return;
@@ -38236,7 +38490,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
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);
-@@ -307,8 +307,8 @@
+@@ -307,8 +307,8 @@ public void deselect (int start, int end) {
if (start >= count && end >= count) return;
start = Math.min (count - 1, Math.max (0, start));
end = Math.min (count - 1, Math.max (0, end));
@@ -38247,7 +38501,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
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);
-@@ -338,9 +338,9 @@
+@@ -338,9 +338,9 @@ public void deselect (int start, int end) {
public void deselect (int [] indices) {
checkWidget();
if (indices == null) error (SWT.ERROR_NULL_ARGUMENT);
@@ -38259,7 +38513,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
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];
-@@ -362,7 +362,7 @@
+@@ -362,7 +362,7 @@ public void deselect (int [] indices) {
*/
public void deselectAll () {
checkWidget();
@@ -38268,7 +38522,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
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);
-@@ -371,10 +371,10 @@
+@@ -371,10 +371,10 @@ public void deselectAll () {
boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
boolean selected = false;
if (filter) {
@@ -38281,7 +38535,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) selected = true;
OS.gtk_tree_path_free (path [0]);
}
-@@ -387,7 +387,7 @@
+@@ -387,7 +387,7 @@ boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
return dragDetect;
}
@@ -38290,7 +38544,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
return paintWindow ();
}
-@@ -408,10 +408,10 @@
+@@ -408,10 +408,10 @@ GdkColor getBackgroundColor () {
*/
public int getFocusIndex () {
checkWidget();
@@ -38303,7 +38557,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
int [] index = new int []{-1};
if (indices != 0) OS.memmove (index, indices, 4);
OS.gtk_tree_path_free (path [0]);
-@@ -442,8 +442,8 @@
+@@ -442,8 +442,8 @@ public String getItem (int index) {
if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -38314,7 +38568,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
OS.gtk_tree_model_get (modelHandle, iter, 0, ptr, -1);
OS.g_free (iter);
-@@ -484,13 +484,13 @@
+@@ -484,13 +484,13 @@ public int getItemCount () {
public int getItemHeight () {
checkWidget();
int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
@@ -38330,7 +38584,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.gtk_tree_model_get_iter_first (modelHandle, iter);
OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
int [] w = new int [1], h = new int [1];
-@@ -519,9 +519,9 @@
+@@ -519,9 +519,9 @@ public int getItemHeight () {
public String [] getItems () {
checkWidget();
int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
@@ -38342,7 +38596,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
for (int index=0; index<count; index++) {
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
OS.gtk_tree_model_get (modelHandle, iter, 0, ptr, -1);
-@@ -575,7 +575,7 @@
+@@ -575,7 +575,7 @@ public String [] getSelection () {
*/
public int getSelectionCount () {
checkWidget();
@@ -38351,7 +38605,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
display.treeSelectionLength = 0;
display.treeSelection = null;
-@@ -598,7 +598,7 @@
+@@ -598,7 +598,7 @@ public int getSelectionCount () {
*/
public int getSelectionIndex () {
checkWidget();
@@ -38360,7 +38614,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
display.treeSelectionLength = 0;
-@@ -612,14 +612,14 @@
+@@ -612,14 +612,14 @@ public int getSelectionIndex () {
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
*/
@@ -38379,7 +38633,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (indices != 0) {
OS.memmove (index, indices, 4);
break;
-@@ -649,7 +649,7 @@
+@@ -649,7 +649,7 @@ public int getSelectionIndex () {
*/
public int [] getSelectionIndices () {
checkWidget();
@@ -38388,7 +38642,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
display.treeSelectionLength = 0;
-@@ -665,15 +665,15 @@
+@@ -665,15 +665,15 @@ public int [] getSelectionIndices () {
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
*/
@@ -38408,7 +38662,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (indices != 0) {
int [] index = new int [1];
OS.memmove (index, indices, 4);
-@@ -703,24 +703,24 @@
+@@ -703,24 +703,24 @@ public int [] getSelectionIndices () {
*/
public int getTopIndex () {
checkWidget();
@@ -38438,7 +38692,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (result != 0) return result;
/*
* Feature in GTK. In a multi-select list view, when multiple items are already
-@@ -734,10 +734,10 @@
+@@ -734,10 +734,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
int button = gdkEvent.button;
if (button == 3 && gdkEvent.type == OS.GDK_BUTTON_PRESS) {
@@ -38451,7 +38705,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;
OS.gtk_tree_path_free (path [0]);
}
-@@ -752,10 +752,10 @@
+@@ -752,10 +752,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
* widget from automatically selecting the first item.
*/
if ((style & SWT.SINGLE) != 0 && getSelectionCount () == 0) {
@@ -38464,7 +38718,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
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);
-@@ -775,8 +775,8 @@
+@@ -775,8 +775,8 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
@@ -38475,7 +38729,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (result != 0) return result;
if (OS.GTK_VERSION < OS.VERSION (2, 2 ,0)) {
/*
-@@ -798,8 +798,8 @@
+@@ -798,8 +798,8 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
@@ -38486,7 +38740,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
/*
* Bug in GTK. The context menu for the typeahead in GtkTreeViewer
* opens in the bottom right corner of the screen when Shift+F10
-@@ -812,14 +812,14 @@
+@@ -812,14 +812,14 @@ int /*long*/ gtk_popup_menu (int /*long*/ widget) {
return OS.GTK_VERSION < OS.VERSION (2, 6, 5) ? 1 : result;
}
@@ -38503,7 +38757,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.g_signal_connect_closure (selection, OS.changed, display.closures [CHANGED], false);
OS.g_signal_connect_closure (handle, OS.row_activated, display.closures [ROW_ACTIVATED], false);
}
-@@ -892,15 +892,15 @@
+@@ -892,15 +892,15 @@ public int indexOf (String string, int start) {
*/
public boolean isSelected (int index) {
checkWidget();
@@ -38522,7 +38776,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.gtk_widget_realize (handle);
return OS.gtk_tree_view_get_bin_window (handle);
}
-@@ -935,9 +935,9 @@
+@@ -935,9 +935,9 @@ public void remove (int index) {
if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -38534,7 +38788,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
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);
-@@ -967,8 +967,8 @@
+@@ -967,8 +967,8 @@ public void remove (int start, int end) {
if (!(0 <= start && start <= end && end < count)) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -38545,7 +38799,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
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);
-@@ -1029,8 +1029,8 @@
+@@ -1029,8 +1029,8 @@ public void remove (int [] indices) {
if (!(0 <= start && start <= end && end < count)) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -38556,7 +38810,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
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++) {
-@@ -1055,7 +1055,7 @@
+@@ -1055,7 +1055,7 @@ public void remove (int [] indices) {
*/
public void removeAll () {
checkWidget();
@@ -38565,7 +38819,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
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);
-@@ -1101,13 +1101,13 @@
+@@ -1101,13 +1101,13 @@ public void removeSelectionListener(SelectionListener listener) {
public void select (int index) {
checkWidget();
if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) return;
@@ -38582,7 +38836,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
OS.gtk_tree_path_free (path);
}
-@@ -1144,14 +1144,14 @@
+@@ -1144,14 +1144,14 @@ public void select (int start, int end) {
if (count == 0 || start >= count) return;
start = Math.max (0, start);
end = Math.min (end, count - 1);
@@ -38600,7 +38854,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
OS.gtk_tree_path_free (path);
}
-@@ -1187,9 +1187,9 @@
+@@ -1187,9 +1187,9 @@ public void select (int [] indices) {
if (indices == null) error (SWT.ERROR_NULL_ARGUMENT);
int length = indices.length;
if (length == 0 || ((style & SWT.SINGLE) != 0 && length > 1)) return;
@@ -38612,7 +38866,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int i=0; i<length; i++) {
int index = indices [i];
-@@ -1197,7 +1197,7 @@
+@@ -1197,7 +1197,7 @@ public void select (int [] indices) {
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
OS.gtk_tree_selection_select_iter (selection, iter);
if ((style & SWT.SINGLE) != 0) {
@@ -38621,7 +38875,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
OS.gtk_tree_path_free (path);
}
-@@ -1219,7 +1219,7 @@
+@@ -1219,7 +1219,7 @@ public void select (int [] indices) {
public void selectAll () {
checkWidget();
if ((style & SWT.SINGLE) != 0) return;
@@ -38630,7 +38884,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
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);
-@@ -1233,10 +1233,10 @@
+@@ -1233,10 +1233,10 @@ void selectFocusIndex (int index) {
*/
int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
if (!(0 <= index && index < count)) return;
@@ -38644,7 +38898,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
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, false);
/*
-@@ -1303,7 +1303,7 @@
+@@ -1303,7 +1303,7 @@ public void setItem (int index, String string) {
if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -38653,7 +38907,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
byte [] buffer = Converter.wcsToMbcs (null, string, true);
OS.gtk_list_store_set (modelHandle, iter, TEXT_COLUMN, buffer, -1);
-@@ -1330,11 +1330,11 @@
+@@ -1330,11 +1330,11 @@ public void setItems (String [] items) {
for (int i=0; i<items.length; i++) {
if (items [i] == null) error (SWT.ERROR_INVALID_ARGUMENT);
}
@@ -38667,7 +38921,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (iter == 0) error (SWT.ERROR_ITEM_NOT_ADDED);
for (int i=0; i<items.length; i++) {
String string = items [i];
-@@ -1504,9 +1504,9 @@
+@@ -1504,9 +1504,9 @@ public void setSelection (String [] items) {
public void setTopIndex (int index) {
checkWidget();
if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) return;
@@ -38679,7 +38933,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
OS.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0, 0);
if (OS.GTK_VERSION < OS.VERSION (2, 8, 0)) {
/*
-@@ -1543,9 +1543,9 @@
+@@ -1543,9 +1543,9 @@ public void showSelection () {
checkWidget();
int index = getSelectionIndex ();
if (index == -1) return;
@@ -38691,7 +38945,7 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
/*
* This code intentionally commented.
* Bug in GTK. According to the documentation, gtk_tree_view_scroll_to_cell
-@@ -1579,9 +1579,9 @@
+@@ -1579,9 +1579,9 @@ public void showSelection () {
OS.g_free (iter);
}
@@ -38703,10 +38957,175 @@ diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/L
if (indices != 0) {
int [] index = new int [1];
OS.memmove (index, indices, 4);
-diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widgets/MenuItem.java
---- x86/org/eclipse/swt/widgets/MenuItem.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/MenuItem.java 2009-09-17 08:48:24.000000000 -0400
-@@ -38,7 +38,7 @@
+diff --git a/org/eclipse/swt/widgets/Menu.java b/org/eclipse/swt/widgets/Menu.java
+index 5e042a6..5bc88fa 100644
+--- a/org/eclipse/swt/widgets/Menu.java
++++ b/org/eclipse/swt/widgets/Menu.java
+@@ -44,7 +44,7 @@ public class Menu extends Widget {
+ boolean hasLocation;
+ MenuItem cascade, selectedItem;
+ Decorations parent;
+- int /*long*/ imItem, imSeparator, imHandle;
++ long /*int*/ imItem, imSeparator, imHandle;
+ ImageList imageList;
+
+ /**
+@@ -209,7 +209,7 @@ void _setVisible (boolean visible) {
+ OS.gtk_menu_shell_set_take_focus (handle, false);
+ }
+ }
+- int /*long*/ address = hasLocation ? display.menuPositionProc: 0;
++ long /*int*/ address = hasLocation ? display.menuPositionProc: 0;
+ /*
+ * Bug in GTK. The timestamp passed into gtk_menu_popup is used
+ * to perform an X pointer grab. It cannot be zero, else the grab
+@@ -225,7 +225,7 @@ void _setVisible (boolean visible) {
+ }
+ }
+
+-void addAccelerators (int /*long*/ accelGroup) {
++void addAccelerators (long /*int*/ accelGroup) {
+ MenuItem [] items = getItems ();
+ for (int i = 0; i < items.length; i++) {
+ MenuItem item = items[i];
+@@ -291,7 +291,7 @@ void createHandle (int index) {
+ if ((style & SWT.BAR) != 0) {
+ handle = OS.gtk_menu_bar_new ();
+ if (handle == 0) error (SWT.ERROR_NO_HANDLES);
+- int /*long*/ vboxHandle = parent.vboxHandle;
++ long /*int*/ vboxHandle = parent.vboxHandle;
+ OS.gtk_container_add (vboxHandle, handle);
+ OS.gtk_box_set_child_packing (vboxHandle, handle, false, true, 0, OS.GTK_PACK_START);
+ } else {
+@@ -300,7 +300,7 @@ void createHandle (int index) {
+ }
+ }
+
+-void createIMMenu (int /*long*/ imHandle) {
++void createIMMenu (long /*int*/ imHandle) {
+ if (this.imHandle == imHandle) return;
+ this.imHandle = imHandle;
+ if (imHandle == 0) {
+@@ -325,7 +325,7 @@ void createIMMenu (int /*long*/ imHandle) {
+ OS.gtk_widget_show (imItem);
+ OS.gtk_menu_shell_insert (handle, imItem, -1);
+ }
+- int /*long*/ imSubmenu = OS.gtk_menu_new ();
++ long /*int*/ imSubmenu = OS.gtk_menu_new ();
+ OS.gtk_im_multicontext_append_menuitems (imHandle, imSubmenu);
+ OS.gtk_menu_item_set_submenu (imItem, imSubmenu);
+ }
+@@ -351,7 +351,7 @@ void fixMenus (Decorations newParent) {
+ if (!OS.GTK_WIDGET_MAPPED (handle)) {
+ return new Rectangle (0, 0, 0, 0);
+ }
+- int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle);
++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle);
+ int [] origin_x = new int [1], origin_y = new int [1];
+ OS.gdk_window_get_origin (window, origin_x, origin_y);
+ int x = origin_x [0] + OS.GTK_WIDGET_X (handle);
+@@ -415,13 +415,13 @@ public boolean getEnabled () {
+ */
+ public MenuItem getItem (int index) {
+ checkWidget();
+- int /*long*/ list = OS.gtk_container_get_children (handle);
++ long /*int*/ 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--;
+ if (imItem != 0) count--;
+ if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE);
+- int /*long*/ data = OS.g_list_nth_data (list, index);
++ long /*int*/ data = OS.g_list_nth_data (list, index);
+ OS.g_list_free (list);
+ if (data == 0) error (SWT.ERROR_CANNOT_GET_ITEM);
+ return (MenuItem) display.getWidget (data);
+@@ -439,7 +439,7 @@ public MenuItem getItem (int index) {
+ */
+ public int getItemCount () {
+ checkWidget();
+- int /*long*/ list = OS.gtk_container_get_children (handle);
++ long /*int*/ list = OS.gtk_container_get_children (handle);
+ if (list == 0) return 0;
+ int count = OS.g_list_length (list);
+ OS.g_list_free (list);
+@@ -466,7 +466,7 @@ public int getItemCount () {
+ */
+ public MenuItem [] getItems () {
+ checkWidget();
+- int /*long*/ list = OS.gtk_container_get_children (handle);
++ long /*int*/ 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--;
+@@ -474,7 +474,7 @@ public MenuItem [] getItems () {
+ MenuItem [] items = new MenuItem [count];
+ int index = 0;
+ for (int i=0; i<count; i++) {
+- int /*long*/ data = OS.g_list_nth_data (list, i);
++ long /*int*/ data = OS.g_list_nth_data (list, i);
+ MenuItem item = (MenuItem) display.getWidget (data);
+ if (item != null) items [index++] = item;
+ }
+@@ -600,7 +600,7 @@ public boolean getVisible () {
+ return OS.GTK_WIDGET_MAPPED (handle);
+ }
+
+-int /*long*/ gtk_hide (int /*long*/ widget) {
++long /*int*/ gtk_hide (long /*int*/ widget) {
+ if ((style & SWT.POP_UP) != 0) {
+ if (display.activeShell != null) display.activeShell = getShell ();
+ }
+@@ -619,7 +619,7 @@ int /*long*/ gtk_hide (int /*long*/ widget) {
+ return 0;
+ }
+
+-int /*long*/ gtk_show (int /*long*/ widget) {
++long /*int*/ gtk_show (long /*int*/ widget) {
+ if ((style & SWT.POP_UP) != 0) {
+ if (display.activeShell != null) display.activeShell = getShell ();
+ return 0;
+@@ -629,7 +629,7 @@ int /*long*/ gtk_show (int /*long*/ widget) {
+ }
+
+
+-int /*long*/ gtk_show_help (int /*long*/ widget, int /*long*/ helpType) {
++long /*int*/ gtk_show_help (long /*int*/ widget, long /*int*/ helpType) {
+ if (sendHelpEvent (helpType)) {
+ OS.gtk_menu_shell_deactivate (handle);
+ return 1;
+@@ -714,7 +714,7 @@ public boolean isVisible () {
+ return getVisible ();
+ }
+
+-int /*long*/ menuPositionProc (int /*long*/ menu, int /*long*/ x, int /*long*/ y, int /*long*/ push_in, int /*long*/ user_data) {
++long /*int*/ menuPositionProc (long /*int*/ menu, long /*int*/ x, long /*int*/ y, long /*int*/ push_in, long /*int*/ user_data) {
+ /*
+ * Feature in GTK. The menu position function sets the position of the
+ * top-left pixel of the menu. If the menu would be off-screen, GTK will
+@@ -802,7 +802,7 @@ public void removeMenuListener (MenuListener listener) {
+ eventTable.unhook (SWT.Show, listener);
+ }
+
+-void removeAccelerators (int /*long*/ accelGroup) {
++void removeAccelerators (long /*int*/ accelGroup) {
+ MenuItem [] items = getItems ();
+ for (int i = 0; i < items.length; i++) {
+ MenuItem item = items[i];
+@@ -834,7 +834,7 @@ public void removeHelpListener (HelpListener listener) {
+ eventTable.unhook (SWT.Help, listener);
+ }
+
+-boolean sendHelpEvent (int /*long*/ helpType) {
++boolean sendHelpEvent (long /*int*/ helpType) {
+ if (selectedItem != null && !selectedItem.isDisposed()) {
+ if (selectedItem.hooks (SWT.Help)) {
+ selectedItem.postEvent (SWT.Help);
+diff --git a/org/eclipse/swt/widgets/MenuItem.java b/org/eclipse/swt/widgets/MenuItem.java
+index d676e46..6680484 100644
+--- a/org/eclipse/swt/widgets/MenuItem.java
++++ b/org/eclipse/swt/widgets/MenuItem.java
+@@ -38,7 +38,7 @@ import org.eclipse.swt.events.*;
*/
public class MenuItem extends Item {
Menu parent, menu;
@@ -38715,7 +39134,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
int accelerator;
/**
-@@ -127,11 +127,11 @@
+@@ -127,11 +127,11 @@ public MenuItem (Menu parent, int style, int index) {
createWidget (index);
}
@@ -38729,7 +39148,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
addAccelerator (accelGroup);
if (menu != null) menu.addAccelerators (accelGroup);
}
-@@ -252,7 +252,7 @@
+@@ -252,7 +252,7 @@ void createHandle (int index) {
if (groupHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.g_object_ref (groupHandle);
OS.gtk_object_sink (groupHandle);
@@ -38738,7 +39157,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
handle = OS.gtk_radio_menu_item_new_with_label (group, buffer);
break;
case SWT.CHECK:
-@@ -265,10 +265,10 @@
+@@ -265,10 +265,10 @@ void createHandle (int index) {
}
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
if ((style & SWT.SEPARATOR) == 0) {
@@ -38751,7 +39170,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
boolean enabled = OS.GTK_WIDGET_SENSITIVE (parentHandle);
if (!enabled) OS.GTK_WIDGET_SET_FLAGS (parentHandle, OS.GTK_SENSITIVE);
OS.gtk_menu_shell_insert (parentHandle, handle, index);
-@@ -300,7 +300,7 @@
+@@ -300,7 +300,7 @@ public int getAccelerator () {
return accelerator;
}
@@ -38760,7 +39179,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
Menu menu = parent;
while (menu != null && menu.cascade != null) {
menu = menu.cascade.parent;
-@@ -401,7 +401,7 @@
+@@ -401,7 +401,7 @@ public boolean getSelection () {
return OS.gtk_check_menu_item_get_active(handle);
}
@@ -38769,7 +39188,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
if ((style & SWT.CASCADE) != 0 && menu != null) return 0;
/*
* Bug in GTK. When an ancestor menu is disabled and
-@@ -412,7 +412,7 @@
+@@ -412,7 +412,7 @@ int /*long*/ gtk_activate (int /*long*/ widget) {
*/
if (!isEnabled ()) return 0;
Event event = new Event ();
@@ -38778,7 +39197,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
if (ptr != 0) {
GdkEvent gdkEvent = new GdkEvent ();
OS.memmove (gdkEvent, ptr, GdkEvent.sizeof);
-@@ -439,13 +439,13 @@
+@@ -439,13 +439,13 @@ int /*long*/ gtk_activate (int /*long*/ widget) {
return 0;
}
@@ -38794,7 +39213,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
boolean handled = hooks (SWT.Help);
if (handled) {
postEvent (SWT.Help);
-@@ -504,7 +504,7 @@
+@@ -504,7 +504,7 @@ void releaseParent () {
void releaseWidget () {
super.releaseWidget ();
@@ -38803,7 +39222,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
if (accelGroup != 0) removeAccelerator (accelGroup);
if (groupHandle != 0) OS.g_object_unref (groupHandle);
groupHandle = 0;
-@@ -512,11 +512,11 @@
+@@ -512,11 +512,11 @@ void releaseWidget () {
parent = null;
}
@@ -38817,7 +39236,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
removeAccelerator (accelGroup);
if (menu != null) menu.removeAccelerators (accelGroup);
}
-@@ -622,7 +622,7 @@
+@@ -622,7 +622,7 @@ void selectRadio () {
public void setAccelerator (int accelerator) {
checkWidget();
if (this.accelerator == accelerator) return;
@@ -38826,7 +39245,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
if (accelGroup != 0) removeAccelerator (accelGroup);
this.accelerator = accelerator;
if (accelGroup != 0) addAccelerator (accelGroup);
-@@ -644,7 +644,7 @@
+@@ -644,7 +644,7 @@ public void setAccelerator (int accelerator) {
public void setEnabled (boolean enabled) {
checkWidget();
if (OS.GTK_WIDGET_SENSITIVE (handle) == enabled) return;
@@ -38835,7 +39254,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
if (accelGroup != 0) removeAccelerator (accelGroup);
OS.gtk_widget_set_sensitive (handle, enabled);
if (accelGroup != 0) addAccelerator (accelGroup);
-@@ -681,8 +681,8 @@
+@@ -681,8 +681,8 @@ public void setImage (Image image) {
} else {
imageList.put (imageIndex, image);
}
@@ -38846,7 +39265,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
OS.gtk_image_menu_item_set_image (handle, imageHandle);
OS.gtk_widget_show (imageHandle);
} else {
-@@ -734,7 +734,7 @@
+@@ -734,7 +734,7 @@ public void setMenu (Menu menu) {
/* Assign the new menu */
Menu oldMenu = this.menu;
if (oldMenu == menu) return;
@@ -38855,7 +39274,7 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
if (accelGroup != 0) removeAccelerators (accelGroup);
if (oldMenu != null) {
oldMenu.cascade = null;
-@@ -844,17 +844,17 @@
+@@ -844,17 +844,17 @@ public void setText (String string) {
}
char [] chars = fixMnemonic (string);
byte [] buffer = Converter.wcsToMbcs (null, chars, true);
@@ -38877,173 +39296,11 @@ diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widge
if (accelerator == 0 || !getEnabled ()) return;
if ((accelerator & SWT.COMMAND) != 0) return;
int mask = 0;
-diff -urN x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/Menu.java
---- x86/org/eclipse/swt/widgets/Menu.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Menu.java 2009-09-17 08:48:24.000000000 -0400
-@@ -44,7 +44,7 @@
- boolean hasLocation;
- MenuItem cascade, selectedItem;
- Decorations parent;
-- int /*long*/ imItem, imSeparator, imHandle;
-+ long /*int*/ imItem, imSeparator, imHandle;
- ImageList imageList;
-
- /**
-@@ -209,7 +209,7 @@
- OS.gtk_menu_shell_set_take_focus (handle, false);
- }
- }
-- int /*long*/ address = hasLocation ? display.menuPositionProc: 0;
-+ long /*int*/ address = hasLocation ? display.menuPositionProc: 0;
- /*
- * Bug in GTK. The timestamp passed into gtk_menu_popup is used
- * to perform an X pointer grab. It cannot be zero, else the grab
-@@ -225,7 +225,7 @@
- }
- }
-
--void addAccelerators (int /*long*/ accelGroup) {
-+void addAccelerators (long /*int*/ accelGroup) {
- MenuItem [] items = getItems ();
- for (int i = 0; i < items.length; i++) {
- MenuItem item = items[i];
-@@ -291,7 +291,7 @@
- if ((style & SWT.BAR) != 0) {
- handle = OS.gtk_menu_bar_new ();
- if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-- int /*long*/ vboxHandle = parent.vboxHandle;
-+ long /*int*/ vboxHandle = parent.vboxHandle;
- OS.gtk_container_add (vboxHandle, handle);
- OS.gtk_box_set_child_packing (vboxHandle, handle, false, true, 0, OS.GTK_PACK_START);
- } else {
-@@ -300,7 +300,7 @@
- }
- }
-
--void createIMMenu (int /*long*/ imHandle) {
-+void createIMMenu (long /*int*/ imHandle) {
- if (this.imHandle == imHandle) return;
- this.imHandle = imHandle;
- if (imHandle == 0) {
-@@ -325,7 +325,7 @@
- OS.gtk_widget_show (imItem);
- OS.gtk_menu_shell_insert (handle, imItem, -1);
- }
-- int /*long*/ imSubmenu = OS.gtk_menu_new ();
-+ long /*int*/ imSubmenu = OS.gtk_menu_new ();
- OS.gtk_im_multicontext_append_menuitems (imHandle, imSubmenu);
- OS.gtk_menu_item_set_submenu (imItem, imSubmenu);
- }
-@@ -351,7 +351,7 @@
- if (!OS.GTK_WIDGET_MAPPED (handle)) {
- return new Rectangle (0, 0, 0, 0);
- }
-- int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle);
-+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle);
- int [] origin_x = new int [1], origin_y = new int [1];
- OS.gdk_window_get_origin (window, origin_x, origin_y);
- int x = origin_x [0] + OS.GTK_WIDGET_X (handle);
-@@ -415,13 +415,13 @@
- */
- public MenuItem getItem (int index) {
- checkWidget();
-- int /*long*/ list = OS.gtk_container_get_children (handle);
-+ long /*int*/ 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--;
- if (imItem != 0) count--;
- if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE);
-- int /*long*/ data = OS.g_list_nth_data (list, index);
-+ long /*int*/ data = OS.g_list_nth_data (list, index);
- OS.g_list_free (list);
- if (data == 0) error (SWT.ERROR_CANNOT_GET_ITEM);
- return (MenuItem) display.getWidget (data);
-@@ -439,7 +439,7 @@
- */
- public int getItemCount () {
- checkWidget();
-- int /*long*/ list = OS.gtk_container_get_children (handle);
-+ long /*int*/ list = OS.gtk_container_get_children (handle);
- if (list == 0) return 0;
- int count = OS.g_list_length (list);
- OS.g_list_free (list);
-@@ -466,7 +466,7 @@
- */
- public MenuItem [] getItems () {
- checkWidget();
-- int /*long*/ list = OS.gtk_container_get_children (handle);
-+ long /*int*/ 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--;
-@@ -474,7 +474,7 @@
- MenuItem [] items = new MenuItem [count];
- int index = 0;
- for (int i=0; i<count; i++) {
-- int /*long*/ data = OS.g_list_nth_data (list, i);
-+ long /*int*/ data = OS.g_list_nth_data (list, i);
- MenuItem item = (MenuItem) display.getWidget (data);
- if (item != null) items [index++] = item;
- }
-@@ -600,7 +600,7 @@
- return OS.GTK_WIDGET_MAPPED (handle);
- }
-
--int /*long*/ gtk_hide (int /*long*/ widget) {
-+long /*int*/ gtk_hide (long /*int*/ widget) {
- if ((style & SWT.POP_UP) != 0) {
- if (display.activeShell != null) display.activeShell = getShell ();
- }
-@@ -619,7 +619,7 @@
- return 0;
- }
-
--int /*long*/ gtk_show (int /*long*/ widget) {
-+long /*int*/ gtk_show (long /*int*/ widget) {
- if ((style & SWT.POP_UP) != 0) {
- if (display.activeShell != null) display.activeShell = getShell ();
- return 0;
-@@ -629,7 +629,7 @@
- }
-
-
--int /*long*/ gtk_show_help (int /*long*/ widget, int /*long*/ helpType) {
-+long /*int*/ gtk_show_help (long /*int*/ widget, long /*int*/ helpType) {
- if (sendHelpEvent (helpType)) {
- OS.gtk_menu_shell_deactivate (handle);
- return 1;
-@@ -714,7 +714,7 @@
- return getVisible ();
- }
-
--int /*long*/ menuPositionProc (int /*long*/ menu, int /*long*/ x, int /*long*/ y, int /*long*/ push_in, int /*long*/ user_data) {
-+long /*int*/ menuPositionProc (long /*int*/ menu, long /*int*/ x, long /*int*/ y, long /*int*/ push_in, long /*int*/ user_data) {
- /*
- * Feature in GTK. The menu position function sets the position of the
- * top-left pixel of the menu. If the menu would be off-screen, GTK will
-@@ -802,7 +802,7 @@
- eventTable.unhook (SWT.Show, listener);
- }
-
--void removeAccelerators (int /*long*/ accelGroup) {
-+void removeAccelerators (long /*int*/ accelGroup) {
- MenuItem [] items = getItems ();
- for (int i = 0; i < items.length; i++) {
- MenuItem item = items[i];
-@@ -834,7 +834,7 @@
- eventTable.unhook (SWT.Help, listener);
- }
-
--boolean sendHelpEvent (int /*long*/ helpType) {
-+boolean sendHelpEvent (long /*int*/ helpType) {
- if (selectedItem != null && !selectedItem.isDisposed()) {
- if (selectedItem.hooks (SWT.Help)) {
- selectedItem.postEvent (SWT.Help);
-diff -urN x86/org/eclipse/swt/widgets/MessageBox.java x86_64/org/eclipse/swt/widgets/MessageBox.java
---- x86/org/eclipse/swt/widgets/MessageBox.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/MessageBox.java 2009-09-17 08:48:24.000000000 -0400
-@@ -42,7 +42,7 @@
+diff --git a/org/eclipse/swt/widgets/MessageBox.java b/org/eclipse/swt/widgets/MessageBox.java
+index 3d1cfd1..1468968 100644
+--- a/org/eclipse/swt/widgets/MessageBox.java
++++ b/org/eclipse/swt/widgets/MessageBox.java
+@@ -42,7 +42,7 @@ import org.eclipse.swt.internal.gtk.*;
public class MessageBox extends Dialog {
String message = "";
@@ -39052,7 +39309,7 @@ diff -urN x86/org/eclipse/swt/widgets/MessageBox.java x86_64/org/eclipse/swt/wid
/**
* Constructs a new instance of this class given only its parent.
*
-@@ -141,7 +141,7 @@
+@@ -141,7 +141,7 @@ public void setMessage (String string) {
* </ul>
*/
public int open () {
@@ -39061,7 +39318,7 @@ diff -urN x86/org/eclipse/swt/widgets/MessageBox.java x86_64/org/eclipse/swt/wid
int dialogFlags = OS.GTK_DIALOG_DESTROY_WITH_PARENT;
if ((style & (SWT.PRIMARY_MODAL | SWT.APPLICATION_MODAL | SWT.SYSTEM_MODAL)) != 0) {
dialogFlags |= OS.GTK_DIALOG_MODAL;
-@@ -155,7 +155,7 @@
+@@ -155,7 +155,7 @@ public int open () {
handle = OS.gtk_message_dialog_new(parentHandle, dialogFlags, messageType, 0, buffer);
if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES);
if (parentHandle != 0) {
@@ -39070,7 +39327,7 @@ diff -urN x86/org/eclipse/swt/widgets/MessageBox.java x86_64/org/eclipse/swt/wid
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
-@@ -172,7 +172,7 @@
+@@ -172,7 +172,7 @@ public int open () {
display.setModalDialog (this);
}
int signalId = 0;
@@ -39079,10 +39336,11 @@ diff -urN x86/org/eclipse/swt/widgets/MessageBox.java x86_64/org/eclipse/swt/wid
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
-diff -urN x86/org/eclipse/swt/widgets/Monitor.java x86_64/org/eclipse/swt/widgets/Monitor.java
---- x86/org/eclipse/swt/widgets/Monitor.java 2008-06-05 13:32:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Monitor.java 2009-09-17 08:48:24.000000000 -0400
-@@ -22,7 +22,7 @@
+diff --git a/org/eclipse/swt/widgets/Monitor.java b/org/eclipse/swt/widgets/Monitor.java
+index f22948a..1ea2c09 100644
+--- a/org/eclipse/swt/widgets/Monitor.java
++++ b/org/eclipse/swt/widgets/Monitor.java
+@@ -22,7 +22,7 @@ import org.eclipse.swt.graphics.*;
* @since 3.0
*/
public final class Monitor {
@@ -39091,10 +39349,11 @@ diff -urN x86/org/eclipse/swt/widgets/Monitor.java x86_64/org/eclipse/swt/widget
int x, y, width, height;
int clientX, clientY, clientWidth, clientHeight;
-diff -urN x86/org/eclipse/swt/widgets/ProgressBar.java x86_64/org/eclipse/swt/widgets/ProgressBar.java
---- x86/org/eclipse/swt/widgets/ProgressBar.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/ProgressBar.java 2009-09-17 08:48:24.000000000 -0400
-@@ -162,8 +162,8 @@
+diff --git a/org/eclipse/swt/widgets/ProgressBar.java b/org/eclipse/swt/widgets/ProgressBar.java
+index 34f3886..8af9a6f 100644
+--- a/org/eclipse/swt/widgets/ProgressBar.java
++++ b/org/eclipse/swt/widgets/ProgressBar.java
+@@ -162,8 +162,8 @@ public int getState () {
return SWT.NORMAL;
}
@@ -39105,7 +39364,7 @@ diff -urN x86/org/eclipse/swt/widgets/ProgressBar.java x86_64/org/eclipse/swt/wi
if (result != 0) return result;
/*
* Bug in GTK. When a progress bar has been unrealized after being
-@@ -272,7 +272,7 @@
+@@ -272,7 +272,7 @@ public void setState (int state) {
//NOT IMPLEMENTED
}
@@ -39114,7 +39373,7 @@ diff -urN x86/org/eclipse/swt/widgets/ProgressBar.java x86_64/org/eclipse/swt/wi
if (isVisible ()) OS.gtk_progress_bar_pulse (handle);
return 1;
}
-@@ -295,7 +295,7 @@
+@@ -295,7 +295,7 @@ void updateBar (int selection, int minimum, int maximum) {
* but unexpected. The fix is to force all
* outstanding redraws to be delivered.
*/
@@ -39123,10 +39382,11 @@ diff -urN x86/org/eclipse/swt/widgets/ProgressBar.java x86_64/org/eclipse/swt/wi
OS.gdk_window_process_updates (window, false);
OS.gdk_flush ();
}
-diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/Sash.java
---- x86/org/eclipse/swt/widgets/Sash.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Sash.java 2009-09-17 08:48:24.000000000 -0400
-@@ -41,7 +41,7 @@
+diff --git a/org/eclipse/swt/widgets/Sash.java b/org/eclipse/swt/widgets/Sash.java
+index 4c5d29c..321e763 100644
+--- a/org/eclipse/swt/widgets/Sash.java
++++ b/org/eclipse/swt/widgets/Sash.java
+@@ -41,7 +41,7 @@ import org.eclipse.swt.events.*;
public class Sash extends Control {
boolean dragging;
int startX, startY, lastX, lastY;
@@ -39135,7 +39395,7 @@ diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/S
private final static int INCREMENT = 1;
private final static int PAGE_INCREMENT = 9;
-@@ -145,12 +145,12 @@
+@@ -145,12 +145,12 @@ void createHandle (int index) {
void drawBand (int x, int y, int width, int height) {
if ((style & SWT.SMOOTH) != 0) return;
@@ -39152,7 +39412,7 @@ diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/S
GdkColor color = new GdkColor ();
OS.gdk_color_white (colormap, color);
OS.gdk_gc_set_foreground (gc, color);
-@@ -163,8 +163,8 @@
+@@ -163,8 +163,8 @@ void drawBand (int x, int y, int width, int height) {
OS.g_object_unref (gc);
}
@@ -39163,7 +39423,7 @@ diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/S
if (result != 0) return result;
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
-@@ -172,7 +172,7 @@
+@@ -172,7 +172,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr)
if (button != 1) return 0;
if (gdkEvent.type == OS.GDK_2BUTTON_PRESS) return 0;
if (gdkEvent.type == OS.GDK_3BUTTON_PRESS) return 0;
@@ -39172,7 +39432,7 @@ diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/S
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
startX = (int) (gdkEvent.x_root - origin_x [0]);
-@@ -210,8 +210,8 @@
+@@ -210,8 +210,8 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr)
return result;
}
@@ -39183,7 +39443,7 @@ diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/S
if (result != 0) return result;
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
-@@ -240,8 +240,8 @@
+@@ -240,8 +240,8 @@ int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ eventPt
return result;
}
@@ -39194,7 +39454,7 @@ diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/S
if (result != 0) return result;
// widget could be disposed at this point
if (handle != 0) {
-@@ -251,8 +251,8 @@
+@@ -251,8 +251,8 @@ int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) {
return 0;
}
@@ -39205,7 +39465,7 @@ diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/S
if (result != 0) return result;
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-@@ -287,9 +287,9 @@
+@@ -287,9 +287,9 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
if (newX == lastX && newY == lastY) return result;
/* Ensure that the pointer image does not change */
@@ -39217,7 +39477,7 @@ diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/S
int ptrGrabResult = OS.gdk_pointer_grab (window, false, grabMask, window, gdkCursor, OS.GDK_CURRENT_TIME);
/* The event must be sent because its doit flag is used. */
-@@ -326,8 +326,8 @@
+@@ -326,8 +326,8 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
return result;
}
@@ -39228,7 +39488,7 @@ diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/S
if (result != 0) return result;
if (!dragging) return 0;
GdkEventMotion gdkEvent = new GdkEventMotion ();
-@@ -389,7 +389,7 @@
+@@ -389,7 +389,7 @@ int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ eventPtr
return result;
}
@@ -39237,7 +39497,7 @@ diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/S
setCursor (cursor != null ? cursor.handle : 0);
return super.gtk_realize (widget);
}
-@@ -430,7 +430,7 @@
+@@ -430,7 +430,7 @@ public void removeSelectionListener(SelectionListener listener) {
eventTable.unhook (SWT.DefaultSelection,listener);
}
@@ -39246,10 +39506,11 @@ diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/S
super.setCursor (cursor != 0 ? cursor : defaultCursor);
}
-diff -urN x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/Scale.java
---- x86/org/eclipse/swt/widgets/Scale.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Scale.java 2009-09-17 08:48:24.000000000 -0400
-@@ -127,7 +127,7 @@
+diff --git a/org/eclipse/swt/widgets/Scale.java b/org/eclipse/swt/widgets/Scale.java
+index 47e6ebb..19509c5 100644
+--- a/org/eclipse/swt/widgets/Scale.java
++++ b/org/eclipse/swt/widgets/Scale.java
+@@ -127,7 +127,7 @@ void createHandle (int index) {
fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_fixed_set_has_window (fixedHandle, true);
@@ -39258,7 +39519,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/
if (hAdjustment == 0) error (SWT.ERROR_NO_HANDLES);
if ((style & SWT.HORIZONTAL) != 0) {
handle = OS.gtk_hscale_new (hAdjustment);
-@@ -159,7 +159,7 @@
+@@ -159,7 +159,7 @@ void hookEvents () {
*/
public int getIncrement () {
checkWidget ();
@@ -39267,7 +39528,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.step_increment;
-@@ -177,7 +177,7 @@
+@@ -177,7 +177,7 @@ public int getIncrement () {
*/
public int getMaximum () {
checkWidget ();
@@ -39276,7 +39537,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.upper;
-@@ -195,7 +195,7 @@
+@@ -195,7 +195,7 @@ public int getMaximum () {
*/
public int getMinimum () {
checkWidget ();
@@ -39285,7 +39546,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.lower;
-@@ -215,7 +215,7 @@
+@@ -215,7 +215,7 @@ public int getMinimum () {
*/
public int getPageIncrement () {
checkWidget ();
@@ -39294,7 +39555,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.page_increment;
-@@ -233,13 +233,13 @@
+@@ -233,13 +233,13 @@ public int getPageIncrement () {
*/
public int getSelection () {
checkWidget ();
@@ -39310,10 +39571,67 @@ diff -urN x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/
postEvent (SWT.Selection);
return 0;
}
-diff -urN x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/widgets/Scrollable.java
---- x86/org/eclipse/swt/widgets/Scrollable.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Scrollable.java 2009-09-17 08:48:24.000000000 -0400
-@@ -33,7 +33,7 @@
+diff --git a/org/eclipse/swt/widgets/ScrollBar.java b/org/eclipse/swt/widgets/ScrollBar.java
+index b2fcd24..d99621e 100644
+--- a/org/eclipse/swt/widgets/ScrollBar.java
++++ b/org/eclipse/swt/widgets/ScrollBar.java
+@@ -84,7 +84,7 @@ import org.eclipse.swt.events.*;
+ */
+ public class ScrollBar extends Widget {
+ Scrollable parent;
+- int /*long*/ adjustmentHandle;
++ long /*int*/ adjustmentHandle;
+ int detail;
+ boolean dragSent;
+
+@@ -344,7 +344,7 @@ public int getThumb () {
+ */
+ public boolean getVisible () {
+ checkWidget ();
+- int /*long*/ scrolledHandle = parent.scrolledHandle;
++ long /*int*/ scrolledHandle = parent.scrolledHandle;
+ int [] hsp = new int [1], vsp = new int [1];
+ OS.gtk_scrolled_window_get_policy (scrolledHandle, hsp, vsp);
+ if ((style & SWT.HORIZONTAL) != 0) {
+@@ -354,20 +354,20 @@ public boolean getVisible () {
+ }
+ }
+
+-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
+- int /*long*/ result = super.gtk_button_press_event (widget, eventPtr);
++long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ eventPtr) {
++ long /*int*/ result = super.gtk_button_press_event (widget, eventPtr);
+ if (result != 0) return result;
+ detail = OS.GTK_SCROLL_NONE;
+ dragSent = false;
+ return result;
+ }
+
+-int /*long*/ gtk_change_value (int /*long*/ widget, int /*long*/ scroll, int /*long*/ value1, int /*long*/ value2) {
++long /*int*/ gtk_change_value (long /*int*/ widget, long /*int*/ scroll, long /*int*/ value1, long /*int*/ value2) {
+ detail = (int)/*64*/scroll;
+ return 0;
+ }
+
+-int /*long*/ gtk_value_changed (int /*long*/ adjustment) {
++long /*int*/ gtk_value_changed (long /*int*/ adjustment) {
+ Event event = new Event ();
+ dragSent = detail == OS.GTK_SCROLL_JUMP;
+ switch (detail) {
+@@ -395,7 +395,7 @@ int /*long*/ gtk_value_changed (int /*long*/ adjustment) {
+ return 0;
+ }
+
+-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
++long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
+ GdkEvent gtkEvent = new GdkEvent ();
+ OS.memmove (gtkEvent, gdkEvent, GdkEvent.sizeof);
+ switch (gtkEvent.type) {
+diff --git a/org/eclipse/swt/widgets/Scrollable.java b/org/eclipse/swt/widgets/Scrollable.java
+index ab33045..6ef46db 100644
+--- a/org/eclipse/swt/widgets/Scrollable.java
++++ b/org/eclipse/swt/widgets/Scrollable.java
+@@ -33,7 +33,7 @@ import org.eclipse.swt.graphics.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public abstract class Scrollable extends Control {
@@ -39322,7 +39640,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/wid
ScrollBar horizontalBar, verticalBar;
/**
-@@ -74,7 +74,7 @@
+@@ -74,7 +74,7 @@ public Scrollable (Composite parent, int style) {
super (parent, style);
}
@@ -39331,7 +39649,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/wid
return handle;
}
-@@ -116,7 +116,7 @@
+@@ -116,7 +116,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
trimWidth += vScrollBarWidth ();
if (scrolledHandle != 0) {
if (OS.gtk_scrolled_window_get_shadow_type (scrolledHandle) != OS.GTK_SHADOW_NONE) {
@@ -39340,7 +39658,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/wid
int xthickness = OS.gtk_style_get_xthickness (style);
int ythickness = OS.gtk_style_get_ythickness (style);
trimX -= xthickness;
-@@ -195,7 +195,7 @@
+@@ -195,7 +195,7 @@ public int getBorderWidth () {
public Rectangle getClientArea () {
checkWidget ();
forceResize ();
@@ -39349,7 +39667,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/wid
int x = OS.GTK_WIDGET_X (clientHandle);
int y = OS.GTK_WIDGET_Y (clientHandle);
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle);
-@@ -233,8 +233,8 @@
+@@ -233,8 +233,8 @@ public ScrollBar getVerticalBar () {
return verticalBar;
}
@@ -39360,7 +39678,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/wid
/*
* Feature in GTK. Scrolled windows do not scroll if the scrollbars
-@@ -268,7 +268,7 @@
+@@ -268,7 +268,7 @@ int /*long*/ gtk_scroll_event (int /*long*/ widget, int /*long*/ eventPtr) {
int hScrollBarWidth() {
if (horizontalBar==null) return 0;
@@ -39369,7 +39687,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/wid
if (hBarHandle==0) return 0;
GtkRequisition requisition = new GtkRequisition();
OS.gtk_widget_size_request(hBarHandle, requisition);
-@@ -312,9 +312,9 @@
+@@ -312,9 +312,9 @@ void redrawWidget (int x, int y, int width, int height, boolean redrawAll, boole
super.redrawWidget (x, y, width, height, redrawAll, all, trim);
if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_REALIZED) == 0) return;
if (!trim) return;
@@ -39381,7 +39699,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/wid
GdkRectangle rect = new GdkRectangle ();
if (redrawAll) {
rect.width = OS.GTK_WIDGET_WIDTH (topHandle);
-@@ -362,7 +362,7 @@
+@@ -362,7 +362,7 @@ void showWidget () {
if (scrolledHandle != 0) OS.gtk_widget_show (scrolledHandle);
}
@@ -39390,7 +39708,7 @@ diff -urN x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/wid
if (fixedHandle != 0) return fixedHandle;
if (scrolledHandle != 0) return scrolledHandle;
return super.topHandle ();
-@@ -374,7 +374,7 @@
+@@ -374,7 +374,7 @@ void updateScrollBarValue (ScrollBar bar) {
int vScrollBarWidth() {
if (verticalBar == null) return 0;
@@ -39399,65 +39717,11 @@ diff -urN x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/wid
if (vBarHandle == 0) return 0;
GtkRequisition requisition = new GtkRequisition();
OS.gtk_widget_size_request (vBarHandle, requisition);
-diff -urN x86/org/eclipse/swt/widgets/ScrollBar.java x86_64/org/eclipse/swt/widgets/ScrollBar.java
---- x86/org/eclipse/swt/widgets/ScrollBar.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/ScrollBar.java 2009-09-17 08:48:24.000000000 -0400
-@@ -84,7 +84,7 @@
- */
- public class ScrollBar extends Widget {
- Scrollable parent;
-- int /*long*/ adjustmentHandle;
-+ long /*int*/ adjustmentHandle;
- int detail;
- boolean dragSent;
-
-@@ -344,7 +344,7 @@
- */
- public boolean getVisible () {
- checkWidget ();
-- int /*long*/ scrolledHandle = parent.scrolledHandle;
-+ long /*int*/ scrolledHandle = parent.scrolledHandle;
- int [] hsp = new int [1], vsp = new int [1];
- OS.gtk_scrolled_window_get_policy (scrolledHandle, hsp, vsp);
- if ((style & SWT.HORIZONTAL) != 0) {
-@@ -354,20 +354,20 @@
- }
- }
-
--int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
-- int /*long*/ result = super.gtk_button_press_event (widget, eventPtr);
-+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ eventPtr) {
-+ long /*int*/ result = super.gtk_button_press_event (widget, eventPtr);
- if (result != 0) return result;
- detail = OS.GTK_SCROLL_NONE;
- dragSent = false;
- return result;
- }
-
--int /*long*/ gtk_change_value (int /*long*/ widget, int /*long*/ scroll, int /*long*/ value1, int /*long*/ value2) {
-+long /*int*/ gtk_change_value (long /*int*/ widget, long /*int*/ scroll, long /*int*/ value1, long /*int*/ value2) {
- detail = (int)/*64*/scroll;
- return 0;
- }
-
--int /*long*/ gtk_value_changed (int /*long*/ adjustment) {
-+long /*int*/ gtk_value_changed (long /*int*/ adjustment) {
- Event event = new Event ();
- dragSent = detail == OS.GTK_SCROLL_JUMP;
- switch (detail) {
-@@ -395,7 +395,7 @@
- return 0;
- }
-
--int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
-+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
- GdkEvent gtkEvent = new GdkEvent ();
- OS.memmove (gtkEvent, gdkEvent, GdkEvent.sizeof);
- switch (gtkEvent.type) {
-diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/Shell.java
---- x86/org/eclipse/swt/widgets/Shell.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Shell.java 2009-09-17 08:48:24.000000000 -0400
-@@ -117,7 +117,7 @@
+diff --git a/org/eclipse/swt/widgets/Shell.java b/org/eclipse/swt/widgets/Shell.java
+index 9e3a131..0364ae4 100644
+--- a/org/eclipse/swt/widgets/Shell.java
++++ b/org/eclipse/swt/widgets/Shell.java
+@@ -117,7 +117,7 @@ import org.eclipse.swt.events.*;
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
*/
public class Shell extends Decorations {
@@ -39466,7 +39730,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
boolean mapped, moved, resized, opened, fullScreen, showWithParent, modified, center;
int oldX, oldY, oldWidth, oldHeight;
int minWidth, minHeight;
-@@ -252,7 +252,7 @@
+@@ -252,7 +252,7 @@ public Shell (Display display, int style) {
this (display, null, style, 0, false);
}
@@ -39475,7 +39739,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
super ();
checkSubclass ();
if (display == null) display = Display.getCurrent ();
-@@ -356,7 +356,7 @@
+@@ -356,7 +356,7 @@ public Shell (Shell parent, int style) {
this (parent != null ? parent.display : null, parent, style, 0, false);
}
@@ -39484,7 +39748,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
return new Shell (display, null, SWT.NO_TRIM, handle, true);
}
-@@ -377,7 +377,7 @@
+@@ -377,7 +377,7 @@ public static Shell gtk_new (Display display, int /*long*/ handle) {
*
* @since 3.3
*/
@@ -39493,7 +39757,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
return new Shell (display, null, SWT.NO_TRIM, handle, false);
}
-@@ -448,7 +448,7 @@
+@@ -448,7 +448,7 @@ void adjustTrim () {
if (display.ignoreTrim) return;
int width = OS.GTK_WIDGET_WIDTH (shellHandle);
int height = OS.GTK_WIDGET_HEIGHT (shellHandle);
@@ -39502,7 +39766,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
GdkRectangle rect = new GdkRectangle ();
OS.gdk_window_get_frame_extents (window, rect);
int trimWidth = Math.max (0, rect.width - width);
-@@ -503,7 +503,7 @@
+@@ -503,7 +503,7 @@ void bringToTop (boolean force) {
if (!force) {
if (activeShell == null) return;
if (!display.activePending) {
@@ -39511,7 +39775,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
if (focusHandle != 0 && !OS.GTK_WIDGET_HAS_FOCUS (focusHandle)) return;
}
}
-@@ -531,10 +531,10 @@
+@@ -531,10 +531,10 @@ void bringToTop (boolean force) {
* window. The fix is to use XSetInputFocus() to force
* the focus.
*/
@@ -39525,7 +39789,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
OS.gdk_error_trap_push ();
/* Use CurrentTime instead of the last event time to ensure that the shell becomes active */
OS.XSetInputFocus (xDisplay, xWindow, OS.RevertToParent, OS.CurrentTime);
-@@ -584,7 +584,7 @@
+@@ -584,7 +584,7 @@ void checkOpen () {
if (!opened) resized = false;
}
@@ -39534,7 +39798,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
return 0;
}
-@@ -682,7 +682,7 @@
+@@ -682,7 +682,7 @@ void createHandle (int index) {
} else {
vboxHandle = OS.gtk_bin_get_child (shellHandle);
if (vboxHandle == 0) error (SWT.ERROR_NO_HANDLES);
@@ -39543,7 +39807,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
if (OS.g_list_length (children) > 0) {
scrolledHandle = OS.g_list_data (children);
}
-@@ -702,7 +702,7 @@
+@@ -702,7 +702,7 @@ void createHandle (int index) {
OS.gtk_widget_realize (shellHandle);
}
@@ -39552,7 +39816,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
int eventType = OS.X_EVENT_TYPE (xEvent);
if (eventType != OS.FocusOut && eventType != OS.FocusIn) return 0;
XFocusChangeEvent xFocusEvent = new XFocusChangeEvent();
-@@ -766,7 +766,7 @@
+@@ -766,7 +766,7 @@ void hookEvents () {
OS.g_signal_connect_closure_by_id (shellHandle, display.signalIds [MAP_EVENT], 0, display.shellMapProcClosure, false);
OS.g_signal_connect_closure_by_id (shellHandle, display.signalIds [ENTER_NOTIFY_EVENT], 0, display.closures [ENTER_NOTIFY_EVENT], false);
OS.g_signal_connect_closure (shellHandle, OS.move_focus, display.closures [MOVE_FOCUS], false);
@@ -39561,7 +39825,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
OS.gdk_window_add_filter (window, display.filterProc, shellHandle);
}
-@@ -795,7 +795,7 @@
+@@ -795,7 +795,7 @@ void releaseParent () {
/* Do nothing */
}
@@ -39570,7 +39834,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
return shellHandle;
}
-@@ -826,15 +826,15 @@
+@@ -826,15 +826,15 @@ void fixShell (Shell newShell, Control control) {
}
}
@@ -39589,7 +39853,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
}
void forceResize () {
-@@ -1070,7 +1070,7 @@
+@@ -1070,7 +1070,7 @@ public Shell [] getShells () {
return result;
}
@@ -39598,7 +39862,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
int [] x = new int [1], y = new int [1];
OS.gtk_window_get_position (shellHandle, x, y);
if (!moved || oldX != x [0] || oldY != y [0]) {
-@@ -1083,19 +1083,19 @@
+@@ -1083,19 +1083,19 @@ int /*long*/ gtk_configure_event (int /*long*/ widget, int /*long*/ event) {
return 0;
}
@@ -39621,7 +39885,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
switch ((int)/*64*/directionType) {
case OS.GTK_DIR_TAB_FORWARD:
case OS.GTK_DIR_TAB_BACKWARD:
-@@ -1112,17 +1112,17 @@
+@@ -1112,17 +1112,17 @@ int /*long*/ gtk_focus (int /*long*/ widget, int /*long*/ directionType) {
return super.gtk_focus (widget, directionType);
}
@@ -39642,7 +39906,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
/* Stop menu mnemonics when the shell is disabled */
if (widget == shellHandle) {
return (state & DISABLED) != 0 ? 1 : 0;
-@@ -1130,7 +1130,7 @@
+@@ -1130,7 +1130,7 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
return super.gtk_key_press_event (widget, event);
}
@@ -39651,7 +39915,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
int width = OS.GTK_WIDGET_WIDTH (shellHandle);
int height = OS.GTK_WIDGET_HEIGHT (shellHandle);
if (!resized || oldWidth != width || oldHeight != height) {
-@@ -1141,9 +1141,9 @@
+@@ -1141,9 +1141,9 @@ int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
return 0;
}
@@ -39664,7 +39928,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
if ((style & SWT.SHELL_TRIM) != SWT.SHELL_TRIM) {
int decorations = 0;
if ((style & SWT.NO_TRIM) == 0) {
-@@ -1169,7 +1169,7 @@
+@@ -1169,7 +1169,7 @@ int /*long*/ gtk_realize (int /*long*/ widget) {
return result;
}
@@ -39673,7 +39937,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
GdkEventWindowState gdkEvent = new GdkEventWindowState ();
OS.memmove (gdkEvent, event, GdkEventWindowState.sizeof);
minimized = (gdkEvent.new_window_state & OS.GDK_WINDOW_STATE_ICONIFIED) != 0;
-@@ -1418,13 +1418,13 @@
+@@ -1418,13 +1418,13 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
return result;
}
@@ -39689,7 +39953,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
OS.XFlush (xDisplay);
}
}
-@@ -1457,9 +1457,9 @@
+@@ -1457,9 +1457,9 @@ public void setEnabled (boolean enabled) {
enableWindow = 0;
}
} else {
@@ -39701,7 +39965,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
Rectangle rect = getBounds ();
GdkWindowAttr attributes = new GdkWindowAttr ();
attributes.width = rect.width;
-@@ -1474,7 +1474,7 @@
+@@ -1474,7 +1474,7 @@ public void setEnabled (boolean enabled) {
if (!OS.GDK_WINDOWING_X11 ()) {
OS.gdk_flush ();
} else {
@@ -39710,7 +39974,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
OS.XFlush (xDisplay);
}
}
-@@ -1548,7 +1548,7 @@
+@@ -1548,7 +1548,7 @@ void setInitialBounds () {
if ((state & FOREIGN_HANDLE) != 0) return;
int width = OS.gdk_screen_width () * 5 / 8;
int height = OS.gdk_screen_height () * 5 / 8;
@@ -39719,7 +39983,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
if (screen != 0) {
if (OS.gdk_screen_get_n_monitors (screen) > 1) {
int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, paintWindow ());
-@@ -1583,13 +1583,13 @@
+@@ -1583,13 +1583,13 @@ public void setMenuBar (Menu menu) {
if (menu.parent != this) error (SWT.ERROR_INVALID_PARENT);
}
if (menuBar != null) {
@@ -39735,7 +39999,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
OS.gtk_widget_show (menuHandle);
createAccelGroup ();
menuBar.addAccelerators (accelGroup);
-@@ -1835,7 +1835,7 @@
+@@ -1835,7 +1835,7 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations) {
if (mapped) setZOrder (sibling, above, false, false);
}
@@ -39744,7 +40008,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
mapped = true;
display.dispatchEvents = null;
return 0;
-@@ -1849,12 +1849,12 @@
+@@ -1849,12 +1849,12 @@ void showWidget () {
if (vboxHandle != 0) OS.gtk_widget_show (vboxHandle);
}
@@ -39759,7 +40023,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
if (screen != 0) {
int monitorNumber = OS.gdk_screen_get_monitor_at_point (screen, x[0], y[0]);
GdkRectangle dest = new GdkRectangle ();
-@@ -1872,7 +1872,7 @@
+@@ -1872,7 +1872,7 @@ int /*long*/ sizeAllocateProc (int /*long*/ handle, int /*long*/ arg0, int /*lon
return 0;
}
@@ -39768,7 +40032,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
OS.gtk_widget_hide (handle);
return 0;
}
-@@ -1918,7 +1918,7 @@
+@@ -1918,7 +1918,7 @@ int trimWidth () {
}
void updateModal () {
@@ -39777,7 +40041,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
if (display.getModalDialog () == null) {
Shell modal = getModalShell ();
int mask = SWT.PRIMARY_MODAL | SWT.APPLICATION_MODAL | SWT.SYSTEM_MODAL;
-@@ -2072,16 +2072,16 @@
+@@ -2072,16 +2072,16 @@ void releaseWidget () {
tooltipsHandle = 0;
if (group != 0) OS.g_object_unref (group);
group = modalGroup = 0;
@@ -39797,7 +40061,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
if (OS.GTK_VERSION >= OS.VERSION (2, 12, 0)) {
byte [] buffer = null;
if (string != null && string.length () > 0) {
-@@ -2097,12 +2097,12 @@
+@@ -2097,12 +2097,12 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
* 2 fake GDK_MOTION_NOTIFY events (to mimic the GTK call) which
* contain the proper x and y coordinates.
*/
@@ -39814,7 +40078,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
if (window != 0) OS.gdk_window_get_user_data (window, user_data);
if (tipWidget == user_data [0]) {
eventPtr = OS.gdk_event_new (OS.GDK_MOTION_NOTIFY);
-@@ -2148,7 +2148,7 @@
+@@ -2148,7 +2148,7 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
if (OS.GTK_VERSION >= OS.VERSION (2, 2, 1)) {
OS.gtk_tooltips_force_window (tooltipsHandle);
}
@@ -39823,7 +40087,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
if (tipWindow != 0 && tipWindow != tooltipWindow) {
OS.g_signal_connect (tipWindow, OS.size_allocate, display.sizeAllocateProc, shellHandle);
tooltipWindow = tipWindow;
-@@ -2164,9 +2164,9 @@
+@@ -2164,9 +2164,9 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
if (tipWindow != 0) {
if ((OS.GTK_WIDGET_FLAGS (tipWidget) & (OS.GTK_REALIZED | OS.GTK_VISIBLE)) != 0) {
int [] x = new int [1], y = new int [1];
@@ -39835,7 +40099,7 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
OS.gdk_window_get_user_data (window, user_data);
if (tipWidget == user_data [0]) {
/*
-@@ -2180,7 +2180,7 @@
+@@ -2180,7 +2180,7 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
int handler_id = OS.g_signal_connect (tipWindow, OS.size_request, display.sizeRequestProc, shellHandle);
OS.gtk_tooltips_set_tip (tooltipsHandle, tipWidget, buffer, null);
OS.gtk_widget_hide (tipWindow);
@@ -39844,10 +40108,11 @@ diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/
OS.GTK_TOOLTIPS_SET_ACTIVE (tooltipsHandle, data);
OS.gtk_tooltips_set_tip (tooltipsHandle, tipWidget, buffer, null);
if (handler_id != 0) OS.g_signal_handler_disconnect (tipWindow, handler_id);
-diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets/Slider.java
---- x86/org/eclipse/swt/widgets/Slider.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Slider.java 2009-09-17 08:48:24.000000000 -0400
-@@ -153,7 +153,7 @@
+diff --git a/org/eclipse/swt/widgets/Slider.java b/org/eclipse/swt/widgets/Slider.java
+index 61d636b..8ca81fc 100644
+--- a/org/eclipse/swt/widgets/Slider.java
++++ b/org/eclipse/swt/widgets/Slider.java
+@@ -153,7 +153,7 @@ void createHandle (int index) {
fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_fixed_set_has_window (fixedHandle, true);
@@ -39856,7 +40121,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
if (hAdjustment == 0) error (SWT.ERROR_NO_HANDLES);
if ((style & SWT.HORIZONTAL) != 0) {
handle = OS.gtk_hscrollbar_new (hAdjustment);
-@@ -175,20 +175,20 @@
+@@ -175,20 +175,20 @@ void createHandle (int index) {
OS.gtk_container_add (fixedHandle, handle);
}
@@ -39881,7 +40146,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
Event event = new Event ();
dragSent = detail == OS.GTK_SCROLL_JUMP;
switch (detail) {
-@@ -214,7 +214,7 @@
+@@ -214,7 +214,7 @@ int /*long*/ gtk_value_changed (int /*long*/ adjustment) {
return 0;
}
@@ -39890,7 +40155,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
GdkEvent gtkEvent = new GdkEvent ();
OS.memmove (gtkEvent, gdkEvent, GdkEvent.sizeof);
switch (gtkEvent.type) {
-@@ -247,13 +247,13 @@
+@@ -247,13 +247,13 @@ void hookEvents () {
void register () {
super.register ();
@@ -39906,7 +40171,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
display.removeWidget (hAdjustment);
}
-@@ -284,7 +284,7 @@
+@@ -284,7 +284,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
*/
public int getIncrement () {
checkWidget ();
@@ -39915,7 +40180,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.step_increment;
-@@ -302,7 +302,7 @@
+@@ -302,7 +302,7 @@ public int getIncrement () {
*/
public int getMaximum () {
checkWidget ();
@@ -39924,7 +40189,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.upper;
-@@ -320,7 +320,7 @@
+@@ -320,7 +320,7 @@ public int getMaximum () {
*/
public int getMinimum () {
checkWidget ();
@@ -39933,7 +40198,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.lower;
-@@ -340,7 +340,7 @@
+@@ -340,7 +340,7 @@ public int getMinimum () {
*/
public int getPageIncrement () {
checkWidget ();
@@ -39942,7 +40207,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.page_increment;
-@@ -358,7 +358,7 @@
+@@ -358,7 +358,7 @@ public int getPageIncrement () {
*/
public int getSelection () {
checkWidget ();
@@ -39951,7 +40216,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.value;
-@@ -377,7 +377,7 @@
+@@ -377,7 +377,7 @@ public int getSelection () {
*/
public int getThumb () {
checkWidget ();
@@ -39960,7 +40225,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.page_size;
-@@ -444,7 +444,7 @@
+@@ -444,7 +444,7 @@ public void setIncrement (int value) {
*/
public void setMaximum (int value) {
checkWidget ();
@@ -39969,7 +40234,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int minimum = (int) adjustment.lower;
-@@ -474,7 +474,7 @@
+@@ -474,7 +474,7 @@ public void setMaximum (int value) {
public void setMinimum (int value) {
checkWidget ();
if (value < 0) return;
@@ -39978,7 +40243,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int maximum = (int) adjustment.upper;
-@@ -554,7 +554,7 @@
+@@ -554,7 +554,7 @@ public void setSelection (int value) {
public void setThumb (int value) {
checkWidget ();
if (value < 1) return;
@@ -39987,7 +40252,7 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
value = (int) Math.min (value, (int)(adjustment.upper - adjustment.lower));
-@@ -595,7 +595,7 @@
+@@ -595,7 +595,7 @@ public void setValues (int selection, int minimum, int maximum, int thumb, int i
if (increment < 1) return;
if (pageIncrement < 1) return;
thumb = Math.min (thumb, maximum - minimum);
@@ -39996,10 +40261,11 @@ diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
adjustment.value = Math.min (Math.max (selection, minimum), maximum - thumb);
-diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets/Spinner.java
---- x86/org/eclipse/swt/widgets/Spinner.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Spinner.java 2009-09-17 08:48:24.000000000 -0400
-@@ -45,7 +45,7 @@
+diff --git a/org/eclipse/swt/widgets/Spinner.java b/org/eclipse/swt/widgets/Spinner.java
+index b08c147..d593d4d 100644
+--- a/org/eclipse/swt/widgets/Spinner.java
++++ b/org/eclipse/swt/widgets/Spinner.java
+@@ -45,7 +45,7 @@ import org.eclipse.swt.events.*;
public class Spinner extends Composite {
static final int MIN_ARROW_WIDTH = 6;
int lastEventTime = 0;
@@ -40008,7 +40274,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
int fixStart = -1, fixEnd = -1;
/**
-@@ -202,8 +202,8 @@
+@@ -202,8 +202,8 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0;
int[] w = new int [1], h = new int [1];
OS.gtk_widget_realize (handle);
@@ -40019,7 +40285,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
-@@ -221,7 +221,7 @@
+@@ -221,7 +221,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
string = buffer.toString ();
}
byte [] buffer1 = Converter.wcsToMbcs (null, string, false);
@@ -40028,7 +40294,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
int length = OS.strlen (ptr);
byte [] buffer2 = new byte [length];
OS.memmove (buffer2, ptr, length);
-@@ -239,7 +239,7 @@
+@@ -239,7 +239,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
public Rectangle computeTrim (int x, int y, int width, int height) {
checkWidget ();
int xborder = 0, yborder = 0;
@@ -40037,7 +40303,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if ((this.style & SWT.BORDER) != 0) {
xborder += OS.gtk_style_get_xthickness (style);
yborder += OS.gtk_style_get_ythickness (style);
-@@ -251,7 +251,7 @@
+@@ -251,7 +251,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
xborder += property [0];
yborder += property [0];
}
@@ -40046,7 +40312,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
int fontSize = OS.pango_font_description_get_size (fontDesc);
int arrowSize = Math.max (OS.PANGO_PIXELS (fontSize), MIN_ARROW_WIDTH);
arrowSize = arrowSize - arrowSize % 2;
-@@ -290,7 +290,7 @@
+@@ -290,7 +290,7 @@ void createHandle (int index) {
fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_fixed_set_has_window (fixedHandle, true);
@@ -40055,7 +40321,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if (adjustment == 0) error (SWT.ERROR_NO_HANDLES);
handle = OS.gtk_spin_button_new (adjustment, 1, 0);
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-@@ -319,23 +319,23 @@
+@@ -319,23 +319,23 @@ public void cut () {
void deregister () {
super.deregister ();
@@ -40084,7 +40350,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if (imContext != 0) {
return OS.gtk_im_context_filter_keypress (imContext, event);
}
-@@ -354,7 +354,7 @@
+@@ -354,7 +354,7 @@ void fixIM () {
* filter has to be called by SWT.
*/
if (gdkEventKey != 0 && gdkEventKey != -1) {
@@ -40093,7 +40359,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if (imContext != 0) {
OS.gtk_im_context_filter_keypress (imContext, gdkEventKey);
gdkEventKey = -1;
-@@ -370,7 +370,7 @@
+@@ -370,7 +370,7 @@ GdkColor getBackgroundColor () {
public int getBorderWidth () {
checkWidget();
@@ -40102,7 +40368,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if ((this.style & SWT.BORDER) != 0) {
return OS.gtk_style_get_xthickness (style);
}
-@@ -394,7 +394,7 @@
+@@ -394,7 +394,7 @@ GdkColor getForegroundColor () {
*/
public int getIncrement () {
checkWidget ();
@@ -40111,7 +40377,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
-@@ -415,7 +415,7 @@
+@@ -415,7 +415,7 @@ public int getIncrement () {
*/
public int getMaximum () {
checkWidget ();
@@ -40120,7 +40386,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
-@@ -436,7 +436,7 @@
+@@ -436,7 +436,7 @@ public int getMaximum () {
*/
public int getMinimum () {
checkWidget ();
@@ -40129,7 +40395,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
-@@ -458,7 +458,7 @@
+@@ -458,7 +458,7 @@ public int getMinimum () {
*/
public int getPageIncrement () {
checkWidget ();
@@ -40138,7 +40404,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
-@@ -479,7 +479,7 @@
+@@ -479,7 +479,7 @@ public int getPageIncrement () {
*/
public int getSelection () {
checkWidget ();
@@ -40147,7 +40413,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
-@@ -504,7 +504,7 @@
+@@ -504,7 +504,7 @@ public int getSelection () {
*/
public String getText () {
checkWidget ();
@@ -40156,7 +40422,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if (str == 0) return "";
int length = OS.strlen (str);
byte [] buffer = new byte [length];
-@@ -551,26 +551,26 @@
+@@ -551,26 +551,26 @@ public int getDigits () {
}
String getDecimalSeparator () {
@@ -40189,7 +40455,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
if (value != adjustment.value && adjustment.lower <= value && value <= adjustment.upper) {
-@@ -587,7 +587,7 @@
+@@ -587,7 +587,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
* is to post the modify event when the user is typing.
*/
boolean keyPress = false;
@@ -40198,7 +40464,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-@@ -606,7 +606,7 @@
+@@ -606,7 +606,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
return 0;
}
@@ -40207,7 +40473,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if (text == 0) return 0;
if (!OS.gtk_editable_get_editable (handle)) return 0;
int length = OS.strlen (text);
-@@ -644,7 +644,7 @@
+@@ -644,7 +644,7 @@ int /*long*/ gtk_commit (int /*long*/ imContext, int /*long*/ text) {
return 0;
}
@@ -40216,7 +40482,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
String newText = verifyText ("", (int)/*64*/start_pos, (int)/*64*/end_pos);
if (newText == null) {
-@@ -665,17 +665,17 @@
+@@ -665,17 +665,17 @@ int /*long*/ gtk_delete_text (int /*long*/ widget, int /*long*/ start_pos, int /
return 0;
}
@@ -40237,7 +40503,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
// if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
if (new_text == 0 || new_text_length == 0) return 0;
byte [] buffer = new byte [(int)/*64*/new_text_length];
-@@ -684,7 +684,7 @@
+@@ -684,7 +684,7 @@ int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*
int [] pos = new int [1];
OS.memmove (pos, position, 4);
if (pos [0] == -1) {
@@ -40246,7 +40512,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1);
}
String newText = verifyText (oldText, pos [0], pos [0]);
-@@ -716,15 +716,15 @@
+@@ -716,15 +716,15 @@ int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*
return 0;
}
@@ -40265,7 +40531,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
OS.gtk_widget_set_direction (menu, OS.GTK_TEXT_DIR_RTL);
OS.gtk_container_forall (menu, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);
-@@ -732,7 +732,7 @@
+@@ -732,7 +732,7 @@ int /*long*/ gtk_populate_popup (int /*long*/ widget, int /*long*/ menu) {
return 0;
}
@@ -40274,7 +40540,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
postEvent (SWT.Selection);
return 0;
}
-@@ -745,7 +745,7 @@
+@@ -745,7 +745,7 @@ void hookEvents () {
OS.g_signal_connect_closure (handle, OS.value_changed, display.closures [VALUE_CHANGED], false);
OS.g_signal_connect_closure (handle, OS.activate, display.closures [ACTIVATE], false);
OS.g_signal_connect_closure (handle, OS.populate_popup, display.closures [POPULATE_POPUP], false);
@@ -40283,7 +40549,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if (imContext != 0) {
OS.g_signal_connect_closure (imContext, OS.commit, display.closures [COMMIT], false);
int id = OS.g_signal_lookup (OS.commit, OS.gtk_im_context_get_type ());
-@@ -754,13 +754,13 @@
+@@ -754,13 +754,13 @@ void hookEvents () {
}
}
@@ -40301,7 +40567,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if (children != 0) window = OS.g_list_data (children);
OS.g_list_free (children);
return window;
-@@ -785,7 +785,7 @@
+@@ -785,7 +785,7 @@ public void paste () {
void register () {
super.register ();
@@ -40310,7 +40576,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if (imContext != 0) display.addWidget (imContext, this);
}
-@@ -872,14 +872,14 @@
+@@ -872,14 +872,14 @@ void setBackgroundColor (GdkColor color) {
OS.gtk_widget_modify_base (handle, 0, color);
}
@@ -40328,7 +40594,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
super.setFontDescription (font);
}
-@@ -898,7 +898,7 @@
+@@ -898,7 +898,7 @@ void setFontDescription (int /*long*/ font) {
public void setIncrement (int value) {
checkWidget ();
if (value < 1) return;
@@ -40337,7 +40603,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
double newValue = value;
-@@ -924,7 +924,7 @@
+@@ -924,7 +924,7 @@ public void setIncrement (int value) {
*/
public void setMaximum (int value) {
checkWidget ();
@@ -40346,7 +40612,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
double newValue = value;
-@@ -951,7 +951,7 @@
+@@ -951,7 +951,7 @@ public void setMaximum (int value) {
*/
public void setMinimum (int value) {
checkWidget ();
@@ -40355,7 +40621,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
double newValue = value;
-@@ -978,7 +978,7 @@
+@@ -978,7 +978,7 @@ public void setMinimum (int value) {
public void setPageIncrement (int value) {
checkWidget ();
if (value < 1) return;
@@ -40364,7 +40630,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
double newValue = value;
-@@ -1065,7 +1065,7 @@
+@@ -1065,7 +1065,7 @@ public void setDigits (int value) {
if (value < 0) error (SWT.ERROR_INVALID_ARGUMENT);
int digits = OS.gtk_spin_button_get_digits (handle);
if (value == digits) return;
@@ -40373,7 +40639,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int diff = Math.abs (value - digits);
-@@ -1137,9 +1137,9 @@
+@@ -1137,9 +1137,9 @@ boolean translateTraversal (GdkEventKey keyEvent) {
switch (key) {
case OS.GDK_KP_Enter:
case OS.GDK_Return: {
@@ -40385,7 +40651,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);
if (preeditString [0] != 0) {
int length = OS.strlen (preeditString [0]);
-@@ -1158,7 +1158,7 @@
+@@ -1158,7 +1158,7 @@ String verifyText (String string, int start, int end) {
event.text = string;
event.start = start;
event.end = end;
@@ -40394,7 +40660,7 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-@@ -1179,7 +1179,7 @@
+@@ -1179,7 +1179,7 @@ String verifyText (String string, int start, int end) {
index = 0;
}
if (string.length () > 0) {
@@ -40403,10 +40669,11 @@ diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widget
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
if (adjustment.lower < 0 && string.charAt (0) == '-') index++;
-diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widgets/TabFolder.java
---- x86/org/eclipse/swt/widgets/TabFolder.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/TabFolder.java 2009-09-17 08:48:24.000000000 -0400
-@@ -100,8 +100,8 @@
+diff --git a/org/eclipse/swt/widgets/TabFolder.java b/org/eclipse/swt/widgets/TabFolder.java
+index 68ddc4b..a9e27ad 100644
+--- a/org/eclipse/swt/widgets/TabFolder.java
++++ b/org/eclipse/swt/widgets/TabFolder.java
+@@ -100,8 +100,8 @@ protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
@@ -40417,7 +40684,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
if ((OS.gtk_rc_style_get_color_flags (rcStyle, 0) & OS.GTK_RC_BG) != 0) return 0;
OS.gtk_widget_realize (handle);
return OS.gtk_widget_get_style (handle);
-@@ -139,7 +139,7 @@
+@@ -139,7 +139,7 @@ public void addSelectionListener(SelectionListener listener) {
addListener(SWT.DefaultSelection,typedListener);
}
@@ -40426,7 +40693,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
int index = OS.gtk_notebook_get_current_page (handle);
if (index != -1 && items [index] != null) {
return items [index].pageHandle;
-@@ -164,7 +164,7 @@
+@@ -164,7 +164,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
public Rectangle computeTrim (int x, int y, int width, int height) {
checkWidget();
forceResize ();
@@ -40435,7 +40702,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
int clientX = OS.GTK_WIDGET_X (clientHandle);
int clientY = OS.GTK_WIDGET_Y (clientHandle);
x -= clientX;
-@@ -201,7 +201,7 @@
+@@ -201,7 +201,7 @@ void createWidget (int index) {
}
void createItem (TabItem item, int index) {
@@ -40444,7 +40711,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
int itemCount = 0;
if (list != 0) {
itemCount = OS.g_list_length (list);
-@@ -213,15 +213,15 @@
+@@ -213,15 +213,15 @@ void createItem (TabItem item, int index) {
System.arraycopy (items, 0, newItems, 0, items.length);
items = newItems;
}
@@ -40464,7 +40731,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
if (pageHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);
OS.gtk_notebook_insert_page (handle, pageHandle, boxHandle, index);
-@@ -283,7 +283,7 @@
+@@ -283,7 +283,7 @@ void destroyItem (TabItem item) {
}
}
@@ -40473,7 +40740,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
return handle;
}
-@@ -305,7 +305,7 @@
+@@ -305,7 +305,7 @@ int /*long*/ eventHandle () {
public TabItem getItem (int index) {
checkWidget();
if (!(0 <= index && index < getItemCount())) error (SWT.ERROR_INVALID_RANGE);
@@ -40482,7 +40749,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
if (list == 0) error (SWT.ERROR_CANNOT_GET_ITEM);
int itemCount = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -334,7 +334,7 @@
+@@ -334,7 +334,7 @@ public TabItem getItem (int index) {
public TabItem getItem(Point point) {
checkWidget();
if (point == null) error (SWT.ERROR_NULL_ARGUMENT);
@@ -40491,7 +40758,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
if (list == 0) return null;
int itemCount = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -358,7 +358,7 @@
+@@ -358,7 +358,7 @@ public TabItem getItem(Point point) {
*/
public int getItemCount () {
checkWidget();
@@ -40500,7 +40767,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
if (list == 0) return 0;
int itemCount = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -428,11 +428,11 @@
+@@ -428,11 +428,11 @@ public int getSelectionIndex () {
return OS.gtk_notebook_get_current_page (handle);
}
@@ -40514,7 +40781,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
int index = OS.gtk_notebook_get_current_page (handle);
if (index != -1) {
Control control = items [index].getControl ();
-@@ -477,7 +477,7 @@
+@@ -477,7 +477,7 @@ void hookEvents () {
public int indexOf (TabItem item) {
checkWidget();
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
@@ -40523,7 +40790,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
if (list == 0) return -1;
int count = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -494,7 +494,7 @@
+@@ -494,7 +494,7 @@ Point minimumSize (int wHint, int hHint, boolean flushCache) {
Control child = children [i];
int index = 0;
int count = 0;
@@ -40532,7 +40799,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
if (list != 0) {
count = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -519,7 +519,7 @@
+@@ -519,7 +519,7 @@ Point minimumSize (int wHint, int hHint, boolean flushCache) {
boolean mnemonicHit (char key) {
int itemCount = getItemCount ();
for (int i=0; i<itemCount; i++) {
@@ -40541,7 +40808,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;
}
return false;
-@@ -528,7 +528,7 @@
+@@ -528,7 +528,7 @@ boolean mnemonicHit (char key) {
boolean mnemonicMatch (char key) {
int itemCount = getItemCount ();
for (int i=0; i<itemCount; i++) {
@@ -40550,7 +40817,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;
}
return false;
-@@ -602,7 +602,7 @@
+@@ -602,7 +602,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
return result;
}
@@ -40559,10 +40826,11 @@ diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widg
super.setFontDescription (font);
TabItem [] items = getItems ();
for (int i = 0; i < items.length; i++) {
-diff -urN x86/org/eclipse/swt/widgets/TabItem.java x86_64/org/eclipse/swt/widgets/TabItem.java
---- x86/org/eclipse/swt/widgets/TabItem.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/TabItem.java 2009-09-17 08:48:24.000000000 -0400
-@@ -34,7 +34,7 @@
+diff --git a/org/eclipse/swt/widgets/TabItem.java b/org/eclipse/swt/widgets/TabItem.java
+index a19d175..b2298ce 100644
+--- a/org/eclipse/swt/widgets/TabItem.java
++++ b/org/eclipse/swt/widgets/TabItem.java
+@@ -34,7 +34,7 @@ import org.eclipse.swt.graphics.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class TabItem extends Item {
@@ -40571,7 +40839,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabItem.java x86_64/org/eclipse/swt/widget
Control control;
TabFolder parent;
String toolTipText;
-@@ -206,12 +206,12 @@
+@@ -206,12 +206,12 @@ public String getToolTipText () {
return toolTipText;
}
@@ -40586,7 +40854,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabItem.java x86_64/org/eclipse/swt/widget
return parent.gtk_mnemonic_activate (widget, arg1);
}
-@@ -281,7 +281,7 @@
+@@ -281,7 +281,7 @@ public void setControl (Control control) {
if (oldControl != null) oldControl.setVisible (false);
}
@@ -40595,7 +40863,7 @@ diff -urN x86/org/eclipse/swt/widgets/TabItem.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_modify_font (labelHandle, font);
OS.gtk_widget_modify_font (imageHandle, font);
}
-@@ -304,7 +304,7 @@
+@@ -304,7 +304,7 @@ public void setImage (Image image) {
} else {
imageList.put (imageIndex, image);
}
@@ -40604,379 +40872,11 @@ diff -urN x86/org/eclipse/swt/widgets/TabItem.java x86_64/org/eclipse/swt/widget
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
OS.gtk_widget_show (imageHandle);
} else {
-diff -urN x86/org/eclipse/swt/widgets/TableColumn.java x86_64/org/eclipse/swt/widgets/TableColumn.java
---- x86/org/eclipse/swt/widgets/TableColumn.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/TableColumn.java 2009-09-17 08:48:24.000000000 -0400
-@@ -36,7 +36,7 @@
- * @noextend This class is not intended to be subclassed by clients.
- */
- public class TableColumn extends Item {
-- int /*long*/ labelHandle, imageHandle, buttonHandle;
-+ long /*int*/ labelHandle, imageHandle, buttonHandle;
- Table parent;
- int modelIndex, lastButton, lastTime, lastX, lastWidth;
- boolean customDraw, useFixedWidth;
-@@ -324,7 +324,7 @@
- return OS.gtk_tree_view_column_get_width (handle);
- }
-
--int /*long*/ gtk_clicked (int /*long*/ widget) {
-+long /*int*/ gtk_clicked (long /*int*/ widget) {
- /*
- * There is no API to get a double click on a table column. Normally, when
- * the mouse is double clicked, this is indicated by GDK_2BUTTON_PRESS
-@@ -334,7 +334,7 @@
- */
- boolean doubleClick = false;
- boolean postEvent = true;
-- int /*long*/ eventPtr = OS.gtk_get_current_event ();
-+ long /*int*/ eventPtr = OS.gtk_get_current_event ();
- if (eventPtr != 0) {
- GdkEventButton gdkEvent = new GdkEventButton ();
- OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
-@@ -366,7 +366,7 @@
- return 0;
- }
-
--int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
-+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
- GdkEvent event = new GdkEvent ();
- OS.memmove (event, gdkEvent, GdkEvent.sizeof);
- switch (event.type) {
-@@ -382,11 +382,11 @@
- return 0;
- }
-
--int /*long*/ gtk_mnemonic_activate (int /*long*/ widget, int /*long*/ arg1) {
-+long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) {
- return parent.gtk_mnemonic_activate (widget, arg1);
- }
-
--int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
-+long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {
- useFixedWidth = false;
- int x = OS.GTK_WIDGET_X (widget);
- int width = OS.GTK_WIDGET_WIDTH (widget);
-@@ -438,7 +438,7 @@
- }
- }
- } else {
-- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
- if (OS.gtk_tree_model_get_iter_first (parent.modelHandle, iter)) {
- do {
- width = Math.max (width, parent.calculateWidth (handle, iter));
-@@ -545,7 +545,7 @@
- parent.createRenderers (handle, modelIndex, index == 0, style);
- }
-
--void setFontDescription (int /*long*/ font) {
-+void setFontDescription (long /*int*/ font) {
- OS.gtk_widget_modify_font (labelHandle, font);
- OS.gtk_widget_modify_font (imageHandle, font);
- }
-@@ -560,7 +560,7 @@
- }
- int imageIndex = headerImageList.indexOf (image);
- if (imageIndex == -1) imageIndex = headerImageList.add (image);
-- int /*long*/ pixbuf = headerImageList.getPixbuf (imageIndex);
-+ long /*int*/ pixbuf = headerImageList.getPixbuf (imageIndex);
- OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
- OS.gtk_widget_show (imageHandle);
- } else {
-diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widgets/TableItem.java
---- x86/org/eclipse/swt/widgets/TableItem.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/TableItem.java 2009-09-17 08:48:24.000000000 -0400
-@@ -127,7 +127,7 @@
- }
-
- Color _getBackground () {
-- int /*long*/ [] ptr = new int /*long*/ [1];
-+ long /*int*/ [] ptr = new long /*int*/ [1];
- OS.gtk_tree_model_get (parent.modelHandle, handle, Table.BACKGROUND_COLUMN, ptr, -1);
- if (ptr [0] == 0) return parent.getBackground ();
- GdkColor gdkColor = new GdkColor ();
-@@ -138,7 +138,7 @@
- Color _getBackground (int index) {
- int count = Math.max (1, parent.columnCount);
- if (0 > index || index > count - 1) return _getBackground ();
-- int /*long*/ [] ptr = new int /*long*/ [1];
-+ long /*int*/ [] ptr = new long /*int*/ [1];
- int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
- OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_BACKGROUND, ptr, -1);
- if (ptr [0] == 0) return _getBackground ();
-@@ -148,13 +148,13 @@
- }
-
- boolean _getChecked () {
-- int /*long*/ [] ptr = new int /*long*/ [1];
-+ long /*int*/ [] ptr = new long /*int*/ [1];
- OS.gtk_tree_model_get (parent.modelHandle, handle, Table.CHECKED_COLUMN, ptr, -1);
- return ptr [0] != 0;
- }
-
- Color _getForeground () {
-- int /*long*/ [] ptr = new int /*long*/ [1];
-+ long /*int*/ [] ptr = new long /*int*/ [1];
- OS.gtk_tree_model_get (parent.modelHandle, handle, Table.FOREGROUND_COLUMN, ptr, -1);
- if (ptr [0] == 0) return parent.getForeground ();
- GdkColor gdkColor = new GdkColor ();
-@@ -165,7 +165,7 @@
- Color _getForeground (int index) {
- int count = Math.max (1, parent.columnCount);
- if (0 > index || index > count - 1) return _getForeground ();
-- int /*long*/ [] ptr = new int /*long*/ [1];
-+ long /*int*/ [] ptr = new long /*int*/ [1];
- int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
- OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_FOREGROUND, ptr, -1);
- if (ptr [0] == 0) return _getForeground ();
-@@ -177,7 +177,7 @@
- Image _getImage (int index) {
- int count = Math.max (1, parent.getColumnCount ());
- if (0 > index || index > count - 1) return null;
-- int /*long*/ [] ptr = new int /*long*/ [1];
-+ long /*int*/ [] ptr = new long /*int*/ [1];
- int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
- OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_PIXBUF, ptr, -1);
- if (ptr [0] == 0) return null;
-@@ -190,7 +190,7 @@
- String _getText (int index) {
- int count = Math.max (1, parent.getColumnCount ());
- if (0 > index || index > count - 1) return "";
-- int /*long*/ [] ptr = new int /*long*/ [1];
-+ long /*int*/ [] ptr = new long /*int*/ [1];
- int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
- OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_TEXT, ptr, -1);
- if (ptr [0] == 0) return "";
-@@ -269,14 +269,14 @@
- // shifted a bit too far right on later versions of GTK - however, old Tree also had this problem
- checkWidget ();
- if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
-- int /*long*/ parentHandle = parent.handle;
-- int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, 0);
-+ long /*int*/ parentHandle = parent.handle;
-+ long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, 0);
- if (column == 0) return new Rectangle (0, 0, 0, 0);
-- int /*long*/ textRenderer = parent.getTextRenderer (column);
-- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);
-+ long /*int*/ textRenderer = parent.getTextRenderer (column);
-+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
- if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);
-
-- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
- OS.gtk_widget_realize (parentHandle);
-
- boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
-@@ -357,15 +357,15 @@
- public Rectangle getBounds (int index) {
- checkWidget();
- if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
-- int /*long*/ parentHandle = parent.handle;
-- int /*long*/ column = 0;
-+ long /*int*/ parentHandle = parent.handle;
-+ long /*int*/ column = 0;
- if (index >= 0 && index < parent.columnCount) {
- column = parent.columns [index].handle;
- } else {
- column = OS.gtk_tree_view_get_column (parentHandle, index);
- }
- if (column == 0) return new Rectangle (0, 0, 0, 0);
-- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
- OS.gtk_widget_realize (parentHandle);
- GdkRectangle rect = new GdkRectangle ();
- OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
-@@ -549,18 +549,18 @@
- public Rectangle getImageBounds (int index) {
- checkWidget ();
- if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
-- int /*long*/ parentHandle = parent.handle;
-- int /*long*/ column = 0;
-+ long /*int*/ parentHandle = parent.handle;
-+ long /*int*/ column = 0;
- if (index >= 0 && index < parent.columnCount) {
- column = parent.columns [index].handle;
- } else {
- column = OS.gtk_tree_view_get_column (parentHandle, index);
- }
- if (column == 0) return new Rectangle (0, 0, 0, 0);
-- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);
-+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
- if (pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);
- GdkRectangle rect = new GdkRectangle ();
-- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
- OS.gtk_widget_realize (parentHandle);
- OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
- OS.gtk_tree_path_free (path);
-@@ -675,19 +675,19 @@
- if (0 > index || index > count - 1) return new Rectangle (0, 0, 0, 0);
- // TODO fully test on early and later versions of GTK
- // shifted a bit too far right on later versions of GTK - however, old Tree also had this problem
-- int /*long*/ parentHandle = parent.handle;
-- int /*long*/ column = 0;
-+ long /*int*/ parentHandle = parent.handle;
-+ long /*int*/ column = 0;
- if (index >= 0 && index < parent.columnCount) {
- column = parent.columns [index].handle;
- } else {
- column = OS.gtk_tree_view_get_column (parentHandle, index);
- }
- if (column == 0) return new Rectangle (0, 0, 0, 0);
-- int /*long*/ textRenderer = parent.getTextRenderer (column);
-- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);
-+ long /*int*/ textRenderer = parent.getTextRenderer (column);
-+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
- if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);
-
-- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
- OS.gtk_widget_realize (parentHandle);
-
- boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
-@@ -735,12 +735,12 @@
-
- void redraw () {
- if ((OS.GTK_WIDGET_FLAGS (parent.handle) & OS.GTK_REALIZED) != 0) {
-- int /*long*/ parentHandle = parent.handle;
-- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-+ long /*int*/ parentHandle = parent.handle;
-+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
- GdkRectangle rect = new GdkRectangle ();
- OS.gtk_tree_view_get_cell_area (parentHandle, path, 0, rect);
- OS.gtk_tree_path_free (path);
-- int /*long*/ window = OS.gtk_tree_view_get_bin_window (parentHandle);
-+ long /*int*/ window = OS.gtk_tree_view_get_bin_window (parentHandle);
- rect.x = 0;
- int [] w = new int [1], h = new int [1];
- OS.gdk_drawable_get_size (window, w, h);
-@@ -845,16 +845,16 @@
- boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
- if (!customDraw) {
- if ((parent.style & SWT.VIRTUAL) == 0) {
-- int /*long*/ parentHandle = parent.handle;
-- int /*long*/ column = 0;
-+ long /*int*/ parentHandle = parent.handle;
-+ long /*int*/ column = 0;
- if (parent.columnCount > 0) {
- column = parent.columns [index].handle;
- } else {
- column = OS.gtk_tree_view_get_column (parentHandle, index);
- }
- if (column == 0) return;
-- int /*long*/ textRenderer = parent.getTextRenderer (column);
-- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);
-+ long /*int*/ textRenderer = parent.getTextRenderer (column);
-+ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
- OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
- OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
- }
-@@ -918,7 +918,7 @@
- if (oldFont == font) return;
- this.font = font;
- if (oldFont != null && oldFont.equals (font)) return;
-- int /*long*/ fontHandle = font != null ? font.handle : 0;
-+ long /*int*/ fontHandle = font != null ? font.handle : 0;
- OS.gtk_list_store_set (parent.modelHandle, handle, Table.FONT_COLUMN, fontHandle, -1);
- /*
- * Bug in GTK. When using fixed-height-mode,
-@@ -969,7 +969,7 @@
- if (oldFont != null && oldFont.equals (font)) return;
-
- int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
-- int /*long*/ fontHandle = font != null ? font.handle : 0;
-+ long /*int*/ fontHandle = font != null ? font.handle : 0;
- OS.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_FONT, fontHandle, -1);
- /*
- * Bug in GTK. When using fixed-height-mode,
-@@ -987,16 +987,16 @@
- boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
- if (!customDraw) {
- if ((parent.style & SWT.VIRTUAL) == 0) {
-- int /*long*/ parentHandle = parent.handle;
-- int /*long*/ column = 0;
-+ long /*int*/ parentHandle = parent.handle;
-+ long /*int*/ column = 0;
- if (parent.columnCount > 0) {
- column = parent.columns [index].handle;
- } else {
- column = OS.gtk_tree_view_get_column (parentHandle, index);
- }
- if (column == 0) return;
-- int /*long*/ textRenderer = parent.getTextRenderer (column);
-- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);
-+ long /*int*/ textRenderer = parent.getTextRenderer (column);
-+ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
- OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
- OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
- }
-@@ -1092,16 +1092,16 @@
- boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
- if (!customDraw) {
- if ((parent.style & SWT.VIRTUAL) == 0) {
-- int /*long*/ parentHandle = parent.handle;
-- int /*long*/ column = 0;
-+ long /*int*/ parentHandle = parent.handle;
-+ long /*int*/ column = 0;
- if (parent.columnCount > 0) {
- column = parent.columns [index].handle;
- } else {
- column = OS.gtk_tree_view_get_column (parentHandle, index);
- }
- if (column == 0) return;
-- int /*long*/ textRenderer = parent.getTextRenderer (column);
-- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);
-+ long /*int*/ textRenderer = parent.getTextRenderer (column);
-+ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
- OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
- OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
- }
-@@ -1134,7 +1134,7 @@
- * GTK+'s "inconsistent" state does not match SWT's concept of grayed.
- * Render checked+grayed as "inconsistent", unchecked+grayed as blank.
- */
-- int /*long*/ [] ptr = new int /*long*/ [1];
-+ long /*int*/ [] ptr = new long /*int*/ [1];
- OS.gtk_tree_model_get (parent.modelHandle, handle, Table.CHECKED_COLUMN, ptr, -1);
- OS.gtk_list_store_set (parent.modelHandle, handle, Table.GRAYED_COLUMN, ptr [0] == 0 ? false : grayed, -1);
- cached = true;
-@@ -1164,7 +1164,7 @@
- }
- int count = Math.max (1, parent.getColumnCount ());
- if (0 > index || index > count - 1) return;
-- int /*long*/ pixbuf = 0;
-+ long /*int*/ pixbuf = 0;
- if (image != null) {
- ImageList imageList = parent.imageList;
- if (imageList == null) imageList = parent.imageList = new ImageList ();
-@@ -1192,10 +1192,10 @@
- if ((parent.style & SWT.VIRTUAL) != 0 && parent.currentItem == null) {
- if (OS.GTK_VERSION >= OS.VERSION (2, 3, 2)) {
- if (image != null) {
-- int /*long*/parentHandle = parent.handle;
-- int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, index);
-+ long /*int*/parentHandle = parent.handle;
-+ long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, index);
- int [] w = new int [1];
-- int /*long*/ pixbufRenderer = parent.getPixbufRenderer(column);
-+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer(column);
- OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w);
- if (w[0] < image.getBounds().width) {
- /*
-@@ -1203,7 +1203,7 @@
- * are relying on the fact that it is done as part of modifying
- * the style.
- */
-- int /*long*/ style = OS.gtk_widget_get_modifier_style (parentHandle);
-+ long /*int*/ style = OS.gtk_widget_get_modifier_style (parentHandle);
- parent.modifyStyle (parentHandle, style);
- }
- }
-diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/Table.java
---- x86/org/eclipse/swt/widgets/Table.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Table.java 2009-09-17 08:48:24.000000000 -0400
-@@ -68,9 +68,9 @@
+diff --git a/org/eclipse/swt/widgets/Table.java b/org/eclipse/swt/widgets/Table.java
+index 451650d..8cad767 100644
+--- a/org/eclipse/swt/widgets/Table.java
++++ b/org/eclipse/swt/widgets/Table.java
+@@ -68,9 +68,9 @@ import org.eclipse.swt.events.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class Table extends Composite {
@@ -40988,7 +40888,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
TableItem [] items;
TableColumn [] columns;
TableItem currentItem;
-@@ -170,9 +170,9 @@
+@@ -170,9 +170,9 @@ static int checkStyle (int style) {
return checkBits (style, SWT.SINGLE, SWT.MULTI, 0, 0, 0, 0);
}
@@ -41000,7 +40900,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
int [] index = new int [1];
OS.memmove (index, OS.gtk_tree_path_get_indices (path), 4);
TableItem item = _getItem (index[0]);
-@@ -223,7 +223,7 @@
+@@ -223,7 +223,7 @@ int /*long*/ cellDataProc (int /*long*/ tree_column, int /*long*/ cell, int /*lo
setData = checkData (item);
}
}
@@ -41009,7 +40909,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (setData) {
ptr [0] = 0;
if (isPixbuf) {
-@@ -332,7 +332,7 @@
+@@ -332,7 +332,7 @@ public void addSelectionListener (SelectionListener listener) {
addListener (SWT.DefaultSelection, typedListener);
}
@@ -41018,7 +40918,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
/*
* Bug in GTK. The width calculated by gtk_tree_view_column_cell_get_size()
-@@ -348,11 +348,11 @@
+@@ -348,11 +348,11 @@ int calculateWidth (int /*long*/ column, int /*long*/ iter) {
int [] w = new int [1];
OS.gtk_widget_style_get(handle, OS.focus_line_width, w, 0);
width += 2 * w [0];
@@ -41033,7 +40933,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (renderer != 0) {
OS.gtk_cell_renderer_get_size (renderer, handle, null, null, null, w, null);
width += w [0];
-@@ -524,18 +524,18 @@
+@@ -524,18 +524,18 @@ void createColumn (TableColumn column, int index) {
modelIndex++;
}
if (modelIndex == modelLength) {
@@ -41058,7 +40958,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
for (int j=0; j<modelLength; j++) {
OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);
OS.gtk_list_store_set (newModel, newItem, j, ptr [0], -1);
-@@ -553,7 +553,7 @@
+@@ -553,7 +553,7 @@ void createColumn (TableColumn column, int index) {
modelHandle = newModel;
}
}
@@ -41067,7 +40967,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (columnHandle == 0) error (SWT.ERROR_NO_HANDLES);
if (index == 0 && columnCount > 0) {
TableColumn checkColumn = columns [0];
-@@ -610,7 +610,7 @@
+@@ -610,7 +610,7 @@ void createHandle (int index) {
OS.gtk_fixed_set_has_window (fixedHandle, true);
scrolledHandle = OS.gtk_scrolled_window_new (0, 0);
if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES);
@@ -41076,7 +40976,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
modelHandle = OS.gtk_list_store_newv (types.length, types);
if (modelHandle == 0) error (SWT.ERROR_NO_HANDLES);
handle = OS.gtk_tree_view_new_with_model (modelHandle);
-@@ -625,7 +625,7 @@
+@@ -625,7 +625,7 @@ void createHandle (int index) {
OS.gtk_container_add (scrolledHandle, handle);
int mode = (style & SWT.MULTI) != 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE;
@@ -41085,7 +40985,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
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;
-@@ -669,11 +669,11 @@
+@@ -669,11 +669,11 @@ void createItem (TableColumn column, int index) {
} else {
createColumn (column, index);
}
@@ -41100,7 +41000,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_container_add (boxHandle, imageHandle);
OS.gtk_container_add (boxHandle, labelHandle);
-@@ -682,7 +682,7 @@
+@@ -682,7 +682,7 @@ void createItem (TableColumn column, int index) {
column.labelHandle = labelHandle;
column.imageHandle = imageHandle;
OS.gtk_tree_view_column_set_widget (column.handle, boxHandle);
@@ -41109,7 +41009,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
while (widget != handle) {
if (OS.GTK_IS_BUTTON (widget)) {
column.buttonHandle = widget;
-@@ -748,7 +748,7 @@
+@@ -748,7 +748,7 @@ void createItem (TableItem item, int index) {
items [index] = item;
}
@@ -41118,7 +41018,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_view_column_clear (columnHandle);
if ((style & SWT.CHECK) != 0 && check) {
OS.gtk_tree_view_column_pack_start (columnHandle, checkRenderer, false);
-@@ -771,9 +771,9 @@
+@@ -771,9 +771,9 @@ void createRenderers (int /*long*/ columnHandle, int modelIndex, boolean check,
OS.g_object_set_qdata (checkRenderer, Display.SWT_OBJECT_INDEX1, columnHandle);
}
}
@@ -41130,7 +41030,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES);
if (ownerDraw) {
-@@ -877,7 +877,7 @@
+@@ -877,7 +877,7 @@ public void deselect (int index) {
checkWidget();
if (index < 0 || index >= itemCount) return;
boolean fixColumn = showFirstColumn ();
@@ -41139,7 +41039,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_unselect_iter (selection, _getItem (index).handle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -902,7 +902,7 @@
+@@ -902,7 +902,7 @@ public void deselect (int index) {
public void deselect (int start, int end) {
checkWidget();
boolean fixColumn = showFirstColumn ();
@@ -41148,7 +41048,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int index=start; index<=end; index++) {
if (index < 0 || index >= itemCount) continue;
-@@ -933,7 +933,7 @@
+@@ -933,7 +933,7 @@ public void deselect (int [] indices) {
checkWidget();
if (indices == null) error (SWT.ERROR_NULL_ARGUMENT);
boolean fixColumn = showFirstColumn ();
@@ -41157,7 +41057,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
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];
-@@ -955,7 +955,7 @@
+@@ -955,7 +955,7 @@ public void deselect (int [] indices) {
public void deselectAll () {
checkWidget();
boolean fixColumn = showFirstColumn ();
@@ -41166,7 +41066,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
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);
-@@ -969,7 +969,7 @@
+@@ -969,7 +969,7 @@ void destroyItem (TableColumn column) {
index++;
}
if (index == columnCount) return;
@@ -41175,7 +41075,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (columnCount == 1) {
firstCustomDraw = column.customDraw;
}
-@@ -977,18 +977,18 @@
+@@ -977,18 +977,18 @@ void destroyItem (TableColumn column) {
columns [columnCount] = null;
OS.gtk_tree_view_remove_column (handle, columnHandle);
if (columnCount == 0) {
@@ -41200,7 +41100,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
for (int j=0; j<FIRST_COLUMN; j++) {
OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);
OS.gtk_list_store_set (newModel, newItem, j, ptr [0], -1);
-@@ -1019,7 +1019,7 @@
+@@ -1019,7 +1019,7 @@ void destroyItem (TableColumn column) {
for (int i=0; i<itemCount; i++) {
TableItem item = items [i];
if (item != null) {
@@ -41209,7 +41109,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
int modelIndex = column.modelIndex;
OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_PIXBUF, 0, -1);
OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_TEXT, 0, -1);
-@@ -1076,7 +1076,7 @@
+@@ -1076,7 +1076,7 @@ void destroyItem (TableItem item) {
index++;
}
if (index == itemCount) return;
@@ -41218,7 +41118,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_list_store_remove (modelHandle, item.handle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -1088,10 +1088,10 @@
+@@ -1088,10 +1088,10 @@ void destroyItem (TableItem item) {
boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
boolean selected = false;
if (filter) {
@@ -41231,7 +41131,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) selected = true;
OS.gtk_tree_path_free (path [0]);
}
-@@ -1104,7 +1104,7 @@
+@@ -1104,7 +1104,7 @@ boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
return dragDetect;
}
@@ -41240,7 +41140,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
return paintWindow ();
}
-@@ -1142,13 +1142,13 @@
+@@ -1142,13 +1142,13 @@ public Rectangle getClientArea () {
checkWidget ();
forceResize ();
OS.gtk_widget_realize (handle);
@@ -41257,7 +41157,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle);
int height = (state & ZERO_HEIGHT) != 0 ? 0 : OS.GTK_WIDGET_HEIGHT (clientHandle);
return new Rectangle (fixedX [0] - binX [0], fixedY [0] - binY [0], width, height);
-@@ -1213,8 +1213,8 @@
+@@ -1213,8 +1213,8 @@ public int getColumnCount () {
return columnCount;
}
@@ -41268,7 +41168,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
// per row data
types [CHECKED_COLUMN] = OS.G_TYPE_BOOLEAN ();
types [GRAYED_COLUMN] = OS.G_TYPE_BOOLEAN ();
-@@ -1263,13 +1263,13 @@
+@@ -1263,13 +1263,13 @@ int /*long*/[] getColumnTypes (int columnCount) {
public int [] getColumnOrder () {
checkWidget ();
if (columnCount == 0) return new int [0];
@@ -41285,7 +41185,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (column != 0) {
for (int j=0; j<columnCount; j++) {
if (columns [j].handle == column) {
-@@ -1319,11 +1319,11 @@
+@@ -1319,11 +1319,11 @@ public TableColumn [] getColumns () {
}
TableItem getFocusItem () {
@@ -41299,7 +41199,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (indices != 0) {
int [] index = new int []{-1};
OS.memmove (index, indices, 4);
-@@ -1371,7 +1371,7 @@
+@@ -1371,7 +1371,7 @@ public int getHeaderHeight () {
GtkRequisition requisition = new GtkRequisition ();
int height = 0;
for (int i=0; i<columnCount; i++) {
@@ -41308,7 +41208,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (buttonHandle != 0) {
OS.gtk_widget_size_request (buttonHandle, requisition);
height = Math.max (height, requisition.height);
-@@ -1380,8 +1380,8 @@
+@@ -1380,8 +1380,8 @@ public int getHeaderHeight () {
return height;
}
OS.gtk_widget_realize (handle);
@@ -41319,7 +41219,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
int [] binY = new int [1];
OS.gdk_window_get_origin (binWindow, null, binY);
int [] fixedY = new int [1];
-@@ -1458,11 +1458,11 @@
+@@ -1458,11 +1458,11 @@ public TableItem getItem (int index) {
public TableItem getItem (Point point) {
checkWidget();
if (point == null) error (SWT.ERROR_NULL_ARGUMENT);
@@ -41333,7 +41233,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
TableItem item = null;
if (indices != 0) {
int [] index = new int [1];
-@@ -1502,7 +1502,7 @@
+@@ -1502,7 +1502,7 @@ public int getItemCount () {
public int getItemHeight () {
checkWidget();
if (itemCount == 0) {
@@ -41342,7 +41242,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
int [] w = new int [1], h = new int [1];
ignoreSize = true;
OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
-@@ -1510,11 +1510,11 @@
+@@ -1510,11 +1510,11 @@ public int getItemHeight () {
return h [0];
} else {
int height = 0;
@@ -41356,7 +41256,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
int [] w = new int [1], h = new int [1];
OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
-@@ -1577,14 +1577,14 @@
+@@ -1577,14 +1577,14 @@ public boolean getLinesVisible() {
return OS.gtk_tree_view_get_rules_hint (handle);
}
@@ -41375,7 +41275,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (OS.GTK_IS_CELL_RENDERER_PIXBUF (renderer)) {
pixbufRenderer = renderer;
break;
-@@ -1613,7 +1613,7 @@
+@@ -1613,7 +1613,7 @@ int /*long*/ getPixbufRenderer (int /*long*/ column) {
*/
public TableItem [] getSelection () {
checkWidget();
@@ -41384,7 +41284,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
display.treeSelectionLength = 0;
display.treeSelection = new int [itemCount];
-@@ -1627,15 +1627,15 @@
+@@ -1627,15 +1627,15 @@ public TableItem [] getSelection () {
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
*/
@@ -41404,7 +41304,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (indices != 0) {
int [] index = new int [1];
OS.memmove (index, indices, 4);
-@@ -1663,7 +1663,7 @@
+@@ -1663,7 +1663,7 @@ public TableItem [] getSelection () {
*/
public int getSelectionCount () {
checkWidget();
@@ -41413,7 +41313,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
display.treeSelectionLength = 0;
display.treeSelection = null;
-@@ -1689,25 +1689,25 @@
+@@ -1689,25 +1689,25 @@ public int getSelectionIndex () {
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
display.treeSelectionLength = 0;
display.treeSelection = new int [itemCount];
@@ -41445,7 +41345,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (indices != 0) {
OS.memmove (index, indices, 4);
break;
-@@ -1737,7 +1737,7 @@
+@@ -1737,7 +1737,7 @@ public int getSelectionIndex () {
*/
public int [] getSelectionIndices () {
checkWidget();
@@ -41454,7 +41354,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
display.treeSelectionLength = 0;
display.treeSelection = new int [itemCount];
-@@ -1752,15 +1752,15 @@
+@@ -1752,15 +1752,15 @@ public int [] getSelectionIndices () {
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
*/
@@ -41474,7 +41374,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (indices != 0) {
int [] index = new int [1];
OS.memmove (index, indices, 4);
-@@ -1818,14 +1818,14 @@
+@@ -1818,14 +1818,14 @@ public int getSortDirection () {
return sortDirection;
}
@@ -41493,7 +41393,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (OS.GTK_IS_CELL_RENDERER_TEXT (renderer)) {
textRenderer = renderer;
break;
-@@ -1850,22 +1850,22 @@
+@@ -1850,22 +1850,22 @@ int /*long*/ getTextRenderer (int /*long*/ column) {
*/
public int getTopIndex () {
checkWidget();
@@ -41520,7 +41420,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (result != 0) return result;
/*
* Feature in GTK. In a multi-select table view, when multiple items are already
-@@ -1877,10 +1877,10 @@
+@@ -1877,10 +1877,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
*/
int button = gdkEvent.button;
if (button == 3 && gdkEvent.type == OS.GDK_BUTTON_PRESS) {
@@ -41533,7 +41433,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;
OS.gtk_tree_path_free (path [0]);
}
-@@ -1895,10 +1895,10 @@
+@@ -1895,10 +1895,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
* widget from automatically selecting the first item.
*/
if ((style & SWT.SINGLE) != 0 && getSelectionCount () == 0) {
@@ -41546,7 +41446,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
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);
-@@ -1918,13 +1918,13 @@
+@@ -1918,13 +1918,13 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
@@ -41563,7 +41463,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
TableItem item = getFocusItem ();
if (item != null) {
Event event = new Event ();
-@@ -1934,8 +1934,8 @@
+@@ -1934,8 +1934,8 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
return 0;
}
@@ -41574,7 +41474,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (result != 0) return result;
if (OS.GTK_VERSION < OS.VERSION (2, 2 ,0)) {
/*
-@@ -1959,8 +1959,8 @@
+@@ -1959,8 +1959,8 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
return result;
}
@@ -41585,7 +41485,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
/*
* Bug in GTK. The context menu for the typeahead in GtkTreeViewer
* opens in the bottom right corner of the screen when Shift+F10
-@@ -1973,15 +1973,15 @@
+@@ -1973,15 +1973,15 @@ int /*long*/ gtk_popup_menu (int /*long*/ widget) {
return OS.GTK_VERSION < OS.VERSION (2, 6, 5) ? 1 : result;
}
@@ -41605,7 +41505,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (indices != 0) {
int [] index = new int []{-1};
OS.memmove (index, indices, 4);
-@@ -2007,10 +2007,10 @@
+@@ -2007,10 +2007,10 @@ int gtk_row_inserted (int model, int path, int iter) {
return 0;
}
@@ -41619,7 +41519,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (indices != 0) {
int [] index = new int [1];
OS.memmove (index, indices, 4);
-@@ -2025,7 +2025,7 @@
+@@ -2025,7 +2025,7 @@ int /*long*/ gtk_toggled (int /*long*/ renderer, int /*long*/ pathStr) {
return 0;
}
@@ -41628,7 +41528,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
/*
* Bug in GTK. For some reason, gtk_widget_size_request() fails
* to include the height of the tree view items when there are
-@@ -2036,17 +2036,17 @@
+@@ -2036,17 +2036,17 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {
super.gtk_widget_size_request (widget, requisition);
return;
}
@@ -41649,7 +41549,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (fixVisible) {
columnHandle = OS.g_list_data (columns);
OS.gtk_tree_view_column_set_visible (columnHandle, true);
-@@ -2059,13 +2059,13 @@
+@@ -2059,13 +2059,13 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {
}
void hideFirstColumn () {
@@ -41665,7 +41565,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.g_signal_connect_closure (selection, OS.changed, display.closures [CHANGED], false);
OS.g_signal_connect_closure (handle, OS.row_activated, display.closures [ROW_ACTIVATED], false);
if (checkRenderer != 0) {
-@@ -2155,9 +2155,9 @@
+@@ -2155,9 +2155,9 @@ public int indexOf (TableItem item) {
*/
public boolean isSelected (int index) {
checkWidget();
@@ -41677,7 +41577,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
boolean answer = OS.gtk_tree_selection_path_is_selected (selection, path);
OS.gtk_tree_path_free (path);
return answer;
-@@ -2165,7 +2165,7 @@
+@@ -2165,7 +2165,7 @@ public boolean isSelected (int index) {
boolean mnemonicHit (char key) {
for (int i=0; i<columnCount; i++) {
@@ -41686,7 +41586,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;
}
return false;
-@@ -2173,13 +2173,13 @@
+@@ -2173,13 +2173,13 @@ boolean mnemonicHit (char key) {
boolean mnemonicMatch (char key) {
for (int i=0; i<columnCount; i++) {
@@ -41702,7 +41602,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_widget_realize (handle);
return OS.gtk_tree_view_get_bin_window (handle);
}
-@@ -2269,7 +2269,7 @@
+@@ -2269,7 +2269,7 @@ void releaseWidget () {
public void remove (int index) {
checkWidget();
if (!(0 <= index && index < itemCount)) error (SWT.ERROR_ITEM_NOT_REMOVED);
@@ -41711,7 +41611,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
TableItem item = items [index];
boolean disposed = false;
if (item != null) {
-@@ -2282,7 +2282,7 @@
+@@ -2282,7 +2282,7 @@ public void remove (int index) {
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
}
if (!disposed) {
@@ -41720,7 +41620,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
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);
-@@ -2314,8 +2314,8 @@
+@@ -2314,8 +2314,8 @@ public void remove (int start, int end) {
if (!(0 <= start && start <= end && end < itemCount)) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -41731,7 +41631,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (iter == 0) error (SWT.ERROR_NO_HANDLES);
if (fixAccessibility ()) {
ignoreAccessibility = true;
-@@ -2367,9 +2367,9 @@
+@@ -2367,9 +2367,9 @@ public void remove (int [] indices) {
if (!(0 <= start && start <= end && end < itemCount)) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -41743,7 +41643,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (iter == 0) error (SWT.ERROR_NO_HANDLES);
if (fixAccessibility ()) {
ignoreAccessibility = true;
-@@ -2423,7 +2423,7 @@
+@@ -2423,7 +2423,7 @@ public void removeAll () {
}
items = new TableItem [4];
itemCount = 0;
@@ -41752,7 +41652,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
if (fixAccessibility ()) {
ignoreAccessibility = true;
-@@ -2485,16 +2485,16 @@
+@@ -2485,16 +2485,16 @@ public void removeSelectionListener(SelectionListener listener) {
eventTable.unhook (SWT.DefaultSelection,listener);
}
@@ -41774,7 +41674,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
int [] buffer = new int [1];
OS.memmove (buffer, OS.gtk_tree_path_get_indices (path), 4);
int index = buffer [0];
-@@ -2504,7 +2504,7 @@
+@@ -2504,7 +2504,7 @@ int /*long*/ rendererGetSizeProc (int /*long*/ cell, int /*long*/ widget, int /*
if (item != null) {
int columnIndex = 0;
if (columnCount > 0) {
@@ -41783,7 +41683,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
for (int i = 0; i < columnCount; i++) {
if (columns [i].handle == columnHandle) {
columnIndex = i;
-@@ -2543,18 +2543,18 @@
+@@ -2543,18 +2543,18 @@ int /*long*/ rendererGetSizeProc (int /*long*/ cell, int /*long*/ widget, int /*
return result;
}
@@ -41806,7 +41706,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
int columnIndex = 0;
if (columnCount > 0) {
for (int i = 0; i < columnCount; i++) {
-@@ -2568,7 +2568,7 @@
+@@ -2568,7 +2568,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if (OS.GTK_IS_CELL_RENDERER_TOGGLE (cell) || (OS.GTK_IS_CELL_RENDERER_PIXBUF (cell) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) {
drawFlags = (int)/*64*/flags;
drawState = SWT.FOREGROUND;
@@ -41815,7 +41715,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_model_get (modelHandle, item.handle, Table.BACKGROUND_COLUMN, ptr, -1);
if (ptr [0] == 0) {
int modelIndex = columnCount == 0 ? Table.FIRST_COLUMN : columns [columnIndex].modelIndex;
-@@ -2579,7 +2579,7 @@
+@@ -2579,7 +2579,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if ((flags & OS.GTK_CELL_RENDERER_FOCUSED) != 0) drawState |= SWT.FOCUSED;
GdkRectangle rect = new GdkRectangle ();
@@ -41824,7 +41724,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);
OS.gtk_tree_path_free (path);
-@@ -2623,7 +2623,7 @@
+@@ -2623,7 +2623,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if ((drawState & SWT.SELECTED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_SELECTED;
if ((drawState & SWT.FOCUSED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_FOCUSED;
if ((drawState & SWT.SELECTED) != 0) {
@@ -41833,7 +41733,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
//TODO - parity and sorted
byte[] detail = Converter.wcsToMbcs (null, "cell_odd", true);
OS.gtk_paint_flat_box (style, window, OS.GTK_STATE_SELECTED, OS.GTK_SHADOW_NONE, rect, widget, detail, rect.x, rect.y, rect.width, rect.height);
-@@ -2634,7 +2634,7 @@
+@@ -2634,7 +2634,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
}
}
}
@@ -41842,7 +41742,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if ((drawState & SWT.BACKGROUND) != 0 && (drawState & SWT.SELECTED) == 0) {
GC gc = new GC (this);
gc.setBackground (item.getBackground (columnIndex));
-@@ -2644,7 +2644,7 @@
+@@ -2644,7 +2644,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
gc.dispose ();
}
if ((drawState & SWT.FOREGROUND) != 0 || OS.GTK_IS_CELL_RENDERER_TOGGLE (cell)) {
@@ -41851,7 +41751,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
GtkCellRendererClass klass = new GtkCellRendererClass ();
OS.memmove (klass, g_class);
if (drawForeground != null && OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
-@@ -2656,7 +2656,7 @@
+@@ -2656,7 +2656,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if (OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
if (hooks (SWT.PaintItem)) {
GdkRectangle rect = new GdkRectangle ();
@@ -41860,7 +41760,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);
OS.gtk_tree_path_free (path);
ignoreSize = true;
-@@ -2707,8 +2707,8 @@
+@@ -2707,8 +2707,8 @@ void resetCustomDraw () {
for (int i=0; i<end; i++) {
boolean customDraw = columnCount != 0 ? columns [i].customDraw : firstCustomDraw;
if (customDraw) {
@@ -41871,7 +41771,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, 0, 0, 0);
if (columnCount != 0) columns [i].customDraw = false;
}
-@@ -2732,12 +2732,12 @@
+@@ -2732,12 +2732,12 @@ public void select (int index) {
checkWidget();
if (!(0 <= index && index < itemCount)) return;
boolean fixColumn = showFirstColumn ();
@@ -41886,7 +41786,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
OS.gtk_tree_path_free (path);
}
-@@ -2775,13 +2775,13 @@
+@@ -2775,13 +2775,13 @@ public void select (int start, int end) {
start = Math.max (0, start);
end = Math.min (end, itemCount - 1);
boolean fixColumn = showFirstColumn ();
@@ -41902,7 +41802,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
OS.gtk_tree_path_free (path);
}
-@@ -2819,7 +2819,7 @@
+@@ -2819,7 +2819,7 @@ public void select (int [] indices) {
int length = indices.length;
if (length == 0 || ((style & SWT.SINGLE) != 0 && length > 1)) return;
boolean fixColumn = showFirstColumn ();
@@ -41911,7 +41811,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int i=0; i<length; i++) {
int index = indices [i];
-@@ -2827,7 +2827,7 @@
+@@ -2827,7 +2827,7 @@ public void select (int [] indices) {
TableItem item = _getItem (index);
OS.gtk_tree_selection_select_iter (selection, item.handle);
if ((style & SWT.SINGLE) != 0) {
@@ -41920,7 +41820,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
OS.gtk_tree_path_free (path);
}
-@@ -2851,7 +2851,7 @@
+@@ -2851,7 +2851,7 @@ public void selectAll () {
checkWidget();
if ((style & SWT.SINGLE) != 0) return;
boolean fixColumn = showFirstColumn ();
@@ -41929,7 +41829,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
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);
-@@ -2866,8 +2866,8 @@
+@@ -2866,8 +2866,8 @@ void selectFocusIndex (int index) {
*/
if (!(0 <= index && index < itemCount)) return;
TableItem item = _getItem (index);
@@ -41940,7 +41840,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
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, false);
/*
-@@ -2889,9 +2889,9 @@
+@@ -2889,9 +2889,9 @@ void setBackgroundColor (GdkColor color) {
OS.gtk_widget_modify_base (handle, 0, color);
}
@@ -41952,7 +41852,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (window != 0) OS.gdk_window_set_back_pixmap (window, 0, true);
}
-@@ -2955,13 +2955,13 @@
+@@ -2955,13 +2955,13 @@ public void setColumnOrder (int [] order) {
seen [index] = true;
}
for (int i=0; i<order.length; i++) {
@@ -41969,7 +41869,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
super.setFontDescription (font);
TableColumn[] columns = getColumns ();
for (int i = 0; i < columns.length; i++) {
-@@ -3016,7 +3016,7 @@
+@@ -3016,7 +3016,7 @@ public void setItemCount (int count) {
System.arraycopy (items, 0, newItems, 0, itemCount);
items = newItems;
if (isVirtual) {
@@ -41978,7 +41878,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (iter == 0) error (SWT.ERROR_NO_HANDLES);
if (fixAccessibility ()) {
ignoreAccessibility = true;
-@@ -3065,12 +3065,12 @@
+@@ -3065,12 +3065,12 @@ public void setLinesVisible (boolean show) {
void setParentBackground () {
super.setParentBackground ();
@@ -41994,7 +41894,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_widget_set_parent_window (widget, window);
}
-@@ -3088,7 +3088,7 @@
+@@ -3088,7 +3088,7 @@ public void setRedraw (boolean redraw) {
}
}
@@ -42003,7 +41903,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (columnCount != 0 || currentItem == item) return;
/*
* Use GTK_TREE_VIEW_COLUMN_GROW_ONLY on GTK versions < 2.3.2
-@@ -3345,7 +3345,7 @@
+@@ -3345,7 +3345,7 @@ public void setSelection (TableItem [] items) {
public void setTopIndex (int index) {
checkWidget();
if (!(0 <= index && index < itemCount)) return;
@@ -42012,7 +41912,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0f, 0f);
if (OS.GTK_VERSION < OS.VERSION (2, 8, 0)) {
/*
-@@ -3419,10 +3419,10 @@
+@@ -3419,10 +3419,10 @@ boolean showFirstColumn () {
*/
int columnCount = Math.max (1, this.columnCount);
for (int i=0; i<columnCount; i++) {
@@ -42025,7 +41925,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
OS.gtk_tree_view_column_set_visible (firstColumn, true);
return true;
}
-@@ -3453,8 +3453,8 @@
+@@ -3453,8 +3453,8 @@ public void showItem (TableItem item) {
showItem (item.handle);
}
@@ -42036,7 +41936,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
/*
* This code intentionally commented.
* Bug in GTK. According to the documentation, gtk_tree_view_scroll_to_cell
-@@ -3507,9 +3507,9 @@
+@@ -3507,9 +3507,9 @@ public void showSelection () {
showItem (item.handle);
}
@@ -42048,7 +41948,7 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (indices != 0) {
int [] index = new int [1];
OS.memmove (index, indices, 4);
-@@ -3528,12 +3528,12 @@
+@@ -3528,12 +3528,12 @@ void updateScrollBarValue (ScrollBar bar) {
* The fix is to queue a resize event for each child to
* force the position to be corrected.
*/
@@ -42065,10 +41965,382 @@ diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/
if (widget != 0) OS.gtk_widget_queue_resize (widget);
temp = OS.g_list_next (temp);
}
-diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Text.java
---- x86/org/eclipse/swt/widgets/Text.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Text.java 2009-09-17 08:48:24.000000000 -0400
-@@ -56,9 +56,9 @@
+diff --git a/org/eclipse/swt/widgets/TableColumn.java b/org/eclipse/swt/widgets/TableColumn.java
+index 4a62dfe..b75688f 100644
+--- a/org/eclipse/swt/widgets/TableColumn.java
++++ b/org/eclipse/swt/widgets/TableColumn.java
+@@ -36,7 +36,7 @@ import org.eclipse.swt.events.*;
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+ public class TableColumn extends Item {
+- int /*long*/ labelHandle, imageHandle, buttonHandle;
++ long /*int*/ labelHandle, imageHandle, buttonHandle;
+ Table parent;
+ int modelIndex, lastButton, lastTime, lastX, lastWidth;
+ boolean customDraw, useFixedWidth;
+@@ -324,7 +324,7 @@ public int getWidth () {
+ return OS.gtk_tree_view_column_get_width (handle);
+ }
+
+-int /*long*/ gtk_clicked (int /*long*/ widget) {
++long /*int*/ gtk_clicked (long /*int*/ widget) {
+ /*
+ * There is no API to get a double click on a table column. Normally, when
+ * the mouse is double clicked, this is indicated by GDK_2BUTTON_PRESS
+@@ -334,7 +334,7 @@ int /*long*/ gtk_clicked (int /*long*/ widget) {
+ */
+ boolean doubleClick = false;
+ boolean postEvent = true;
+- int /*long*/ eventPtr = OS.gtk_get_current_event ();
++ long /*int*/ eventPtr = OS.gtk_get_current_event ();
+ if (eventPtr != 0) {
+ GdkEventButton gdkEvent = new GdkEventButton ();
+ OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
+@@ -366,7 +366,7 @@ int /*long*/ gtk_clicked (int /*long*/ widget) {
+ return 0;
+ }
+
+-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
++long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
+ GdkEvent event = new GdkEvent ();
+ OS.memmove (event, gdkEvent, GdkEvent.sizeof);
+ switch (event.type) {
+@@ -382,11 +382,11 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
+ return 0;
+ }
+
+-int /*long*/ gtk_mnemonic_activate (int /*long*/ widget, int /*long*/ arg1) {
++long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) {
+ return parent.gtk_mnemonic_activate (widget, arg1);
+ }
+
+-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
++long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {
+ useFixedWidth = false;
+ int x = OS.GTK_WIDGET_X (widget);
+ int width = OS.GTK_WIDGET_WIDTH (widget);
+@@ -438,7 +438,7 @@ public void pack () {
+ }
+ }
+ } else {
+- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
++ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ if (OS.gtk_tree_model_get_iter_first (parent.modelHandle, iter)) {
+ do {
+ width = Math.max (width, parent.calculateWidth (handle, iter));
+@@ -545,7 +545,7 @@ public void setAlignment (int alignment) {
+ parent.createRenderers (handle, modelIndex, index == 0, style);
+ }
+
+-void setFontDescription (int /*long*/ font) {
++void setFontDescription (long /*int*/ font) {
+ OS.gtk_widget_modify_font (labelHandle, font);
+ OS.gtk_widget_modify_font (imageHandle, font);
+ }
+@@ -560,7 +560,7 @@ public void setImage (Image image) {
+ }
+ int imageIndex = headerImageList.indexOf (image);
+ if (imageIndex == -1) imageIndex = headerImageList.add (image);
+- int /*long*/ pixbuf = headerImageList.getPixbuf (imageIndex);
++ long /*int*/ pixbuf = headerImageList.getPixbuf (imageIndex);
+ OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
+ OS.gtk_widget_show (imageHandle);
+ } else {
+diff --git a/org/eclipse/swt/widgets/TableItem.java b/org/eclipse/swt/widgets/TableItem.java
+index f348437..358d0be 100644
+--- a/org/eclipse/swt/widgets/TableItem.java
++++ b/org/eclipse/swt/widgets/TableItem.java
+@@ -127,7 +127,7 @@ static Table checkNull (Table control) {
+ }
+
+ Color _getBackground () {
+- int /*long*/ [] ptr = new int /*long*/ [1];
++ long /*int*/ [] ptr = new long /*int*/ [1];
+ OS.gtk_tree_model_get (parent.modelHandle, handle, Table.BACKGROUND_COLUMN, ptr, -1);
+ if (ptr [0] == 0) return parent.getBackground ();
+ GdkColor gdkColor = new GdkColor ();
+@@ -138,7 +138,7 @@ Color _getBackground () {
+ Color _getBackground (int index) {
+ int count = Math.max (1, parent.columnCount);
+ if (0 > index || index > count - 1) return _getBackground ();
+- int /*long*/ [] ptr = new int /*long*/ [1];
++ long /*int*/ [] ptr = new long /*int*/ [1];
+ int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
+ OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_BACKGROUND, ptr, -1);
+ if (ptr [0] == 0) return _getBackground ();
+@@ -148,13 +148,13 @@ Color _getBackground (int index) {
+ }
+
+ boolean _getChecked () {
+- int /*long*/ [] ptr = new int /*long*/ [1];
++ long /*int*/ [] ptr = new long /*int*/ [1];
+ OS.gtk_tree_model_get (parent.modelHandle, handle, Table.CHECKED_COLUMN, ptr, -1);
+ return ptr [0] != 0;
+ }
+
+ Color _getForeground () {
+- int /*long*/ [] ptr = new int /*long*/ [1];
++ long /*int*/ [] ptr = new long /*int*/ [1];
+ OS.gtk_tree_model_get (parent.modelHandle, handle, Table.FOREGROUND_COLUMN, ptr, -1);
+ if (ptr [0] == 0) return parent.getForeground ();
+ GdkColor gdkColor = new GdkColor ();
+@@ -165,7 +165,7 @@ Color _getForeground () {
+ Color _getForeground (int index) {
+ int count = Math.max (1, parent.columnCount);
+ if (0 > index || index > count - 1) return _getForeground ();
+- int /*long*/ [] ptr = new int /*long*/ [1];
++ long /*int*/ [] ptr = new long /*int*/ [1];
+ int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
+ OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_FOREGROUND, ptr, -1);
+ if (ptr [0] == 0) return _getForeground ();
+@@ -177,7 +177,7 @@ Color _getForeground (int index) {
+ Image _getImage (int index) {
+ int count = Math.max (1, parent.getColumnCount ());
+ if (0 > index || index > count - 1) return null;
+- int /*long*/ [] ptr = new int /*long*/ [1];
++ long /*int*/ [] ptr = new long /*int*/ [1];
+ int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
+ OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_PIXBUF, ptr, -1);
+ if (ptr [0] == 0) return null;
+@@ -190,7 +190,7 @@ Image _getImage (int index) {
+ String _getText (int index) {
+ int count = Math.max (1, parent.getColumnCount ());
+ if (0 > index || index > count - 1) return "";
+- int /*long*/ [] ptr = new int /*long*/ [1];
++ long /*int*/ [] ptr = new long /*int*/ [1];
+ int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
+ OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_TEXT, ptr, -1);
+ if (ptr [0] == 0) return "";
+@@ -269,14 +269,14 @@ public Rectangle getBounds () {
+ // shifted a bit too far right on later versions of GTK - however, old Tree also had this problem
+ checkWidget ();
+ if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
+- int /*long*/ parentHandle = parent.handle;
+- int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, 0);
++ long /*int*/ parentHandle = parent.handle;
++ long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, 0);
+ if (column == 0) return new Rectangle (0, 0, 0, 0);
+- int /*long*/ textRenderer = parent.getTextRenderer (column);
+- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);
++ long /*int*/ textRenderer = parent.getTextRenderer (column);
++ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
+ if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);
+
+- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ OS.gtk_widget_realize (parentHandle);
+
+ boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
+@@ -357,15 +357,15 @@ public Color getBackground (int index) {
+ public Rectangle getBounds (int index) {
+ checkWidget();
+ if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
+- int /*long*/ parentHandle = parent.handle;
+- int /*long*/ column = 0;
++ long /*int*/ parentHandle = parent.handle;
++ long /*int*/ column = 0;
+ if (index >= 0 && index < parent.columnCount) {
+ column = parent.columns [index].handle;
+ } else {
+ column = OS.gtk_tree_view_get_column (parentHandle, index);
+ }
+ if (column == 0) return new Rectangle (0, 0, 0, 0);
+- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ OS.gtk_widget_realize (parentHandle);
+ GdkRectangle rect = new GdkRectangle ();
+ OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
+@@ -549,18 +549,18 @@ public Image getImage (int index) {
+ public Rectangle getImageBounds (int index) {
+ checkWidget ();
+ if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
+- int /*long*/ parentHandle = parent.handle;
+- int /*long*/ column = 0;
++ long /*int*/ parentHandle = parent.handle;
++ long /*int*/ column = 0;
+ if (index >= 0 && index < parent.columnCount) {
+ column = parent.columns [index].handle;
+ } else {
+ column = OS.gtk_tree_view_get_column (parentHandle, index);
+ }
+ if (column == 0) return new Rectangle (0, 0, 0, 0);
+- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);
++ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
+ if (pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);
+ GdkRectangle rect = new GdkRectangle ();
+- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ OS.gtk_widget_realize (parentHandle);
+ OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
+ OS.gtk_tree_path_free (path);
+@@ -675,19 +675,19 @@ public Rectangle getTextBounds (int index) {
+ if (0 > index || index > count - 1) return new Rectangle (0, 0, 0, 0);
+ // TODO fully test on early and later versions of GTK
+ // shifted a bit too far right on later versions of GTK - however, old Tree also had this problem
+- int /*long*/ parentHandle = parent.handle;
+- int /*long*/ column = 0;
++ long /*int*/ parentHandle = parent.handle;
++ long /*int*/ column = 0;
+ if (index >= 0 && index < parent.columnCount) {
+ column = parent.columns [index].handle;
+ } else {
+ column = OS.gtk_tree_view_get_column (parentHandle, index);
+ }
+ if (column == 0) return new Rectangle (0, 0, 0, 0);
+- int /*long*/ textRenderer = parent.getTextRenderer (column);
+- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);
++ long /*int*/ textRenderer = parent.getTextRenderer (column);
++ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
+ if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);
+
+- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ OS.gtk_widget_realize (parentHandle);
+
+ boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
+@@ -735,12 +735,12 @@ public Rectangle getTextBounds (int index) {
+
+ void redraw () {
+ if ((OS.GTK_WIDGET_FLAGS (parent.handle) & OS.GTK_REALIZED) != 0) {
+- int /*long*/ parentHandle = parent.handle;
+- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
++ long /*int*/ parentHandle = parent.handle;
++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ GdkRectangle rect = new GdkRectangle ();
+ OS.gtk_tree_view_get_cell_area (parentHandle, path, 0, rect);
+ OS.gtk_tree_path_free (path);
+- int /*long*/ window = OS.gtk_tree_view_get_bin_window (parentHandle);
++ long /*int*/ window = OS.gtk_tree_view_get_bin_window (parentHandle);
+ rect.x = 0;
+ int [] w = new int [1], h = new int [1];
+ OS.gdk_drawable_get_size (window, w, h);
+@@ -845,16 +845,16 @@ public void setBackground (int index, Color color) {
+ boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
+ if (!customDraw) {
+ if ((parent.style & SWT.VIRTUAL) == 0) {
+- int /*long*/ parentHandle = parent.handle;
+- int /*long*/ column = 0;
++ long /*int*/ parentHandle = parent.handle;
++ long /*int*/ column = 0;
+ if (parent.columnCount > 0) {
+ column = parent.columns [index].handle;
+ } else {
+ column = OS.gtk_tree_view_get_column (parentHandle, index);
+ }
+ if (column == 0) return;
+- int /*long*/ textRenderer = parent.getTextRenderer (column);
+- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);
++ long /*int*/ textRenderer = parent.getTextRenderer (column);
++ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
+ OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
+ OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
+ }
+@@ -918,7 +918,7 @@ public void setFont (Font font){
+ if (oldFont == font) return;
+ this.font = font;
+ if (oldFont != null && oldFont.equals (font)) return;
+- int /*long*/ fontHandle = font != null ? font.handle : 0;
++ long /*int*/ fontHandle = font != null ? font.handle : 0;
+ OS.gtk_list_store_set (parent.modelHandle, handle, Table.FONT_COLUMN, fontHandle, -1);
+ /*
+ * Bug in GTK. When using fixed-height-mode,
+@@ -969,7 +969,7 @@ public void setFont (int index, Font font) {
+ if (oldFont != null && oldFont.equals (font)) return;
+
+ int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
+- int /*long*/ fontHandle = font != null ? font.handle : 0;
++ long /*int*/ fontHandle = font != null ? font.handle : 0;
+ OS.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_FONT, fontHandle, -1);
+ /*
+ * Bug in GTK. When using fixed-height-mode,
+@@ -987,16 +987,16 @@ public void setFont (int index, Font font) {
+ boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
+ if (!customDraw) {
+ if ((parent.style & SWT.VIRTUAL) == 0) {
+- int /*long*/ parentHandle = parent.handle;
+- int /*long*/ column = 0;
++ long /*int*/ parentHandle = parent.handle;
++ long /*int*/ column = 0;
+ if (parent.columnCount > 0) {
+ column = parent.columns [index].handle;
+ } else {
+ column = OS.gtk_tree_view_get_column (parentHandle, index);
+ }
+ if (column == 0) return;
+- int /*long*/ textRenderer = parent.getTextRenderer (column);
+- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);
++ long /*int*/ textRenderer = parent.getTextRenderer (column);
++ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
+ OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
+ OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
+ }
+@@ -1092,16 +1092,16 @@ public void setForeground (int index, Color color){
+ boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
+ if (!customDraw) {
+ if ((parent.style & SWT.VIRTUAL) == 0) {
+- int /*long*/ parentHandle = parent.handle;
+- int /*long*/ column = 0;
++ long /*int*/ parentHandle = parent.handle;
++ long /*int*/ column = 0;
+ if (parent.columnCount > 0) {
+ column = parent.columns [index].handle;
+ } else {
+ column = OS.gtk_tree_view_get_column (parentHandle, index);
+ }
+ if (column == 0) return;
+- int /*long*/ textRenderer = parent.getTextRenderer (column);
+- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);
++ long /*int*/ textRenderer = parent.getTextRenderer (column);
++ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
+ OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
+ OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
+ }
+@@ -1134,7 +1134,7 @@ public void setGrayed (boolean grayed) {
+ * GTK+'s "inconsistent" state does not match SWT's concept of grayed.
+ * Render checked+grayed as "inconsistent", unchecked+grayed as blank.
+ */
+- int /*long*/ [] ptr = new int /*long*/ [1];
++ long /*int*/ [] ptr = new long /*int*/ [1];
+ OS.gtk_tree_model_get (parent.modelHandle, handle, Table.CHECKED_COLUMN, ptr, -1);
+ OS.gtk_list_store_set (parent.modelHandle, handle, Table.GRAYED_COLUMN, ptr [0] == 0 ? false : grayed, -1);
+ cached = true;
+@@ -1164,7 +1164,7 @@ public void setImage (int index, Image image) {
+ }
+ int count = Math.max (1, parent.getColumnCount ());
+ if (0 > index || index > count - 1) return;
+- int /*long*/ pixbuf = 0;
++ long /*int*/ pixbuf = 0;
+ if (image != null) {
+ ImageList imageList = parent.imageList;
+ if (imageList == null) imageList = parent.imageList = new ImageList ();
+@@ -1192,10 +1192,10 @@ public void setImage (int index, Image image) {
+ if ((parent.style & SWT.VIRTUAL) != 0 && parent.currentItem == null) {
+ if (OS.GTK_VERSION >= OS.VERSION (2, 3, 2)) {
+ if (image != null) {
+- int /*long*/parentHandle = parent.handle;
+- int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, index);
++ long /*int*/parentHandle = parent.handle;
++ long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, index);
+ int [] w = new int [1];
+- int /*long*/ pixbufRenderer = parent.getPixbufRenderer(column);
++ long /*int*/ pixbufRenderer = parent.getPixbufRenderer(column);
+ OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w);
+ if (w[0] < image.getBounds().width) {
+ /*
+@@ -1203,7 +1203,7 @@ public void setImage (int index, Image image) {
+ * are relying on the fact that it is done as part of modifying
+ * the style.
+ */
+- int /*long*/ style = OS.gtk_widget_get_modifier_style (parentHandle);
++ long /*int*/ style = OS.gtk_widget_get_modifier_style (parentHandle);
+ parent.modifyStyle (parentHandle, style);
+ }
+ }
+diff --git a/org/eclipse/swt/widgets/Text.java b/org/eclipse/swt/widgets/Text.java
+index 0973f06..06c9ace 100644
+--- a/org/eclipse/swt/widgets/Text.java
++++ b/org/eclipse/swt/widgets/Text.java
+@@ -56,9 +56,9 @@ import org.eclipse.swt.events.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class Text extends Scrollable {
@@ -42080,7 +42352,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
int fixStart = -1, fixEnd = -1;
boolean doubleClick;
String message = "";
-@@ -325,7 +325,7 @@
+@@ -325,7 +325,7 @@ public void append (String string) {
OS.gtk_text_buffer_get_end_iter (bufferHandle, position);
OS.gtk_text_buffer_insert (bufferHandle, position, buffer, buffer.length);
OS.gtk_text_buffer_place_cursor (bufferHandle, position);
@@ -42089,7 +42361,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
}
}
-@@ -345,8 +345,8 @@
+@@ -345,8 +345,8 @@ public void clearSelection () {
OS.gtk_editable_select_region (handle, position, position);
} else {
byte [] position = new byte [ITER_SIZEOF];
@@ -42100,7 +42372,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, insertMark);
OS.gtk_text_buffer_move_mark (bufferHandle, selectionMark, position);
OS.gtk_text_buffer_move_mark (bufferHandle, insertMark, position);
-@@ -360,13 +360,13 @@
+@@ -360,13 +360,13 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
int[] w = new int [1], h = new int [1];
if ((style & SWT.SINGLE) != 0) {
OS.gtk_widget_realize (handle);
@@ -42117,7 +42389,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.g_free (text);
OS.pango_layout_set_width (layout, wHint * OS.PANGO_SCALE);
OS.pango_layout_get_size (layout, w, h);
-@@ -376,7 +376,7 @@
+@@ -376,7 +376,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
int height = OS.PANGO_PIXELS (h [0]);
if ((style & SWT.SINGLE) != 0 && message.length () > 0) {
byte [] buffer = Converter.wcsToMbcs (null, message, true);
@@ -42126,7 +42398,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.pango_layout_get_size (layout, w, h);
OS.g_object_unref (layout);
width = Math.max (width, OS.PANGO_PIXELS (w [0]));
-@@ -395,7 +395,7 @@
+@@ -395,7 +395,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
int xborder = 0, yborder = 0;
if ((style & SWT.SINGLE) != 0) {
if ((style & SWT.BORDER) != 0) {
@@ -42135,7 +42407,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
xborder += OS.gtk_style_get_xthickness (style);
yborder += OS.gtk_style_get_ythickness (style);
}
-@@ -440,7 +440,7 @@
+@@ -440,7 +440,7 @@ public void copy () {
if ((style & SWT.SINGLE) != 0) {
OS.gtk_editable_copy_clipboard (handle);
} else {
@@ -42144,7 +42416,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_buffer_copy_clipboard (bufferHandle, clipboard);
}
}
-@@ -462,7 +462,7 @@
+@@ -462,7 +462,7 @@ public void cut () {
if ((style & SWT.SINGLE) != 0) {
OS.gtk_editable_cut_clipboard (handle);
} else {
@@ -42153,7 +42425,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_buffer_cut_clipboard (bufferHandle, clipboard, OS.gtk_text_view_get_editable (handle));
}
}
-@@ -470,7 +470,7 @@
+@@ -470,7 +470,7 @@ public void cut () {
void deregister () {
super.deregister ();
if (bufferHandle != 0) display.removeWidget (bufferHandle);
@@ -42162,7 +42434,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (imContext != 0) display.removeWidget (imContext);
}
-@@ -498,9 +498,9 @@
+@@ -498,9 +498,9 @@ boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
if ((style & SWT.SINGLE) != 0) {
int [] index = new int [1];
int [] trailing = new int [1];
@@ -42174,7 +42446,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
position = (int)/*64*/OS.g_utf8_pointer_to_offset (ptr, ptr + index[0]) + trailing[0];
} else {
byte [] p = new byte [ITER_SIZEOF];
-@@ -519,15 +519,15 @@
+@@ -519,15 +519,15 @@ boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
return super.dragDetect (x, y, filter, consume);
}
@@ -42193,7 +42465,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (imContext != 0) {
return OS.gtk_im_context_filter_keypress (imContext, event);
}
-@@ -546,7 +546,7 @@
+@@ -546,7 +546,7 @@ void fixIM () {
* filter has to be called by SWT.
*/
if (gdkEventKey != 0 && gdkEventKey != -1) {
@@ -42202,7 +42474,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (imContext != 0) {
OS.gtk_im_context_filter_keypress (imContext, gdkEventKey);
gdkEventKey = -1;
-@@ -563,7 +563,7 @@
+@@ -563,7 +563,7 @@ GdkColor getBackgroundColor () {
public int getBorderWidth () {
checkWidget();
if ((style & SWT.MULTI) != 0) return super.getBorderWidth ();
@@ -42211,7 +42483,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if ((this.style & SWT.BORDER) != 0) {
return OS.gtk_style_get_xthickness (style);
}
-@@ -587,7 +587,7 @@
+@@ -587,7 +587,7 @@ public int getCaretLineNumber () {
checkWidget ();
if ((style & SWT.SINGLE) != 0) return 0;
byte [] position = new byte [ITER_SIZEOF];
@@ -42220,7 +42492,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);
return OS.gtk_text_iter_get_line (position);
}
-@@ -615,7 +615,7 @@
+@@ -615,7 +615,7 @@ public Point getCaretLocation () {
}
int [] offset_x = new int [1], offset_y = new int [1];
OS.gtk_entry_get_layout_offsets (handle, offset_x, offset_y);
@@ -42229,7 +42501,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
PangoRectangle pos = new PangoRectangle ();
OS.pango_layout_index_to_pos (layout, index, pos);
int x = offset_x [0] + OS.PANGO_PIXELS (pos.x) - getBorderWidth ();
-@@ -623,7 +623,7 @@
+@@ -623,7 +623,7 @@ public Point getCaretLocation () {
return new Point (x, y);
}
byte [] position = new byte [ITER_SIZEOF];
@@ -42238,7 +42510,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);
GdkRectangle rect = new GdkRectangle ();
OS.gtk_text_view_get_iter_location (handle, position, rect);
-@@ -652,7 +652,7 @@
+@@ -652,7 +652,7 @@ public int getCaretPosition () {
return OS.gtk_editable_get_position (handle);
}
byte [] position = new byte [ITER_SIZEOF];
@@ -42247,7 +42519,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);
return OS.gtk_text_iter_get_offset (position);
}
-@@ -670,7 +670,7 @@
+@@ -670,7 +670,7 @@ public int getCaretPosition () {
public int getCharCount () {
checkWidget ();
if ((style & SWT.SINGLE) != 0) {
@@ -42256,7 +42528,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
return (int)/*64*/OS.g_utf8_strlen (ptr, -1);
}
return OS.gtk_text_buffer_get_char_count (bufferHandle);
-@@ -839,9 +839,9 @@
+@@ -839,9 +839,9 @@ public int getOrientation () {
if ((style & SWT.SINGLE) != 0) {
int [] index = new int [1];
int [] trailing = new int [1];
@@ -42268,7 +42540,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
position = (int)/*64*/OS.g_utf8_pointer_to_offset (ptr, ptr + index[0]) + trailing[0];
} else {
byte [] p = new byte [ITER_SIZEOF];
-@@ -937,7 +937,7 @@
+@@ -937,7 +937,7 @@ public int getTabs () {
int getTabWidth (int tabs) {
byte[] buffer = Converter.wcsToMbcs(null, " ", true);
@@ -42277,7 +42549,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
int [] width = new int [1];
int [] height = new int [1];
OS.pango_layout_get_size (layout, width, height);
-@@ -961,7 +961,7 @@
+@@ -961,7 +961,7 @@ int getTabWidth (int tabs) {
*/
public String getText () {
checkWidget ();
@@ -42286,7 +42558,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if ((style & SWT.SINGLE) != 0) {
address = OS.gtk_entry_get_text (handle);
} else {
-@@ -999,7 +999,7 @@
+@@ -999,7 +999,7 @@ public String getText () {
public String getText (int start, int end) {
checkWidget ();
if (!(start <= end && 0 <= end)) return "";
@@ -42295,7 +42567,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if ((style & SWT.SINGLE) != 0) {
start = Math.max (0, start);
address = OS.gtk_editable_get_chars (handle, start, end + 1);
-@@ -1100,13 +1100,13 @@
+@@ -1100,13 +1100,13 @@ public int getTopPixel () {
return lineTop [0];
}
@@ -42312,7 +42584,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (result != 0) return result;
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
-@@ -1121,7 +1121,7 @@
+@@ -1121,7 +1121,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
}
@@ -42321,7 +42593,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
/*
* Feature in GTK. When the user types, GTK positions
* the caret after sending the changed signal. This
-@@ -1130,7 +1130,7 @@
+@@ -1130,7 +1130,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
* is to post the modify event when the user is typing.
*/
boolean keyPress = false;
@@ -42330,7 +42602,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-@@ -1149,7 +1149,7 @@
+@@ -1149,7 +1149,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
return 0;
}
@@ -42339,7 +42611,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (text == 0) return 0;
if ((style & SWT.SINGLE) != 0) {
if (!OS.gtk_editable_get_editable (handle)) return 0;
-@@ -1191,7 +1191,7 @@
+@@ -1191,7 +1191,7 @@ int /*long*/ gtk_commit (int /*long*/ imContext, int /*long*/ text) {
return 0;
}
@@ -42348,7 +42620,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
byte [] startIter = new byte [ITER_SIZEOF];
byte [] endIter = new byte [ITER_SIZEOF];
-@@ -1227,7 +1227,7 @@
+@@ -1227,7 +1227,7 @@ int /*long*/ gtk_delete_range (int /*long*/ widget, int /*long*/ iter1, int /*lo
return 0;
}
@@ -42357,7 +42629,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
String newText = verifyText ("", (int)/*64*/start_pos, (int)/*64*/end_pos);
if (newText == null) {
-@@ -1255,7 +1255,7 @@
+@@ -1255,7 +1255,7 @@ int /*long*/ gtk_delete_text (int /*long*/ widget, int /*long*/ start_pos, int /
return 0;
}
@@ -42366,7 +42638,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (cursor != null) setCursor (cursor.handle);
/*
* Feature in GTK. The gtk-entry-select-on-focus property is a global
-@@ -1271,7 +1271,7 @@
+@@ -1271,7 +1271,7 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
GdkEventFocus gdkEventFocus = new GdkEventFocus ();
OS.memmove (gdkEventFocus, gdkEvent, GdkEventFocus.sizeof);
if (gdkEventFocus.in == 0) {
@@ -42375,7 +42647,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.g_object_set (settings, OS.gtk_entry_select_on_focus, true, 0);
}
break;
-@@ -1280,29 +1280,29 @@
+@@ -1280,29 +1280,29 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
return super.gtk_event_after (widget, gdkEvent);
}
@@ -42414,7 +42686,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
PangoRectangle rect = new PangoRectangle ();
OS.pango_layout_line_get_extents (line, null, rect);
rect.y = OS.PANGO_PIXELS (rect.y);
-@@ -1325,8 +1325,8 @@
+@@ -1325,8 +1325,8 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ event) {
case SWT.CENTER: x = (width - rect.width) / 2; break;
case SWT.RIGHT: x = rtl ? innerBorder.left : width - rect.width; break;
}
@@ -42425,7 +42697,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
GdkColor textColor = new GdkColor ();
OS.gtk_style_get_text (style, OS.GTK_STATE_INSENSITIVE, textColor);
GdkColor baseColor = new GdkColor ();
-@@ -1339,13 +1339,13 @@
+@@ -1339,13 +1339,13 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
@@ -42442,7 +42714,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
/*
* Feature in GTK. GtkEntry widgets select their text on focus in,
* clearing the previous selection. This behavior is controlled by
-@@ -1354,13 +1354,13 @@
+@@ -1354,13 +1354,13 @@ int /*long*/ gtk_grab_focus (int /*long*/ widget) {
* the entry has done focus in processing.
*/
if ((style & SWT.SINGLE) != 0 && display.entrySelectOnFocus) {
@@ -42458,7 +42730,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
if (new_text == 0 || new_text_length == 0) return 0;
byte [] buffer = new byte [(int)/*64*/new_text_length];
-@@ -1369,7 +1369,7 @@
+@@ -1369,7 +1369,7 @@ int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*
int [] pos = new int [1];
OS.memmove (pos, position, 4);
if (pos [0] == -1) {
@@ -42467,7 +42739,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1);
}
/* Use the selection when the text was deleted */
-@@ -1408,15 +1408,15 @@
+@@ -1408,15 +1408,15 @@ int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*
return 0;
}
@@ -42486,7 +42758,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
OS.gtk_widget_set_direction (menu, OS.GTK_TEXT_DIR_RTL);
OS.gtk_container_forall (menu, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);
-@@ -1424,7 +1424,7 @@
+@@ -1424,7 +1424,7 @@ int /*long*/ gtk_populate_popup (int /*long*/ widget, int /*long*/ menu) {
return 0;
}
@@ -42495,7 +42767,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
byte [] position = new byte [ITER_SIZEOF];
OS.memmove (position, iter, position.length);
-@@ -1468,7 +1468,7 @@
+@@ -1468,7 +1468,7 @@ void hookEvents () {
OS.g_signal_connect_closure (bufferHandle, OS.delete_range, display.closures [DELETE_RANGE], false);
OS.g_signal_connect_closure (handle, OS.populate_popup, display.closures [POPULATE_POPUP], false);
}
@@ -42504,7 +42776,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (imContext != 0) {
OS.g_signal_connect_closure (imContext, OS.commit, display.closures [COMMIT], false);
int id = OS.g_signal_lookup (OS.commit, OS.gtk_im_context_get_type ());
-@@ -1477,7 +1477,7 @@
+@@ -1477,7 +1477,7 @@ void hookEvents () {
}
}
@@ -42513,7 +42785,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if ((style & SWT.SINGLE) != 0) {
return OS.gtk_editable_get_editable (handle) ? OS.GTK_ENTRY_IM_CONTEXT (handle) : 0;
}
-@@ -1518,15 +1518,15 @@
+@@ -1518,15 +1518,15 @@ public void insert (String string) {
}
OS.gtk_text_buffer_insert (bufferHandle, start, buffer, buffer.length);
OS.gtk_text_buffer_place_cursor (bufferHandle, start);
@@ -42533,7 +42805,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (children != 0) window = OS.g_list_data (children);
OS.g_list_free (children);
return window;
-@@ -1552,7 +1552,7 @@
+@@ -1552,7 +1552,7 @@ public void paste () {
if ((style & SWT.SINGLE) != 0) {
OS.gtk_editable_paste_clipboard (handle);
} else {
@@ -42542,7 +42814,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_buffer_paste_clipboard (bufferHandle, clipboard, null, OS.gtk_text_view_get_editable (handle));
}
}
-@@ -1560,7 +1560,7 @@
+@@ -1560,7 +1560,7 @@ public void paste () {
void register () {
super.register ();
if (bufferHandle != 0) display.addWidget (bufferHandle, this);
@@ -42551,7 +42823,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (imContext != 0) display.addWidget (imContext, this);
}
-@@ -1575,7 +1575,7 @@
+@@ -1575,7 +1575,7 @@ void releaseWidget () {
* it around until ownership of the clipboard is lost.
*/
if ((style & SWT.MULTI) != 0) {
@@ -42560,7 +42832,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_buffer_paste_clipboard (bufferHandle, clipboard, null, OS.gtk_text_view_get_editable (handle));
}
}
-@@ -1672,8 +1672,8 @@
+@@ -1672,8 +1672,8 @@ public void selectAll () {
byte [] end = new byte [ITER_SIZEOF];
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, start, 0);
OS.gtk_text_buffer_get_end_iter (bufferHandle, end);
@@ -42571,7 +42843,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_buffer_move_mark (bufferHandle, selectionMark, start);
OS.gtk_text_buffer_move_mark (bufferHandle, insertMark, end);
}
-@@ -1684,8 +1684,8 @@
+@@ -1684,8 +1684,8 @@ void setBackgroundColor (GdkColor color) {
OS.gtk_widget_modify_base (handle, 0, color);
}
@@ -42582,7 +42854,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (cursor == 0) defaultCursor = OS.gdk_cursor_new (OS.GDK_XTERM);
super.setCursor (cursor != 0 ? cursor : defaultCursor);
if (cursor == 0) OS.gdk_cursor_destroy (defaultCursor);
-@@ -1764,7 +1764,7 @@
+@@ -1764,7 +1764,7 @@ public void setEditable (boolean editable) {
}
}
@@ -42591,7 +42863,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
super.setFontDescription (font);
setTabStops (tabs);
}
-@@ -1847,7 +1847,7 @@
+@@ -1847,7 +1847,7 @@ public void setSelection (int start) {
byte [] position = new byte [ITER_SIZEOF];
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, position, start);
OS.gtk_text_buffer_place_cursor (bufferHandle, position);
@@ -42600,7 +42872,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
}
}
-@@ -1887,8 +1887,8 @@
+@@ -1887,8 +1887,8 @@ public void setSelection (int start, int end) {
byte [] endIter = new byte [ITER_SIZEOF];
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, startIter, start);
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, endIter, end);
@@ -42611,7 +42883,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_buffer_move_mark (bufferHandle, selectionMark, startIter);
OS.gtk_text_buffer_move_mark (bufferHandle, insertMark, endIter);
}
-@@ -1954,7 +1954,7 @@
+@@ -1954,7 +1954,7 @@ public void setTabs (int tabs) {
void setTabStops (int tabs) {
if ((style & SWT.SINGLE) != 0) return;
int tabWidth = getTabWidth (tabs);
@@ -42620,7 +42892,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.pango_tab_array_set_tab (tabArray, 0, OS.PANGO_TAB_LEFT, tabWidth);
OS.gtk_text_view_set_tabs (handle, tabArray);
OS.pango_tab_array_free (tabArray);
-@@ -2008,7 +2008,7 @@
+@@ -2008,7 +2008,7 @@ public void setText (String string) {
OS.g_signal_handlers_unblock_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEXT_BUFFER_INSERT_TEXT);
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, position, 0);
OS.gtk_text_buffer_place_cursor (bufferHandle, position);
@@ -42629,7 +42901,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
}
sendEvent (SWT.Modify);
-@@ -2080,7 +2080,7 @@
+@@ -2080,7 +2080,7 @@ public void setTopIndex (int index) {
public void showSelection () {
checkWidget ();
if ((style & SWT.SINGLE) != 0) return;
@@ -42638,7 +42910,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
mark = OS.gtk_text_buffer_get_insert (bufferHandle);
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
-@@ -2091,9 +2091,9 @@
+@@ -2091,9 +2091,9 @@ boolean translateTraversal (GdkEventKey keyEvent) {
switch (key) {
case OS.GDK_KP_Enter:
case OS.GDK_Return: {
@@ -42650,7 +42922,7 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);
if (preeditString [0] != 0) {
int length = OS.strlen (preeditString [0]);
-@@ -2127,7 +2127,7 @@
+@@ -2127,7 +2127,7 @@ String verifyText (String string, int start, int end) {
event.text = string;
event.start = start;
event.end = end;
@@ -42659,10 +42931,11 @@ diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/T
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-diff -urN x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widgets/ToolBar.java
---- x86/org/eclipse/swt/widgets/ToolBar.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/ToolBar.java 2009-09-17 08:48:24.000000000 -0400
-@@ -188,11 +188,11 @@
+diff --git a/org/eclipse/swt/widgets/ToolBar.java b/org/eclipse/swt/widgets/ToolBar.java
+index 2d7306e..a2ace8d 100644
+--- a/org/eclipse/swt/widgets/ToolBar.java
++++ b/org/eclipse/swt/widgets/ToolBar.java
+@@ -188,11 +188,11 @@ Widget [] computeTabList () {
return result;
}
@@ -42676,7 +42949,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widget
return handle;
}
-@@ -210,7 +210,7 @@
+@@ -210,7 +210,7 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De
}
}
@@ -42685,7 +42958,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widget
if (lastFocus != null && lastFocus.setFocus ()) return true;
ToolItem [] items = getItems ();
for (int i = 0; i < items.length; i++) {
-@@ -279,7 +279,7 @@
+@@ -279,7 +279,7 @@ public ToolItem getItem (Point point) {
*/
public int getItemCount () {
checkWidget();
@@ -42694,7 +42967,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widget
if (list == 0) return 0;
int itemCount = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -308,13 +308,13 @@
+@@ -308,13 +308,13 @@ public ToolItem [] getItems () {
}
ToolItem [] _getItems () {
@@ -42710,7 +42983,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widget
Widget widget = display.getWidget (data);
if (widget != null) items [index++] = (ToolItem) widget;
}
-@@ -364,9 +364,9 @@
+@@ -364,9 +364,9 @@ ToolItem [] _getTabItemList () {
return tabItemList;
}
@@ -42722,7 +42995,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widget
if (result != 0) return result;
ToolItem [] items = getItems ();
int length = items.length;
-@@ -387,7 +387,7 @@
+@@ -387,7 +387,7 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
if ((item.style & SWT.DROP_DOWN) != 0) {
Event event = new Event ();
event.detail = SWT.ARROW;
@@ -42731,7 +43004,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widget
event.x = OS.GTK_WIDGET_X (topHandle);
event.y = OS.GTK_WIDGET_Y (topHandle) + OS.GTK_WIDGET_HEIGHT (topHandle);
if ((style & SWT.MIRRORED) != 0) event.x = getClientWidth() - OS.GTK_WIDGET_WIDTH(topHandle) - event.x;
-@@ -449,7 +449,7 @@
+@@ -449,7 +449,7 @@ public int indexOf (ToolItem item) {
boolean mnemonicHit (char key) {
ToolItem [] items = getItems ();
for (int i=0; i<items.length; i++) {
@@ -42740,7 +43013,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widget
if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;
}
return false;
-@@ -458,7 +458,7 @@
+@@ -458,7 +458,7 @@ boolean mnemonicHit (char key) {
boolean mnemonicMatch (char key) {
ToolItem [] items = getItems ();
for (int i=0; i<items.length; i++) {
@@ -42749,7 +43022,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widget
if (labelHandle != 0 && mnemonicMatch (labelHandle, key)) return true;
}
return false;
-@@ -504,7 +504,7 @@
+@@ -504,7 +504,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
return result;
}
@@ -42758,10 +43031,11 @@ diff -urN x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widget
super.setFontDescription (font);
ToolItem [] items = getItems ();
for (int i = 0; i < items.length; i++) {
-diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widgets/ToolItem.java
---- x86/org/eclipse/swt/widgets/ToolItem.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/ToolItem.java 2009-09-17 08:48:24.000000000 -0400
-@@ -38,7 +38,7 @@
+diff --git a/org/eclipse/swt/widgets/ToolItem.java b/org/eclipse/swt/widgets/ToolItem.java
+index 6013cfc..2cef5a7 100644
+--- a/org/eclipse/swt/widgets/ToolItem.java
++++ b/org/eclipse/swt/widgets/ToolItem.java
+@@ -38,7 +38,7 @@ import org.eclipse.swt.events.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class ToolItem extends Item {
@@ -42770,7 +43044,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
ToolBar parent;
Control control;
Image hotImage, disabledImage;
-@@ -246,11 +246,11 @@
+@@ -246,11 +246,11 @@ void createHandle (int index) {
}
OS.GTK_WIDGET_UNSET_FLAGS (handle, OS.GTK_CAN_FOCUS);
// This code is intentionally commented.
@@ -42785,7 +43059,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
// setForegroundColor (color);
// setFontDescription (font);
if ((parent.state & FOREGROUND) != 0) {
-@@ -306,7 +306,7 @@
+@@ -306,7 +306,7 @@ public void dispose () {
public Rectangle getBounds () {
checkWidget();
parent.forceResize ();
@@ -42794,7 +43068,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
int x, y, width, height;
/*
* Bug in GTK. Toolbar items are only allocated their minimum size
-@@ -395,7 +395,7 @@
+@@ -395,7 +395,7 @@ public Image getDisabledImage () {
*/
public boolean getEnabled () {
checkWidget();
@@ -42803,7 +43077,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
return OS.GTK_WIDGET_SENSITIVE (topHandle);
}
-@@ -485,11 +485,11 @@
+@@ -485,11 +485,11 @@ public String getToolTipText () {
public int getWidth () {
checkWidget();
parent.forceResize ();
@@ -42817,7 +43091,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
double x = gdkEvent.x;
-@@ -497,14 +497,14 @@
+@@ -497,14 +497,14 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
double y = gdkEvent.y;
gdkEvent.y += OS.GTK_WIDGET_Y (handle);
OS.memmove (event, gdkEvent, GdkEventButton.sizeof);
@@ -42834,7 +43108,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
double x = gdkEvent.x;
-@@ -512,17 +512,17 @@
+@@ -512,17 +512,17 @@ int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event)
double y = gdkEvent.y;
gdkEvent.y += OS.GTK_WIDGET_Y (handle);
OS.memmove (event, gdkEvent, GdkEventButton.sizeof);
@@ -42855,7 +43129,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
if (eventPtr != 0) {
GdkEvent gdkEvent = new GdkEvent ();
OS.memmove (gdkEvent, eventPtr, GdkEvent.sizeof);
-@@ -538,7 +538,7 @@
+@@ -538,7 +538,7 @@ int /*long*/ gtk_clicked (int /*long*/ widget) {
if ((((parent.style & SWT.RIGHT_TO_LEFT) == 0) && x <= (int)x_win [0])
|| (((parent.style & SWT.RIGHT_TO_LEFT) != 0) && (int)x_win [0] <= x + width)) {
event.detail = SWT.ARROW;
@@ -42864,7 +43138,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
event.x = OS.GTK_WIDGET_X (topHandle);
if ((parent.style & SWT.MIRRORED) != 0) event.x = parent.getClientWidth () - OS.GTK_WIDGET_WIDTH (topHandle) - event.x;
event.y = OS.GTK_WIDGET_Y (topHandle) + OS.GTK_WIDGET_HEIGHT (topHandle);
-@@ -558,7 +558,7 @@
+@@ -558,7 +558,7 @@ int /*long*/ gtk_clicked (int /*long*/ widget) {
return 0;
}
@@ -42873,7 +43147,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
parent.gtk_enter_notify_event (widget, event);
drawHotImage = (parent.style & SWT.FLAT) != 0 && hotImage != null;
if (drawHotImage && imageHandle != 0) {
-@@ -566,7 +566,7 @@
+@@ -566,7 +566,7 @@ int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {
if (imageList != null) {
int index = imageList.indexOf (hotImage);
if (index != -1) {
@@ -42882,7 +43156,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
}
}
-@@ -574,7 +574,7 @@
+@@ -574,7 +574,7 @@ int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {
return 0;
}
@@ -42891,7 +43165,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
GdkEvent event = new GdkEvent ();
OS.memmove (event, gdkEvent, GdkEvent.sizeof);
switch (event.type) {
-@@ -590,13 +590,13 @@
+@@ -590,13 +590,13 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
return 0;
}
@@ -42907,7 +43181,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
parent.gtk_leave_notify_event (widget, event);
if (drawHotImage) {
drawHotImage = false;
-@@ -605,7 +605,7 @@
+@@ -605,7 +605,7 @@ int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) {
if (imageList != null) {
int index = imageList.indexOf (image);
if (index != -1) {
@@ -42916,7 +43190,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
}
}
-@@ -614,12 +614,12 @@
+@@ -614,12 +614,12 @@ int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) {
return 0;
}
@@ -42931,7 +43205,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
return parent.gtk_mnemonic_activate (widget, arg1);
}
-@@ -656,7 +656,7 @@
+@@ -656,7 +656,7 @@ void hookEvents () {
OS.g_signal_connect_closure_by_id (handle, display.signalIds [BUTTON_RELEASE_EVENT], 0, display.closures [BUTTON_RELEASE_EVENT], false);
OS.g_signal_connect_closure_by_id (handle, display.signalIds [EVENT_AFTER], 0, display.closures[EVENT_AFTER], false);
@@ -42940,7 +43214,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
OS.g_signal_connect_closure_by_id (topHandle, display.signalIds [MAP], 0, display.closures [MAP], true);
}
-@@ -840,7 +840,7 @@
+@@ -840,7 +840,7 @@ public void setDisabledImage (Image image) {
*/
public void setEnabled (boolean enabled) {
checkWidget();
@@ -42949,7 +43223,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
OS.gtk_widget_set_sensitive (topHandle, enabled);
if (enabled) {
/*
-@@ -868,7 +868,7 @@
+@@ -868,7 +868,7 @@ boolean setFocus () {
return result;
}
@@ -42958,7 +43232,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
OS.gtk_widget_modify_font (handle, font);
if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font);
if (imageHandle != 0) OS.gtk_widget_modify_font (imageHandle, font);
-@@ -927,7 +927,7 @@
+@@ -927,7 +927,7 @@ public void setImage (Image image) {
} else {
imageList.put (imageIndex, image);
}
@@ -42967,10 +43241,11 @@ diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widge
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
OS.gtk_widget_show (imageHandle);
} else {
-diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widgets/ToolTip.java
---- x86/org/eclipse/swt/widgets/ToolTip.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/ToolTip.java 2009-09-17 08:48:24.000000000 -0400
-@@ -47,7 +47,7 @@
+diff --git a/org/eclipse/swt/widgets/ToolTip.java b/org/eclipse/swt/widgets/ToolTip.java
+index a106744..bee88a4 100644
+--- a/org/eclipse/swt/widgets/ToolTip.java
++++ b/org/eclipse/swt/widgets/ToolTip.java
+@@ -47,7 +47,7 @@ public class ToolTip extends Widget {
String text, message;
TrayItem item;
int x, y, timerId;
@@ -42979,7 +43254,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
int [] borderPolygon;
boolean spikeAbove, autohide;
-@@ -135,7 +135,7 @@
+@@ -135,7 +135,7 @@ public void addSelectionListener (SelectionListener listener) {
}
void configure () {
@@ -42988,7 +43263,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_realize (handle);
int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, OS.GTK_WIDGET_WINDOW (handle));
GdkRectangle dest = new GdkRectangle ();
-@@ -249,9 +249,9 @@
+@@ -249,9 +249,9 @@ void configure () {
OS.gtk_window_move (handle, Math.min(dest.width - w, x - w + 17), y - h - TIP_HEIGHT);
}
}
@@ -43000,7 +43275,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
OS.gdk_window_shape_combine_region (window, rgn, 0, 0);
OS.gdk_region_destroy (rgn);
}
-@@ -291,13 +291,13 @@
+@@ -291,13 +291,13 @@ void createWidget (int index) {
void deregister () {
super.deregister ();
if ((style & SWT.BALLOON) == 0) {
@@ -43016,7 +43291,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
if (parent != null) parent.removeTooTip (this);
releaseHandle ();
if (topHandle != 0 && (state & HANDLE) != 0) {
-@@ -330,7 +330,7 @@
+@@ -330,7 +330,7 @@ Point getLocation () {
int x = this.x;
int y = this.y;
if (item != null) {
@@ -43025,7 +43300,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
if(OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
GdkRectangle area = new GdkRectangle ();
OS.gtk_status_icon_get_geometry (itemHandle, 0, area, 0);
-@@ -338,7 +338,7 @@
+@@ -338,7 +338,7 @@ Point getLocation () {
y = area.y + area.height / 2;
} else {
OS.gtk_widget_realize (itemHandle);
@@ -43034,7 +43309,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
int [] px = new int [1], py = new int [1];
OS.gdk_window_get_origin (window, px, py);
x = px [0] + OS.GTK_WIDGET_WIDTH (itemHandle) / 2;
-@@ -458,19 +458,19 @@
+@@ -458,19 +458,19 @@ public String getText () {
public boolean getVisible () {
checkWidget ();
if ((style & SWT.BALLOON) != 0) return OS.GTK_WIDGET_VISIBLE (handle);
@@ -43059,7 +43334,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
OS.gdk_draw_polygon (window, gdkGC, 0, borderPolygon, borderPolygon.length / 2);
int x = BORDER + PADDING;
int y = BORDER + PADDING;
-@@ -484,8 +484,8 @@
+@@ -484,8 +484,8 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
case SWT.ICON_WARNING: buffer = Converter.wcsToMbcs (null, "gtk-dialog-warning", true); break;
}
if (buffer != null) {
@@ -43070,7 +43345,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
OS.gtk_icon_factory_lookup_default (buffer),
style,
OS.GTK_TEXT_DIR_NONE,
-@@ -511,11 +511,11 @@
+@@ -511,11 +511,11 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
return 0;
}
@@ -43084,7 +43359,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_realize (widget);
int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, OS.GTK_WIDGET_WINDOW (widget));
GdkRectangle dest = new GdkRectangle ();
-@@ -534,7 +534,7 @@
+@@ -534,7 +534,7 @@ void hookEvents () {
OS.gtk_widget_add_events (handle, OS.GDK_BUTTON_PRESS_MASK);
OS.g_signal_connect_closure (handle, OS.button_press_event, display.closures [BUTTON_PRESS_EVENT], false);
} else {
@@ -43093,7 +43368,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
if (tipWindow != 0) {
OS.g_signal_connect_closure (tipWindow, OS.size_allocate, display.closures [SIZE_ALLOCATE], false);
OS.gtk_widget_add_events (tipWindow, OS.GDK_BUTTON_PRESS_MASK);
-@@ -565,7 +565,7 @@
+@@ -565,7 +565,7 @@ public boolean isVisible () {
void register () {
super.register ();
if ((style & SWT.BALLOON) == 0) {
@@ -43102,7 +43377,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
if (tipWindow != 0) display.addWidget (tipWindow, this);
}
}
-@@ -652,7 +652,7 @@
+@@ -652,7 +652,7 @@ public void setLocation (int x, int y) {
if ((style & SWT.BALLOON) != 0) {
if (OS.GTK_WIDGET_VISIBLE (handle)) configure ();
} else {
@@ -43111,7 +43386,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
if (OS.GTK_WIDGET_VISIBLE (tipWindow)) {
OS.gtk_window_move (tipWindow, x, y);
}
-@@ -744,13 +744,13 @@
+@@ -744,13 +744,13 @@ public void setText (String string) {
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
OS.pango_layout_set_auto_dir (layoutText, false);
}
@@ -43127,7 +43402,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
OS.pango_attr_list_insert (attrList, boldAttr);
OS.pango_layout_set_attributes (layoutText, attrList);
OS.pango_attr_list_unref (attrList);
-@@ -784,13 +784,13 @@
+@@ -784,13 +784,13 @@ public void setVisible (boolean visible) {
configure ();
OS.gtk_widget_show (handle);
} else {
@@ -43143,7 +43418,7 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
OS.GTK_TOOLTIPS_SET_ACTIVE (handle, data);
OS.gtk_tooltips_set_tip (handle, vboxHandle, buffer, null);
}
-@@ -799,17 +799,17 @@
+@@ -799,17 +799,17 @@ public void setVisible (boolean visible) {
if ((style & SWT.BALLOON) != 0) {
OS.gtk_widget_hide (handle);
} else {
@@ -43164,10 +43439,11 @@ diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_hide (tipWindow);
}
return 0;
-diff -urN x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widgets/Tracker.java
---- x86/org/eclipse/swt/widgets/Tracker.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Tracker.java 2009-09-17 08:48:24.000000000 -0400
-@@ -42,7 +42,7 @@
+diff --git a/org/eclipse/swt/widgets/Tracker.java b/org/eclipse/swt/widgets/Tracker.java
+index e5729d3..0c47431 100644
+--- a/org/eclipse/swt/widgets/Tracker.java
++++ b/org/eclipse/swt/widgets/Tracker.java
+@@ -42,7 +42,7 @@ import org.eclipse.swt.events.*;
public class Tracker extends Widget {
Composite parent;
Cursor cursor;
@@ -43176,7 +43452,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widget
boolean tracking, cancelled, grabbed, stippled;
Rectangle [] rectangles = new Rectangle [0], proportions = rectangles;
Rectangle bounds;
-@@ -305,14 +305,14 @@
+@@ -305,14 +305,14 @@ Rectangle [] computeProportions (Rectangle [] rects) {
}
void drawRectangles (Rectangle [] rects) {
@@ -43194,7 +43470,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widget
GdkColor color = new GdkColor ();
OS.gdk_color_white (colormap, color);
OS.gdk_gc_set_foreground (gc, color);
-@@ -365,17 +365,17 @@
+@@ -365,17 +365,17 @@ public boolean getStippled () {
}
boolean grab () {
@@ -43216,7 +43492,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widget
if (result != 0) return result;
GdkEventKey keyEvent = new GdkEventKey ();
OS.memmove (keyEvent, eventPtr, GdkEventKey.sizeof);
-@@ -509,8 +509,8 @@
+@@ -509,8 +509,8 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
return result;
}
@@ -43227,7 +43503,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widget
if (cursor != lastCursor) {
ungrab ();
grabbed = grab ();
-@@ -519,7 +519,7 @@
+@@ -519,7 +519,7 @@ int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ eventPtr
return gtk_mouse (OS.GDK_MOTION_NOTIFY, widget, eventPtr);
}
@@ -43236,7 +43512,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widget
int [] newX = new int [1], newY = new int [1];
OS.gdk_window_get_pointer (window, newX, newY, null);
if (oldX != newX [0] || oldY != newY [0]) {
-@@ -709,7 +709,7 @@
+@@ -709,7 +709,7 @@ public boolean open () {
GdkEvent gdkEvent = new GdkEvent();
while (tracking) {
if (parent != null && parent.isDisposed ()) break;
@@ -43245,7 +43521,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widget
while (true) {
eventPtr = OS.gdk_event_get ();
if (eventPtr != 0) {
-@@ -719,7 +719,7 @@
+@@ -719,7 +719,7 @@ public boolean open () {
}
}
OS.memmove (gdkEvent, eventPtr, GdkEvent.sizeof);
@@ -43254,10 +43530,11 @@ diff -urN x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widget
switch (gdkEvent.type) {
case OS.GDK_MOTION_NOTIFY: gtk_motion_notify_event (widget, eventPtr); break;
case OS.GDK_BUTTON_RELEASE: gtk_button_release_event (widget, eventPtr); break;
-diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widgets/TrayItem.java
---- x86/org/eclipse/swt/widgets/TrayItem.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/TrayItem.java 2009-09-17 08:48:24.000000000 -0400
-@@ -40,8 +40,8 @@
+diff --git a/org/eclipse/swt/widgets/TrayItem.java b/org/eclipse/swt/widgets/TrayItem.java
+index 7d1fb1f..99f74ee 100644
+--- a/org/eclipse/swt/widgets/TrayItem.java
++++ b/org/eclipse/swt/widgets/TrayItem.java
+@@ -40,8 +40,8 @@ public class TrayItem extends Item {
Tray parent;
ToolTip toolTip;
String toolTipText;
@@ -43268,7 +43545,7 @@ diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widge
ImageList imageList;
/**
-@@ -164,20 +164,20 @@
+@@ -164,20 +164,20 @@ void createHandle (int index) {
OS.gtk_container_add (handle, imageHandle);
OS.gtk_widget_show (handle);
OS.gtk_widget_show (imageHandle);
@@ -43297,7 +43574,7 @@ diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widge
XClientMessageEvent event = new XClientMessageEvent ();
event.type = OS.ClientMessage;
event.window = trayWindow;
-@@ -186,7 +186,7 @@
+@@ -186,7 +186,7 @@ void createHandle (int index) {
event.data [0] = OS.GDK_CURRENT_TIME;
event.data [1] = OS.SYSTEM_TRAY_REQUEST_DOCK;
event.data [2] = id;
@@ -43306,7 +43583,7 @@ diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widge
OS.memmove (clientEvent, event, XClientMessageEvent.sizeof);
OS.XSendEvent (xDisplay, trayWindow, false, OS.NoEventMask, clientEvent);
OS.g_free (clientEvent);
-@@ -254,7 +254,7 @@
+@@ -254,7 +254,7 @@ public String getToolTipText () {
return toolTipText;
}
@@ -43315,7 +43592,7 @@ diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widge
postEvent (SWT.Selection);
/*
* Feature in GTK. GTK will generate a single-click event before sending
-@@ -262,10 +262,10 @@
+@@ -262,10 +262,10 @@ int /*long*/ gtk_activate (int /*long*/ widget) {
* the single-click as the current event and for the double-click in the
* event queue.
*/
@@ -43328,7 +43605,7 @@ diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widge
int currEventType = 0;
if (currEvent != 0) {
currEventType = OS.GDK_EVENT_TYPE (currEvent);
-@@ -279,7 +279,7 @@
+@@ -279,7 +279,7 @@ int /*long*/ gtk_activate (int /*long*/ widget) {
return 0;
}
@@ -43337,7 +43614,7 @@ diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widge
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
if (gdkEvent.type == OS.GDK_3BUTTON_PRESS) return 0;
-@@ -295,13 +295,13 @@
+@@ -295,13 +295,13 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr)
return 0;
}
@@ -43353,7 +43630,7 @@ diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widge
if (gdkImagePtr == 0) SWT.error(SWT.ERROR_NO_HANDLES);
GdkImage gdkImage = new GdkImage();
OS.memmove (gdkImage, gdkImagePtr);
-@@ -320,7 +320,7 @@
+@@ -320,7 +320,7 @@ int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
}
}
OS.gtk_widget_realize (handle);
@@ -43362,7 +43639,7 @@ diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widge
OS.gdk_window_shape_combine_region (window, region.handle, 0, 0);
region.dispose ();
}
-@@ -328,7 +328,7 @@
+@@ -328,7 +328,7 @@ int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
return 0;
}
@@ -43371,7 +43648,7 @@ diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widge
sendEvent (SWT.MenuDetect);
return 0;
}
-@@ -468,7 +468,7 @@
+@@ -468,7 +468,7 @@ public void setImage (Image image) {
} else {
imageList.put (imageIndex, image);
}
@@ -43380,464 +43657,11 @@ diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widge
if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
OS.gtk_status_icon_set_from_pixbuf (handle, pixbuf);
OS.gtk_status_icon_set_visible (handle, true);
-diff -urN x86/org/eclipse/swt/widgets/TreeColumn.java x86_64/org/eclipse/swt/widgets/TreeColumn.java
---- x86/org/eclipse/swt/widgets/TreeColumn.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/TreeColumn.java 2009-09-17 08:48:24.000000000 -0400
-@@ -38,7 +38,7 @@
- * @noextend This class is not intended to be subclassed by clients.
- */
- public class TreeColumn extends Item {
-- int /*long*/ labelHandle, imageHandle, buttonHandle;
-+ long /*int*/ labelHandle, imageHandle, buttonHandle;
- Tree parent;
- int modelIndex, lastButton, lastTime, lastX, lastWidth;
- boolean customDraw, useFixedWidth;
-@@ -326,7 +326,7 @@
- return OS.gtk_tree_view_column_get_width (handle);
- }
-
--int /*long*/ gtk_clicked (int /*long*/ widget) {
-+long /*int*/ gtk_clicked (long /*int*/ widget) {
- /*
- * There is no API to get a double click on a table column. Normally, when
- * the mouse is double clicked, this is indicated by GDK_2BUTTON_PRESS
-@@ -336,7 +336,7 @@
- */
- boolean doubleClick = false;
- boolean postEvent = true;
-- int /*long*/ eventPtr = OS.gtk_get_current_event ();
-+ long /*int*/ eventPtr = OS.gtk_get_current_event ();
- if (eventPtr != 0) {
- GdkEventButton gdkEvent = new GdkEventButton ();
- OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
-@@ -368,7 +368,7 @@
- return 0;
- }
-
--int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
-+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
- GdkEvent event = new GdkEvent ();
- OS.memmove (event, gdkEvent, GdkEvent.sizeof);
- switch (event.type) {
-@@ -384,11 +384,11 @@
- return 0;
- }
-
--int /*long*/ gtk_mnemonic_activate (int /*long*/ widget, int /*long*/ arg1) {
-+long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) {
- return parent.gtk_mnemonic_activate (widget, arg1);
- }
-
--int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
-+long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {
- useFixedWidth = false;
- int x = OS.GTK_WIDGET_X (widget);
- int width = OS.GTK_WIDGET_WIDTH (widget);
-@@ -435,7 +435,7 @@
- if ((parent.style & SWT.VIRTUAL) != 0) {
- //NOT DONE
- } else {
-- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
- if (OS.gtk_tree_model_get_iter_first (parent.modelHandle, iter)) {
- do {
- width = Math.max (width, parent.calculateWidth (handle, iter, true));
-@@ -542,7 +542,7 @@
- parent.createRenderers (handle, modelIndex, index == 0, style);
- }
-
--void setFontDescription (int /*long*/ font) {
-+void setFontDescription (long /*int*/ font) {
- OS.gtk_widget_modify_font (labelHandle, font);
- OS.gtk_widget_modify_font (imageHandle, font);
- }
-@@ -557,7 +557,7 @@
- }
- int imageIndex = headerImageList.indexOf (image);
- if (imageIndex == -1) imageIndex = headerImageList.add (image);
-- int /*long*/ pixbuf = headerImageList.getPixbuf (imageIndex);
-+ long /*int*/ pixbuf = headerImageList.getPixbuf (imageIndex);
- OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
- OS.gtk_widget_show (imageHandle);
- } else {
-diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widgets/TreeItem.java
---- x86/org/eclipse/swt/widgets/TreeItem.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/TreeItem.java 2009-09-17 08:48:24.000000000 -0400
-@@ -181,7 +181,7 @@
- this (checkNull (parentItem).parent, parentItem.handle, style, checkIndex (index), true);
- }
-
--TreeItem (Tree parent, int /*long*/ parentIter, int style, int index, boolean create) {
-+TreeItem (Tree parent, long /*int*/ parentIter, int style, int index, boolean create) {
- super (parent, style);
- this.parent = parent;
- if (create) {
-@@ -212,7 +212,7 @@
- }
-
- Color _getBackground () {
-- int /*long*/ [] ptr = new int /*long*/ [1];
-+ long /*int*/ [] ptr = new long /*int*/ [1];
- OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.BACKGROUND_COLUMN, ptr, -1);
- if (ptr [0] == 0) return parent.getBackground ();
- GdkColor gdkColor = new GdkColor ();
-@@ -223,7 +223,7 @@
- Color _getBackground (int index) {
- int count = Math.max (1, parent.columnCount);
- if (0 > index || index > count - 1) return _getBackground ();
-- int /*long*/ [] ptr = new int /*long*/ [1];
-+ long /*int*/ [] ptr = new long /*int*/ [1];
- int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
- OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_BACKGROUND, ptr, -1);
- if (ptr [0] == 0) return _getBackground ();
-@@ -233,13 +233,13 @@
- }
-
- boolean _getChecked () {
-- int /*long*/ [] ptr = new int /*long*/ [1];
-+ long /*int*/ [] ptr = new long /*int*/ [1];
- OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.CHECKED_COLUMN, ptr, -1);
- return ptr [0] != 0;
- }
-
- Color _getForeground () {
-- int /*long*/ [] ptr = new int /*long*/ [1];
-+ long /*int*/ [] ptr = new long /*int*/ [1];
- OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.FOREGROUND_COLUMN, ptr, -1);
- if (ptr [0] == 0) return parent.getForeground ();
- GdkColor gdkColor = new GdkColor ();
-@@ -250,7 +250,7 @@
- Color _getForeground (int index) {
- int count = Math.max (1, parent.columnCount);
- if (0 > index || index > count - 1) return _getForeground ();
-- int /*long*/ [] ptr = new int /*long*/ [1];
-+ long /*int*/ [] ptr = new long /*int*/ [1];
- int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
- OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_FOREGROUND, ptr, -1);
- if (ptr [0] == 0) return _getForeground ();
-@@ -262,7 +262,7 @@
- Image _getImage (int index) {
- int count = Math.max (1, parent.getColumnCount ());
- if (0 > index || index > count - 1) return null;
-- int /*long*/ [] ptr = new int /*long*/ [1];
-+ long /*int*/ [] ptr = new long /*int*/ [1];
- int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
- OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_PIXBUF, ptr, -1);
- if (ptr [0] == 0) return null;
-@@ -275,7 +275,7 @@
- String _getText (int index) {
- int count = Math.max (1, parent.getColumnCount ());
- if (0 > index || index > count - 1) return "";
-- int /*long*/ [] ptr = new int /*long*/ [1];
-+ long /*int*/ [] ptr = new long /*int*/ [1];
- int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
- OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_TEXT, ptr, -1);
- if (ptr [0] == 0) return ""; //$NON-NLS-1$
-@@ -423,15 +423,15 @@
- // TODO fully test on early and later versions of GTK
- checkWidget();
- if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
-- int /*long*/ parentHandle = parent.handle;
-- int /*long*/ column = 0;
-+ long /*int*/ parentHandle = parent.handle;
-+ long /*int*/ column = 0;
- if (index >= 0 && index < parent.columnCount) {
- column = parent.columns [index].handle;
- } else {
- column = OS.gtk_tree_view_get_column (parentHandle, index);
- }
- if (column == 0) return new Rectangle (0, 0, 0, 0);
-- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
- OS.gtk_widget_realize (parentHandle);
- GdkRectangle rect = new GdkRectangle ();
- OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
-@@ -494,14 +494,14 @@
- // shifted a bit too far right on later versions of GTK - however, old Tree also had this problem
- checkWidget ();
- if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
-- int /*long*/ parentHandle = parent.handle;
-- int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, 0);
-+ long /*int*/ parentHandle = parent.handle;
-+ long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, 0);
- if (column == 0) return new Rectangle (0, 0, 0, 0);
-- int /*long*/ textRenderer = parent.getTextRenderer (column);
-- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);
-+ long /*int*/ textRenderer = parent.getTextRenderer (column);
-+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
- if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);
-
-- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
- OS.gtk_widget_realize (parentHandle);
-
- boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
-@@ -594,7 +594,7 @@
- */
- public boolean getExpanded () {
- checkWidget();
-- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
- boolean answer = OS.gtk_tree_view_row_expanded (parent.handle, path);
- OS.gtk_tree_path_free (path);
- return answer;
-@@ -746,18 +746,18 @@
- // TODO fully test on early and later versions of GTK
- checkWidget ();
- if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
-- int /*long*/ parentHandle = parent.handle;
-- int /*long*/ column = 0;
-+ long /*int*/ parentHandle = parent.handle;
-+ long /*int*/ column = 0;
- if (index >= 0 && index < parent.getColumnCount ()) {
- column = parent.columns [index].handle;
- } else {
- column = OS.gtk_tree_view_get_column (parentHandle, index);
- }
- if (column == 0) return new Rectangle (0, 0, 0, 0);
-- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);
-+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
- if (pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);
- GdkRectangle rect = new GdkRectangle ();
-- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
- OS.gtk_widget_realize (parentHandle);
- OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
- if ((parent.getStyle () & SWT.MIRRORED) != 0) rect.x = parent.getClientWidth () - rect.width - rect.x;
-@@ -908,12 +908,12 @@
- */
- public TreeItem getParentItem () {
- checkWidget();
-- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
- TreeItem item = null;
- int depth = OS.gtk_tree_path_get_depth (path);
- if (depth > 1) {
- OS.gtk_tree_path_up (path);
-- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
- if (OS.gtk_tree_model_get_iter (parent.modelHandle, iter, path)) {
- item = parent._getItem (iter);
- }
-@@ -971,19 +971,19 @@
- if (0 > index || index > count - 1) return new Rectangle (0, 0, 0, 0);
- // TODO fully test on early and later versions of GTK
- // shifted a bit too far right on later versions of GTK - however, old Tree also had this problem
-- int /*long*/ parentHandle = parent.handle;
-- int /*long*/ column = 0;
-+ long /*int*/ parentHandle = parent.handle;
-+ long /*int*/ column = 0;
- if (index >= 0 && index < parent.columnCount) {
- column = parent.columns [index].handle;
- } else {
- column = OS.gtk_tree_view_get_column (parentHandle, index);
- }
- if (column == 0) return new Rectangle (0, 0, 0, 0);
-- int /*long*/ textRenderer = parent.getTextRenderer (column);
-- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);
-+ long /*int*/ textRenderer = parent.getTextRenderer (column);
-+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
- if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);
-
-- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
- OS.gtk_widget_realize (parentHandle);
-
- boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
-@@ -1066,8 +1066,8 @@
- if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
- int index = -1;
- boolean isParent = false;
-- int /*long*/ currentPath = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-- int /*long*/ parentPath = OS.gtk_tree_model_get_path (parent.modelHandle, item.handle);
-+ long /*int*/ currentPath = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-+ long /*int*/ parentPath = OS.gtk_tree_model_get_path (parent.modelHandle, item.handle);
- int depth = OS.gtk_tree_path_get_depth (parentPath);
- if (depth > 1 && OS.gtk_tree_path_up(parentPath)) {
- if (OS.gtk_tree_path_compare(currentPath, parentPath) == 0) isParent = true;
-@@ -1075,9 +1075,9 @@
- OS.gtk_tree_path_free (currentPath);
- OS.gtk_tree_path_free (parentPath);
- if (!isParent) return index;
-- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, item.handle);
-+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, item.handle);
- if (depth > 1) {
-- int /*long*/ indices = OS.gtk_tree_path_get_indices (path);
-+ long /*int*/ indices = OS.gtk_tree_path_get_indices (path);
- if (indices != 0) {
- int[] temp = new int[depth];
- OS.memmove (temp, indices, 4 * temp.length);
-@@ -1089,13 +1089,13 @@
- }
-
- void redraw () {
-- int /*long*/ parentHandle = parent.handle;
-+ long /*int*/ parentHandle = parent.handle;
- if ((OS.GTK_WIDGET_FLAGS (parentHandle) & OS.GTK_REALIZED) != 0) {
-- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
- GdkRectangle rect = new GdkRectangle ();
- OS.gtk_tree_view_get_cell_area (parentHandle, path, 0, rect);
- OS.gtk_tree_path_free (path);
-- int /*long*/ window = OS.gtk_tree_view_get_bin_window (parentHandle);
-+ long /*int*/ window = OS.gtk_tree_view_get_bin_window (parentHandle);
- rect.x = 0;
- int [] w = new int [1], h = new int [1];
- OS.gdk_drawable_get_size (window, w, h);
-@@ -1136,15 +1136,15 @@
- */
- public void removeAll () {
- checkWidget ();
-- int /*long*/ modelHandle = parent.modelHandle;
-+ long /*int*/ modelHandle = parent.modelHandle;
- int length = OS.gtk_tree_model_iter_n_children (modelHandle, handle);
- if (length == 0) return;
-- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
- if (iter == 0) error (SWT.ERROR_NO_HANDLES);
- if (parent.fixAccessibility ()) {
- parent.ignoreAccessibility = true;
- }
-- int /*long*/ selection = OS.gtk_tree_view_get_selection (parent.handle);
-+ long /*int*/ selection = OS.gtk_tree_view_get_selection (parent.handle);
- int [] value = new int [1];
- while (OS.gtk_tree_model_iter_children (modelHandle, iter, handle)) {
- OS.gtk_tree_model_get (modelHandle, iter, Tree.ID_COLUMN, value, -1);
-@@ -1249,16 +1249,16 @@
- boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
- if (!customDraw) {
- if ((parent.style & SWT.VIRTUAL) == 0) {
-- int /*long*/ parentHandle = parent.handle;
-- int /*long*/ column = 0;
-+ long /*int*/ parentHandle = parent.handle;
-+ long /*int*/ column = 0;
- if (parent.columnCount > 0) {
- column = parent.columns [index].handle;
- } else {
- column = OS.gtk_tree_view_get_column (parentHandle, index);
- }
- if (column == 0) return;
-- int /*long*/ textRenderer = parent.getTextRenderer (column);
-- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);
-+ long /*int*/ textRenderer = parent.getTextRenderer (column);
-+ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
- OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
- OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
- }
-@@ -1309,7 +1309,7 @@
- */
- public void setExpanded (boolean expanded) {
- checkWidget();
-- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
- if (expanded) {
- OS.g_signal_handlers_block_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_EXPAND_ROW);
- OS.gtk_tree_view_expand_row (parent.handle, path, false);
-@@ -1351,7 +1351,7 @@
- if (oldFont == font) return;
- this.font = font;
- if (oldFont != null && oldFont.equals (font)) return;
-- int /*long*/ fontHandle = font != null ? font.handle : 0;
-+ long /*int*/ fontHandle = font != null ? font.handle : 0;
- OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.FONT_COLUMN, fontHandle, -1);
- /*
- * Bug in GTK. When using fixed-height-mode,
-@@ -1402,7 +1402,7 @@
- if (oldFont != null && oldFont.equals (font)) return;
-
- int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
-- int /*long*/ fontHandle = font != null ? font.handle : 0;
-+ long /*int*/ fontHandle = font != null ? font.handle : 0;
- OS.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_FONT, fontHandle, -1);
- /*
- * Bug in GTK. When using fixed-height-mode,
-@@ -1420,16 +1420,16 @@
- boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
- if (!customDraw) {
- if ((parent.style & SWT.VIRTUAL) == 0) {
-- int /*long*/ parentHandle = parent.handle;
-- int /*long*/ column = 0;
-+ long /*int*/ parentHandle = parent.handle;
-+ long /*int*/ column = 0;
- if (parent.columnCount > 0) {
- column = parent.columns [index].handle;
- } else {
- column = OS.gtk_tree_view_get_column (parentHandle, index);
- }
- if (column == 0) return;
-- int /*long*/ textRenderer = parent.getTextRenderer (column);
-- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);
-+ long /*int*/ textRenderer = parent.getTextRenderer (column);
-+ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
- OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
- OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
- }
-@@ -1529,16 +1529,16 @@
- boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
- if (!customDraw) {
- if ((parent.style & SWT.VIRTUAL) == 0) {
-- int /*long*/ parentHandle = parent.handle;
-- int /*long*/ column = 0;
-+ long /*int*/ parentHandle = parent.handle;
-+ long /*int*/ column = 0;
- if (parent.columnCount > 0) {
- column = parent.columns [index].handle;
- } else {
- column = OS.gtk_tree_view_get_column (parentHandle, index);
- }
- if (column == 0) return;
-- int /*long*/ textRenderer = parent.getTextRenderer (column);
-- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);
-+ long /*int*/ textRenderer = parent.getTextRenderer (column);
-+ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
- OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
- OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
- }
-@@ -1571,7 +1571,7 @@
- * GTK+'s "inconsistent" state does not match SWT's concept of grayed.
- * Render checked+grayed as "inconsistent", unchecked+grayed as blank.
- */
-- int /*long*/ [] ptr = new int /*long*/ [1];
-+ long /*int*/ [] ptr = new long /*int*/ [1];
- OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.CHECKED_COLUMN, ptr, -1);
- OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.GRAYED_COLUMN, ptr [0] == 0 ? false : grayed, -1);
- cached = true;
-@@ -1603,7 +1603,7 @@
- }
- int count = Math.max (1, parent.getColumnCount ());
- if (0 > index || index > count - 1) return;
-- int /*long*/ pixbuf = 0;
-+ long /*int*/ pixbuf = 0;
- if (image != null) {
- ImageList imageList = parent.imageList;
- if (imageList == null) imageList = parent.imageList = new ImageList ();
-@@ -1633,10 +1633,10 @@
- if ((parent.style & SWT.VIRTUAL) != 0 && parent.currentItem == null) {
- if (OS.GTK_VERSION >= OS.VERSION (2, 3, 2)) {
- if (image != null) {
-- int /*long*/parentHandle = parent.handle;
-- int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, index);
-+ long /*int*/parentHandle = parent.handle;
-+ long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, index);
- int [] w = new int [1];
-- int /*long*/ pixbufRenderer = parent.getPixbufRenderer(column);
-+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer(column);
- OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w);
- if (w[0] < image.getBounds().width) {
- /*
-@@ -1644,7 +1644,7 @@
- * are relying on the fact that it is done as part of modifying
- * the style.
- */
-- int /*long*/ style = OS.gtk_widget_get_modifier_style (parentHandle);
-+ long /*int*/ style = OS.gtk_widget_get_modifier_style (parentHandle);
- parent.modifyStyle (parentHandle, style);
- }
- }
-diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tree.java
---- x86/org/eclipse/swt/widgets/Tree.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Tree.java 2009-09-17 08:48:24.000000000 -0400
-@@ -75,9 +75,9 @@
+diff --git a/org/eclipse/swt/widgets/Tree.java b/org/eclipse/swt/widgets/Tree.java
+index e6a26ce..12b0605 100644
+--- a/org/eclipse/swt/widgets/Tree.java
++++ b/org/eclipse/swt/widgets/Tree.java
+@@ -75,9 +75,9 @@ import org.eclipse.swt.events.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class Tree extends Composite {
@@ -43849,7 +43673,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
TreeItem[] items;
TreeColumn [] columns;
TreeColumn sortColumn;
-@@ -155,14 +155,14 @@
+@@ -155,14 +155,14 @@ void _addListener (int eventType, Listener listener) {
}
}
@@ -43867,7 +43691,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (depth > 1) {
OS.gtk_tree_path_up (path);
parentIter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-@@ -174,8 +174,8 @@
+@@ -174,8 +174,8 @@ TreeItem _getItem (int /*long*/ iter) {
return items [id];
}
@@ -43878,7 +43702,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_model_iter_nth_child(modelHandle, iter, parentIter, index);
int id = getId (iter, true);
OS.g_free (iter);
-@@ -183,7 +183,7 @@
+@@ -183,7 +183,7 @@ TreeItem _getItem (int /*long*/ parentIter, int index) {
return items [id] = new TreeItem (this, parentIter, SWT.NONE, index, false);
}
@@ -43887,7 +43711,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (queryModel) {
int[] value = new int[1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1);
-@@ -219,7 +219,7 @@
+@@ -219,7 +219,7 @@ static int checkStyle (int style) {
return checkBits (style, SWT.SINGLE, SWT.MULTI, 0, 0, 0, 0);
}
@@ -43896,7 +43720,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (cell == ignoreCell) return 0;
TreeItem item = _getItem (iter);
if (item != null) OS.g_object_set_qdata (cell, Display.SWT_OBJECT_INDEX2, item.handle);
-@@ -246,7 +246,7 @@
+@@ -246,7 +246,7 @@ int /*long*/ cellDataProc (int /*long*/ tree_column, int /*long*/ cell, int /*lo
* fix is to only provide the data if the row is visible.
*/
if (OS.GTK_VERSION < OS.VERSION (2, 3, 2)) {
@@ -43905,7 +43729,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_widget_realize (handle);
GdkRectangle visible = new GdkRectangle ();
OS.gtk_tree_view_get_visible_rect (handle, visible);
-@@ -268,7 +268,7 @@
+@@ -268,7 +268,7 @@ int /*long*/ cellDataProc (int /*long*/ tree_column, int /*long*/ cell, int /*lo
setData = checkData (item);
}
}
@@ -43914,7 +43738,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (setData) {
if (isPixbuf) {
ptr [0] = 0;
-@@ -406,7 +406,7 @@
+@@ -406,7 +406,7 @@ public void addTreeListener(TreeListener listener) {
addListener (SWT.Collapse, typedListener);
}
@@ -43923,7 +43747,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
/*
* Bug in GTK. The width calculated by gtk_tree_view_column_cell_get_size()
-@@ -420,7 +420,7 @@
+@@ -420,7 +420,7 @@ int calculateWidth (int /*long*/ column, int /*long*/ iter, boolean recurse) {
int width = 0;
int [] w = new int [1];
@@ -43932,7 +43756,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.gtk_tree_view_get_expander_column (handle) == column) {
/* indent */
-@@ -435,11 +435,11 @@
+@@ -435,11 +435,11 @@ int calculateWidth (int /*long*/ column, int /*long*/ iter, boolean recurse) {
}
OS.gtk_widget_style_get(handle, OS.focus_line_width, w, 0);
width += 2 * w [0];
@@ -43947,7 +43771,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (renderer != 0) {
OS.gtk_cell_renderer_get_size (renderer, handle, null, null, null, w, null);
width += w [0];
-@@ -452,7 +452,7 @@
+@@ -452,7 +452,7 @@ int calculateWidth (int /*long*/ column, int /*long*/ iter, boolean recurse) {
if (path == 0) path = OS.gtk_tree_model_get_path (modelHandle, iter);
boolean expanded = OS.gtk_tree_view_row_expanded (handle, path);
if (expanded) {
@@ -43956,7 +43780,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
boolean valid = OS.gtk_tree_model_iter_children (modelHandle, childIter, iter);
while (valid) {
width = Math.max (width, calculateWidth (column, childIter, true));
-@@ -498,8 +498,8 @@
+@@ -498,8 +498,8 @@ public void clear(int index, boolean all) {
clear (0, index, all);
}
@@ -43967,7 +43791,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_model_iter_nth_child(modelHandle, iter, parentIter, index);
int[] value = new int[1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1);
-@@ -534,10 +534,10 @@
+@@ -534,10 +534,10 @@ public void clearAll (boolean all) {
checkWidget ();
clearAll (all, 0);
}
@@ -43980,7 +43804,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, parentIter);
int[] value = new int[1];
while (valid) {
-@@ -563,13 +563,13 @@
+@@ -563,13 +563,13 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
return size;
}
@@ -43998,7 +43822,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (newItem == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_tree_store_append (newModel, newItem, newParent);
int [] index = new int [1];
-@@ -578,9 +578,9 @@
+@@ -578,9 +578,9 @@ void copyModel (int /*long*/ oldModel, int oldStart, int /*long*/ newModel, int
if (index [0] != -1) {
item = items [index [0]];
if (item != null) {
@@ -44010,7 +43834,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
for (int j = 0; j < FIRST_COLUMN; j++) {
OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);
OS.gtk_tree_store_set (newModel, newItem, j, ptr [0], -1);
-@@ -605,7 +605,7 @@
+@@ -605,7 +605,7 @@ void copyModel (int /*long*/ oldModel, int oldStart, int /*long*/ newModel, int
}
} while (OS.gtk_tree_model_iter_next(oldModel, iter));
for (int i = 0; i < oldItems.length; i++) {
@@ -44019,7 +43843,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (oldItem != 0) {
OS.gtk_tree_store_remove (oldModel, oldItem);
OS.g_free (oldItem);
-@@ -638,17 +638,17 @@
+@@ -638,17 +638,17 @@ void createColumn (TreeColumn column, int index) {
modelIndex++;
}
if (modelIndex == modelLength) {
@@ -44042,7 +43866,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (columnHandle == 0) error (SWT.ERROR_NO_HANDLES);
if (index == 0 && columnCount > 0) {
TreeColumn checkColumn = columns [0];
-@@ -705,7 +705,7 @@
+@@ -705,7 +705,7 @@ void createHandle (int index) {
OS.gtk_fixed_set_has_window (fixedHandle, true);
scrolledHandle = OS.gtk_scrolled_window_new (0, 0);
if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES);
@@ -44051,7 +43875,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
modelHandle = OS.gtk_tree_store_newv (types.length, types);
if (modelHandle == 0) error (SWT.ERROR_NO_HANDLES);
handle = OS.gtk_tree_view_new_with_model (modelHandle);
-@@ -720,7 +720,7 @@
+@@ -720,7 +720,7 @@ void createHandle (int index) {
OS.gtk_container_add (scrolledHandle, handle);
int mode = (style & SWT.MULTI) != 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE;
@@ -44060,7 +43884,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
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;
-@@ -769,11 +769,11 @@
+@@ -769,11 +769,11 @@ void createItem (TreeColumn column, int index) {
} else {
createColumn (column, index);
}
@@ -44075,7 +43899,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_container_add (boxHandle, imageHandle);
OS.gtk_container_add (boxHandle, labelHandle);
-@@ -782,7 +782,7 @@
+@@ -782,7 +782,7 @@ void createItem (TreeColumn column, int index) {
column.labelHandle = labelHandle;
column.imageHandle = imageHandle;
OS.gtk_tree_view_column_set_widget (column.handle, boxHandle);
@@ -44084,7 +43908,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
while (widget != handle) {
if (OS.GTK_IS_BUTTON (widget)) {
column.buttonHandle = widget;
-@@ -816,7 +816,7 @@
+@@ -816,7 +816,7 @@ void createItem (TreeColumn column, int index) {
}
}
@@ -44093,7 +43917,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
int count = OS.gtk_tree_model_iter_n_children (modelHandle, parentIter);
if (index == -1) index = count;
if (!(0 <= index && index <= count)) error (SWT.ERROR_INVALID_RANGE);
-@@ -836,7 +836,7 @@
+@@ -836,7 +836,7 @@ void createItem (TreeItem item, int /*long*/ parentIter, int index) {
modelChanged = true;
}
@@ -44102,7 +43926,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_column_clear (columnHandle);
if ((style & SWT.CHECK) != 0 && check) {
OS.gtk_tree_view_column_pack_start (columnHandle, checkRenderer, false);
-@@ -859,9 +859,9 @@
+@@ -859,9 +859,9 @@ void createRenderers (int /*long*/ columnHandle, int modelIndex, boolean check,
OS.g_object_set_qdata (checkRenderer, Display.SWT_OBJECT_INDEX1, columnHandle);
}
}
@@ -44114,7 +43938,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES);
if (ownerDraw) {
-@@ -971,7 +971,7 @@
+@@ -971,7 +971,7 @@ public void deselect (TreeItem item) {
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
if (item.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
boolean fixColumn = showFirstColumn ();
@@ -44123,7 +43947,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_unselect_iter (selection, item.handle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -989,7 +989,7 @@
+@@ -989,7 +989,7 @@ public void deselect (TreeItem item) {
public void deselectAll() {
checkWidget();
boolean fixColumn = showFirstColumn ();
@@ -44132,7 +43956,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
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);
-@@ -1003,7 +1003,7 @@
+@@ -1003,7 +1003,7 @@ void destroyItem (TreeColumn column) {
index++;
}
if (index == columnCount) return;
@@ -44141,7 +43965,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (columnCount == 1) {
firstCustomDraw = column.customDraw;
}
-@@ -1011,11 +1011,11 @@
+@@ -1011,11 +1011,11 @@ void destroyItem (TreeColumn column) {
columns [columnCount] = null;
OS.gtk_tree_view_remove_column (handle, columnHandle);
if (columnCount == 0) {
@@ -44157,7 +43981,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_set_model (handle, newModel);
OS.g_object_unref (oldModel);
modelHandle = newModel;
-@@ -1025,7 +1025,7 @@
+@@ -1025,7 +1025,7 @@ void destroyItem (TreeColumn column) {
for (int i=0; i<items.length; i++) {
TreeItem item = items [i];
if (item != null) {
@@ -44166,7 +43990,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
int modelIndex = column.modelIndex;
OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_PIXBUF, 0, -1);
OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_TEXT, 0, -1);
-@@ -1090,7 +1090,7 @@
+@@ -1090,7 +1090,7 @@ void destroyItem (TreeItem item) {
if (OS.GTK_VERSION < OS.VERSION (2, 0, 6)) {
int length = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
if (length > 0) {
@@ -44175,7 +43999,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, 0);
while (valid) {
if (item.handle == iter) {
-@@ -1102,7 +1102,7 @@
+@@ -1102,7 +1102,7 @@ void destroyItem (TreeItem item) {
OS.g_free (iter);
}
}
@@ -44184,7 +44008,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_store_remove (modelHandle, item.handle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -1112,10 +1112,10 @@
+@@ -1112,10 +1112,10 @@ void destroyItem (TreeItem item) {
boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
boolean selected = false;
if (filter) {
@@ -44197,7 +44021,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) selected = true;
OS.gtk_tree_path_free (path [0]);
}
-@@ -1128,7 +1128,7 @@
+@@ -1128,7 +1128,7 @@ boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
return dragDetect;
}
@@ -44206,7 +44030,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
return paintWindow ();
}
-@@ -1166,13 +1166,13 @@
+@@ -1166,13 +1166,13 @@ public Rectangle getClientArea () {
checkWidget ();
forceResize ();
OS.gtk_widget_realize (handle);
@@ -44223,7 +44047,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle);
int height = (state & ZERO_HEIGHT) != 0 ? 0 : OS.GTK_WIDGET_HEIGHT (clientHandle);
return new Rectangle (fixedX [0] - binX [0], fixedY [0] - binY [0], width, height);
-@@ -1272,13 +1272,13 @@
+@@ -1272,13 +1272,13 @@ public int getColumnCount () {
public int [] getColumnOrder () {
checkWidget ();
if (columnCount == 0) return new int [0];
@@ -44240,7 +44064,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (column != 0) {
for (int j=0; j<columnCount; j++) {
if (columns [j].handle == column) {
-@@ -1293,8 +1293,8 @@
+@@ -1293,8 +1293,8 @@ public int [] getColumnOrder () {
return order;
}
@@ -44251,7 +44075,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
// per row data
types [ID_COLUMN] = OS.G_TYPE_INT ();
types [CHECKED_COLUMN] = OS.G_TYPE_BOOLEAN ();
-@@ -1350,11 +1350,11 @@
+@@ -1350,11 +1350,11 @@ public TreeColumn [] getColumns () {
}
TreeItem getFocusItem () {
@@ -44265,7 +44089,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.gtk_tree_model_get_iter (modelHandle, iter, path [0])) {
int [] index = new int [1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
-@@ -1405,7 +1405,7 @@
+@@ -1405,7 +1405,7 @@ public int getHeaderHeight () {
GtkRequisition requisition = new GtkRequisition ();
int height = 0;
for (int i=0; i<columnCount; i++) {
@@ -44274,7 +44098,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (buttonHandle != 0) {
OS.gtk_widget_size_request (buttonHandle, requisition);
height = Math.max (height, requisition.height);
-@@ -1414,8 +1414,8 @@
+@@ -1414,8 +1414,8 @@ public int getHeaderHeight () {
return height;
}
OS.gtk_widget_realize (handle);
@@ -44285,7 +44109,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
int [] binY = new int [1];
OS.gdk_window_get_origin (binWindow, null, binY);
int [] fixedY = new int [1];
-@@ -1498,13 +1498,13 @@
+@@ -1498,13 +1498,13 @@ public TreeItem getItem (int index) {
public TreeItem getItem (Point point) {
checkWidget ();
if (point == null) error (SWT.ERROR_NULL_ARGUMENT);
@@ -44302,7 +44126,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.gtk_tree_model_get_iter (modelHandle, iter, path [0])) {
boolean overExpander = false;
if (OS.gtk_tree_view_get_expander_column (handle) == columnHandle [0]) {
-@@ -1561,7 +1561,7 @@
+@@ -1561,7 +1561,7 @@ public int getItemHeight () {
checkWidget ();
int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
if (itemCount == 0) {
@@ -44311,7 +44135,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
int [] w = new int [1], h = new int [1];
ignoreSize = true;
OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
-@@ -1569,11 +1569,11 @@
+@@ -1569,11 +1569,11 @@ public int getItemHeight () {
return h [0];
} else {
int height = 0;
@@ -44325,7 +44149,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
int [] w = new int [1], h = new int [1];
OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
-@@ -1606,7 +1606,7 @@
+@@ -1606,7 +1606,7 @@ public TreeItem [] getItems () {
return getItems (0);
}
@@ -44334,7 +44158,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
int length = OS.gtk_tree_model_iter_n_children (modelHandle, parent);
TreeItem[] result = new TreeItem [length];
if (length == 0) return result;
-@@ -1617,7 +1617,7 @@
+@@ -1617,7 +1617,7 @@ TreeItem [] getItems (int /*long*/ parent) {
} else {
int i = 0;
int[] index = new int [1];
@@ -44343,7 +44167,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, parent);
while (valid) {
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
-@@ -1671,14 +1671,14 @@
+@@ -1671,14 +1671,14 @@ public TreeItem getParentItem () {
return null;
}
@@ -44362,7 +44186,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.GTK_IS_CELL_RENDERER_PIXBUF (renderer)) {
pixbufRenderer = renderer;
break;
-@@ -1707,7 +1707,7 @@
+@@ -1707,7 +1707,7 @@ int /*long*/ getPixbufRenderer (int /*long*/ column) {
*/
public TreeItem[] getSelection () {
checkWidget();
@@ -44371,7 +44195,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
display.treeSelectionLength = 0;
display.treeSelection = new int [items.length];
-@@ -1721,15 +1721,15 @@
+@@ -1721,15 +1721,15 @@ public TreeItem[] getSelection () {
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
*/
@@ -44391,7 +44215,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.gtk_tree_model_get_iter (modelHandle, iter, data)) {
treeSelection [length] = _getItem (iter);
length++;
-@@ -1759,7 +1759,7 @@
+@@ -1759,7 +1759,7 @@ public TreeItem[] getSelection () {
*/
public int getSelectionCount () {
checkWidget();
@@ -44400,7 +44224,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
display.treeSelectionLength = 0;
display.treeSelection = null;
-@@ -1811,14 +1811,14 @@
+@@ -1811,14 +1811,14 @@ public int getSortDirection () {
return sortDirection;
}
@@ -44419,7 +44243,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.GTK_IS_CELL_RENDERER_TEXT (renderer)) {
textRenderer = renderer;
break;
-@@ -1845,12 +1845,12 @@
+@@ -1845,12 +1845,12 @@ int /*long*/ getTextRenderer (int /*long*/ column) {
*/
public TreeItem getTopItem () {
checkWidget ();
@@ -44434,7 +44258,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.gtk_tree_model_get_iter (modelHandle, iter, path [0])) {
item = _getItem (iter);
}
-@@ -1859,11 +1859,11 @@
+@@ -1859,11 +1859,11 @@ public TreeItem getTopItem () {
return item;
}
@@ -44448,7 +44272,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (result != 0) return result;
/*
* Feature in GTK. In a multi-select tree view, when multiple items are already
-@@ -1875,10 +1875,10 @@
+@@ -1875,10 +1875,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
*/
int button = gdkEvent.button;
if (button == 3 && gdkEvent.type == OS.GDK_BUTTON_PRESS) {
@@ -44461,7 +44285,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;
OS.gtk_tree_path_free (path [0]);
}
-@@ -1893,10 +1893,10 @@
+@@ -1893,10 +1893,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
* widget from automatically selecting the first item.
*/
if ((style & SWT.SINGLE) != 0 && getSelectionCount () == 0) {
@@ -44474,7 +44298,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
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);
-@@ -1916,13 +1916,13 @@
+@@ -1916,13 +1916,13 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
@@ -44491,7 +44315,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
TreeItem item = getFocusItem ();
if (item != null) {
Event event = new Event ();
-@@ -1932,14 +1932,14 @@
+@@ -1932,14 +1932,14 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
return 0;
}
@@ -44509,7 +44333,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (result != 0) return result;
if (OS.GTK_VERSION < OS.VERSION (2, 2 ,0)) {
/*
-@@ -1963,14 +1963,14 @@
+@@ -1963,14 +1963,14 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
return result;
}
@@ -44528,7 +44352,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
/*
* Bug in GTK. The context menu for the typeahead in GtkTreeViewer
* opens in the bottom right corner of the screen when Shift+F10
-@@ -1983,10 +1983,10 @@
+@@ -1983,10 +1983,10 @@ int /*long*/ gtk_popup_menu (int /*long*/ widget) {
return OS.GTK_VERSION < OS.VERSION (2, 6, 5) ? 1 : result;
}
@@ -44541,7 +44365,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.gtk_tree_model_get_iter (modelHandle, iter, path)) {
int [] index = new int [1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
-@@ -2013,7 +2013,7 @@
+@@ -2013,7 +2013,7 @@ int gtk_row_inserted (int model, int path, int iter) {
return 0;
}
@@ -44550,7 +44374,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
int [] index = new int [1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
TreeItem item = items [index [0]];
-@@ -2051,7 +2051,7 @@
+@@ -2051,7 +2051,7 @@ int /*long*/ gtk_test_collapse_row (int /*long*/ tree, int /*long*/ iter, int /*
return 0;
}
@@ -44559,7 +44383,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
int [] index = new int [1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
TreeItem item = items [index [0]];
-@@ -2093,11 +2093,11 @@
+@@ -2093,11 +2093,11 @@ int /*long*/ gtk_test_expand_row (int /*long*/ tree, int /*long*/ iter, int /*lo
return 0;
}
@@ -44574,7 +44398,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (OS.gtk_tree_model_get_iter (modelHandle, iter, path)) {
item = _getItem (iter);
}
-@@ -2113,7 +2113,7 @@
+@@ -2113,7 +2113,7 @@ int /*long*/ gtk_toggled (int /*long*/ renderer, int /*long*/ pathStr) {
return 0;
}
@@ -44583,7 +44407,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
/*
* Bug in GTK. For some reason, gtk_widget_size_request() fails
* to include the height of the tree view items when there are
-@@ -2124,17 +2124,17 @@
+@@ -2124,17 +2124,17 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {
super.gtk_widget_size_request (widget, requisition);
return;
}
@@ -44604,7 +44428,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (fixVisible) {
columnHandle = OS.g_list_data (columns);
OS.gtk_tree_view_column_set_visible (columnHandle, true);
-@@ -2147,13 +2147,13 @@
+@@ -2147,13 +2147,13 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {
}
void hideFirstColumn () {
@@ -44620,7 +44444,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_connect_closure (selection, OS.changed, display.closures [CHANGED], false);
OS.g_signal_connect_closure (handle, OS.row_activated, display.closures [ROW_ACTIVATED], false);
OS.g_signal_connect_closure (handle, OS.test_expand_row, display.closures [TEST_EXPAND_ROW], false);
-@@ -2221,10 +2221,10 @@
+@@ -2221,10 +2221,10 @@ public int indexOf (TreeItem item) {
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
int index = -1;
@@ -44633,7 +44457,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (indices != 0) {
int[] temp = new int[1];
OS.memmove (temp, indices, 4);
-@@ -2237,7 +2237,7 @@
+@@ -2237,7 +2237,7 @@ public int indexOf (TreeItem item) {
boolean mnemonicHit (char key) {
for (int i=0; i<columnCount; i++) {
@@ -44642,7 +44466,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;
}
return false;
-@@ -2245,13 +2245,13 @@
+@@ -2245,13 +2245,13 @@ boolean mnemonicHit (char key) {
boolean mnemonicMatch (char key) {
for (int i=0; i<columnCount; i++) {
@@ -44658,7 +44482,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_widget_realize (handle);
return OS.gtk_tree_view_get_bin_window (handle);
}
-@@ -2298,9 +2298,9 @@
+@@ -2298,9 +2298,9 @@ void releaseItem (TreeItem item, boolean release) {
items [index [0]] = null;
}
@@ -44670,7 +44494,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, parentIter);
while (valid) {
releaseItems (iter);
-@@ -2350,14 +2350,14 @@
+@@ -2350,14 +2350,14 @@ void releaseWidget () {
currentItem = null;
}
@@ -44688,7 +44512,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (iter == 0) error (SWT.ERROR_NO_HANDLES);
if (fixAccessibility ()) {
ignoreAccessibility = true;
-@@ -2397,7 +2397,7 @@
+@@ -2397,7 +2397,7 @@ public void removeAll () {
if (item != null && !item.isDisposed ()) item.release (false);
}
items = new TreeItem[4];
@@ -44697,7 +44521,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
if (fixAccessibility ()) {
ignoreAccessibility = true;
-@@ -2482,19 +2482,19 @@
+@@ -2482,19 +2482,19 @@ public void removeTreeListener(TreeListener listener) {
eventTable.unhook (SWT.Collapse, listener);
}
@@ -44722,7 +44546,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
for (int i = 0; i < columnCount; i++) {
if (columns [i].handle == columnHandle) {
columnIndex = i;
-@@ -2533,11 +2533,11 @@
+@@ -2533,11 +2533,11 @@ int /*long*/ rendererGetSizeProc (int /*long*/ cell, int /*long*/ widget, int /*
return result;
}
@@ -44737,7 +44561,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
int columnIndex = 0;
if (columnCount > 0) {
for (int i = 0; i < columnCount; i++) {
-@@ -2551,7 +2551,7 @@
+@@ -2551,7 +2551,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if (OS.GTK_IS_CELL_RENDERER_TOGGLE (cell) || (OS.GTK_IS_CELL_RENDERER_PIXBUF (cell) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) {
drawFlags = (int)/*64*/flags;
drawState = SWT.FOREGROUND;
@@ -44746,7 +44570,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_model_get (modelHandle, item.handle, Tree.BACKGROUND_COLUMN, ptr, -1);
if (ptr [0] == 0) {
int modelIndex = columnCount == 0 ? Tree.FIRST_COLUMN : columns [columnIndex].modelIndex;
-@@ -2562,7 +2562,7 @@
+@@ -2562,7 +2562,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if ((flags & OS.GTK_CELL_RENDERER_FOCUSED) != 0) drawState |= SWT.FOCUSED;
GdkRectangle rect = new GdkRectangle ();
@@ -44755,7 +44579,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);
OS.gtk_tree_path_free (path);
-@@ -2606,7 +2606,7 @@
+@@ -2606,7 +2606,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if ((drawState & SWT.SELECTED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_SELECTED;
if ((drawState & SWT.FOCUSED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_FOCUSED;
if ((drawState & SWT.SELECTED) != 0) {
@@ -44764,7 +44588,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
//TODO - parity and sorted
byte[] detail = Converter.wcsToMbcs (null, "cell_odd", true);
OS.gtk_paint_flat_box (style, window, OS.GTK_STATE_SELECTED, OS.GTK_SHADOW_NONE, rect, widget, detail, rect.x, rect.y, rect.width, rect.height);
-@@ -2617,7 +2617,7 @@
+@@ -2617,7 +2617,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
}
}
}
@@ -44773,7 +44597,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if ((drawState & SWT.BACKGROUND) != 0 && (drawState & SWT.SELECTED) == 0) {
GC gc = new GC (this);
gc.setBackground (item.getBackground (columnIndex));
-@@ -2627,7 +2627,7 @@
+@@ -2627,7 +2627,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
gc.dispose ();
}
if ((drawState & SWT.FOREGROUND) != 0 || OS.GTK_IS_CELL_RENDERER_TOGGLE (cell)) {
@@ -44782,7 +44606,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
GtkCellRendererClass klass = new GtkCellRendererClass ();
OS.memmove (klass, g_class);
if (drawForeground != null && OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
-@@ -2640,7 +2640,7 @@
+@@ -2640,7 +2640,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if (hooks (SWT.PaintItem)) {
GdkRectangle rect = new GdkRectangle ();
GdkRectangle clipRect = new GdkRectangle ();
@@ -44791,7 +44615,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_get_cell_area (handle, path, columnHandle, rect);
OS.gtk_tree_view_get_background_area (handle, path, columnHandle, clipRect);
OS.gtk_tree_path_free (path);
-@@ -2704,8 +2704,8 @@
+@@ -2704,8 +2704,8 @@ void resetCustomDraw () {
for (int i=0; i<end; i++) {
boolean customDraw = columnCount != 0 ? columns [i].customDraw : firstCustomDraw;
if (customDraw) {
@@ -44802,7 +44626,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, 0, 0, 0);
if (columnCount != 0) columns [i].customDraw = false;
}
-@@ -2739,7 +2739,7 @@
+@@ -2739,7 +2739,7 @@ public void setInsertMark (TreeItem item, boolean before) {
if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
if (item.parent != this) return;
Rectangle rect = item.getBounds();
@@ -44811,7 +44635,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_widget_realize (handle);
if (!OS.gtk_tree_view_get_path_at_pos(handle, rect.x, rect.y, path, null, null, null)) return;
if (path [0] == 0) return;
-@@ -2748,7 +2748,7 @@
+@@ -2748,7 +2748,7 @@ public void setInsertMark (TreeItem item, boolean before) {
OS.gtk_tree_path_free (path [0]);
}
@@ -44820,7 +44644,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, parentIter);
if (count == itemCount) return;
boolean isVirtual = (style & SWT.VIRTUAL) != 0;
-@@ -2759,7 +2759,7 @@
+@@ -2759,7 +2759,7 @@ void setItemCount (int /*long*/ parentIter, int count) {
ignoreAccessibility = true;
}
for (int i=itemCount; i<count; i++) {
@@ -44829,7 +44653,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (iter == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_tree_store_append (modelHandle, iter, parentIter);
OS.gtk_tree_store_set (modelHandle, iter, ID_COLUMN, -1, -1);
-@@ -2818,7 +2818,7 @@
+@@ -2818,7 +2818,7 @@ public void select (TreeItem item) {
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
if (item.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
boolean fixColumn = showFirstColumn ();
@@ -44838,7 +44662,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_select_iter (selection, item.handle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -2840,7 +2840,7 @@
+@@ -2840,7 +2840,7 @@ public void selectAll () {
checkWidget();
if ((style & SWT.SINGLE) != 0) return;
boolean fixColumn = showFirstColumn ();
@@ -44847,7 +44671,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
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);
-@@ -2852,9 +2852,9 @@
+@@ -2852,9 +2852,9 @@ void setBackgroundColor (GdkColor color) {
OS.gtk_widget_modify_base (handle, 0, color);
}
@@ -44859,7 +44683,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (window != 0) OS.gdk_window_set_back_pixmap (window, 0, true);
}
-@@ -2919,15 +2919,15 @@
+@@ -2919,15 +2919,15 @@ public void setColumnOrder (int [] order) {
if (seen [index]) error (SWT.ERROR_INVALID_ARGUMENT);
seen [index] = true;
}
@@ -44878,7 +44702,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
super.setFontDescription (font);
TreeColumn[] columns = getColumns ();
for (int i = 0; i < columns.length; i++) {
-@@ -2989,16 +2989,16 @@
+@@ -2989,16 +2989,16 @@ public void setLinesVisible (boolean show) {
void setParentBackground () {
super.setParentBackground ();
@@ -44899,7 +44723,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (columnCount != 0 || currentItem == item) return;
/*
* Use GTK_TREE_VIEW_COLUMN_GROW_ONLY on GTK versions < 2.3.2
-@@ -3067,7 +3067,7 @@
+@@ -3067,7 +3067,7 @@ public void setSelection (TreeItem [] items) {
int length = items.length;
if (length == 0 || ((style & SWT.SINGLE) != 0 && length > 1)) return;
boolean fixColumn = showFirstColumn ();
@@ -44908,7 +44732,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
boolean first = true;
for (int i = 0; i < length; i++) {
-@@ -3075,7 +3075,7 @@
+@@ -3075,7 +3075,7 @@ public void setSelection (TreeItem [] items) {
if (item == null) continue;
if (item.isDisposed ()) break;
if (item.parent != this) continue;
@@ -44917,7 +44741,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
showItem (path, false);
if (first) {
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
-@@ -3168,7 +3168,7 @@
+@@ -3168,7 +3168,7 @@ public void setTopItem (TreeItem item) {
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
if (item.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT);
if (item.parent != this) return;
@@ -44926,7 +44750,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
showItem (path, false);
OS.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0f, 0f);
if (OS.GTK_VERSION < OS.VERSION (2, 8, 0)) {
-@@ -3243,10 +3243,10 @@
+@@ -3243,10 +3243,10 @@ boolean showFirstColumn () {
*/
int columnCount = Math.max (1, this.columnCount);
for (int i=0; i<columnCount; i++) {
@@ -44939,7 +44763,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_column_set_visible (firstColumn, true);
return true;
}
-@@ -3269,13 +3269,13 @@
+@@ -3269,13 +3269,13 @@ public void showSelection () {
if (items.length != 0 && items [0] != null) showItem (items [0]);
}
@@ -44956,7 +44780,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
for (int i=0; i<indices.length; i++) {
OS.gtk_tree_path_append_index (tempPath, indices [i]);
OS.gtk_tree_view_expand_row (handle, tempPath, false);
-@@ -3347,12 +3347,12 @@
+@@ -3347,12 +3347,12 @@ public void showItem (TreeItem item) {
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
if (item.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT);
if (item.parent != this) return;
@@ -44971,7 +44795,7 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (selection != null) {
int [] index = new int [1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
-@@ -3370,12 +3370,12 @@
+@@ -3370,12 +3370,12 @@ void updateScrollBarValue (ScrollBar bar) {
* The fix is to queue a resize event for each child to
* force the position to be corrected.
*/
@@ -44988,10 +44812,467 @@ diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/T
if (widget != 0) OS.gtk_widget_queue_resize (widget);
temp = OS.g_list_next (temp);
}
-diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/Widget.java
---- x86/org/eclipse/swt/widgets/Widget.java 2009-05-29 17:30:04.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Widget.java 2009-09-17 08:48:24.000000000 -0400
-@@ -54,7 +54,7 @@
+diff --git a/org/eclipse/swt/widgets/TreeColumn.java b/org/eclipse/swt/widgets/TreeColumn.java
+index a3b6ee5..3413263 100644
+--- a/org/eclipse/swt/widgets/TreeColumn.java
++++ b/org/eclipse/swt/widgets/TreeColumn.java
+@@ -38,7 +38,7 @@ import org.eclipse.swt.events.*;
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+ public class TreeColumn extends Item {
+- int /*long*/ labelHandle, imageHandle, buttonHandle;
++ long /*int*/ labelHandle, imageHandle, buttonHandle;
+ Tree parent;
+ int modelIndex, lastButton, lastTime, lastX, lastWidth;
+ boolean customDraw, useFixedWidth;
+@@ -326,7 +326,7 @@ public int getWidth () {
+ return OS.gtk_tree_view_column_get_width (handle);
+ }
+
+-int /*long*/ gtk_clicked (int /*long*/ widget) {
++long /*int*/ gtk_clicked (long /*int*/ widget) {
+ /*
+ * There is no API to get a double click on a table column. Normally, when
+ * the mouse is double clicked, this is indicated by GDK_2BUTTON_PRESS
+@@ -336,7 +336,7 @@ int /*long*/ gtk_clicked (int /*long*/ widget) {
+ */
+ boolean doubleClick = false;
+ boolean postEvent = true;
+- int /*long*/ eventPtr = OS.gtk_get_current_event ();
++ long /*int*/ eventPtr = OS.gtk_get_current_event ();
+ if (eventPtr != 0) {
+ GdkEventButton gdkEvent = new GdkEventButton ();
+ OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
+@@ -368,7 +368,7 @@ int /*long*/ gtk_clicked (int /*long*/ widget) {
+ return 0;
+ }
+
+-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
++long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
+ GdkEvent event = new GdkEvent ();
+ OS.memmove (event, gdkEvent, GdkEvent.sizeof);
+ switch (event.type) {
+@@ -384,11 +384,11 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
+ return 0;
+ }
+
+-int /*long*/ gtk_mnemonic_activate (int /*long*/ widget, int /*long*/ arg1) {
++long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) {
+ return parent.gtk_mnemonic_activate (widget, arg1);
+ }
+
+-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
++long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {
+ useFixedWidth = false;
+ int x = OS.GTK_WIDGET_X (widget);
+ int width = OS.GTK_WIDGET_WIDTH (widget);
+@@ -435,7 +435,7 @@ public void pack () {
+ if ((parent.style & SWT.VIRTUAL) != 0) {
+ //NOT DONE
+ } else {
+- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
++ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ if (OS.gtk_tree_model_get_iter_first (parent.modelHandle, iter)) {
+ do {
+ width = Math.max (width, parent.calculateWidth (handle, iter, true));
+@@ -542,7 +542,7 @@ public void setAlignment (int alignment) {
+ parent.createRenderers (handle, modelIndex, index == 0, style);
+ }
+
+-void setFontDescription (int /*long*/ font) {
++void setFontDescription (long /*int*/ font) {
+ OS.gtk_widget_modify_font (labelHandle, font);
+ OS.gtk_widget_modify_font (imageHandle, font);
+ }
+@@ -557,7 +557,7 @@ public void setImage (Image image) {
+ }
+ int imageIndex = headerImageList.indexOf (image);
+ if (imageIndex == -1) imageIndex = headerImageList.add (image);
+- int /*long*/ pixbuf = headerImageList.getPixbuf (imageIndex);
++ long /*int*/ pixbuf = headerImageList.getPixbuf (imageIndex);
+ OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
+ OS.gtk_widget_show (imageHandle);
+ } else {
+diff --git a/org/eclipse/swt/widgets/TreeItem.java b/org/eclipse/swt/widgets/TreeItem.java
+index 1102499..0316c92 100644
+--- a/org/eclipse/swt/widgets/TreeItem.java
++++ b/org/eclipse/swt/widgets/TreeItem.java
+@@ -181,7 +181,7 @@ public TreeItem (TreeItem parentItem, int style, int index) {
+ this (checkNull (parentItem).parent, parentItem.handle, style, checkIndex (index), true);
+ }
+
+-TreeItem (Tree parent, int /*long*/ parentIter, int style, int index, boolean create) {
++TreeItem (Tree parent, long /*int*/ parentIter, int style, int index, boolean create) {
+ super (parent, style);
+ this.parent = parent;
+ if (create) {
+@@ -212,7 +212,7 @@ protected void checkSubclass () {
+ }
+
+ Color _getBackground () {
+- int /*long*/ [] ptr = new int /*long*/ [1];
++ long /*int*/ [] ptr = new long /*int*/ [1];
+ OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.BACKGROUND_COLUMN, ptr, -1);
+ if (ptr [0] == 0) return parent.getBackground ();
+ GdkColor gdkColor = new GdkColor ();
+@@ -223,7 +223,7 @@ Color _getBackground () {
+ Color _getBackground (int index) {
+ int count = Math.max (1, parent.columnCount);
+ if (0 > index || index > count - 1) return _getBackground ();
+- int /*long*/ [] ptr = new int /*long*/ [1];
++ long /*int*/ [] ptr = new long /*int*/ [1];
+ int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
+ OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_BACKGROUND, ptr, -1);
+ if (ptr [0] == 0) return _getBackground ();
+@@ -233,13 +233,13 @@ Color _getBackground (int index) {
+ }
+
+ boolean _getChecked () {
+- int /*long*/ [] ptr = new int /*long*/ [1];
++ long /*int*/ [] ptr = new long /*int*/ [1];
+ OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.CHECKED_COLUMN, ptr, -1);
+ return ptr [0] != 0;
+ }
+
+ Color _getForeground () {
+- int /*long*/ [] ptr = new int /*long*/ [1];
++ long /*int*/ [] ptr = new long /*int*/ [1];
+ OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.FOREGROUND_COLUMN, ptr, -1);
+ if (ptr [0] == 0) return parent.getForeground ();
+ GdkColor gdkColor = new GdkColor ();
+@@ -250,7 +250,7 @@ Color _getForeground () {
+ Color _getForeground (int index) {
+ int count = Math.max (1, parent.columnCount);
+ if (0 > index || index > count - 1) return _getForeground ();
+- int /*long*/ [] ptr = new int /*long*/ [1];
++ long /*int*/ [] ptr = new long /*int*/ [1];
+ int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
+ OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_FOREGROUND, ptr, -1);
+ if (ptr [0] == 0) return _getForeground ();
+@@ -262,7 +262,7 @@ Color _getForeground (int index) {
+ Image _getImage (int index) {
+ int count = Math.max (1, parent.getColumnCount ());
+ if (0 > index || index > count - 1) return null;
+- int /*long*/ [] ptr = new int /*long*/ [1];
++ long /*int*/ [] ptr = new long /*int*/ [1];
+ int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
+ OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_PIXBUF, ptr, -1);
+ if (ptr [0] == 0) return null;
+@@ -275,7 +275,7 @@ Image _getImage (int index) {
+ String _getText (int index) {
+ int count = Math.max (1, parent.getColumnCount ());
+ if (0 > index || index > count - 1) return "";
+- int /*long*/ [] ptr = new int /*long*/ [1];
++ long /*int*/ [] ptr = new long /*int*/ [1];
+ int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
+ OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_TEXT, ptr, -1);
+ if (ptr [0] == 0) return ""; //$NON-NLS-1$
+@@ -423,15 +423,15 @@ public Rectangle getBounds (int index) {
+ // TODO fully test on early and later versions of GTK
+ checkWidget();
+ if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
+- int /*long*/ parentHandle = parent.handle;
+- int /*long*/ column = 0;
++ long /*int*/ parentHandle = parent.handle;
++ long /*int*/ column = 0;
+ if (index >= 0 && index < parent.columnCount) {
+ column = parent.columns [index].handle;
+ } else {
+ column = OS.gtk_tree_view_get_column (parentHandle, index);
+ }
+ if (column == 0) return new Rectangle (0, 0, 0, 0);
+- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ OS.gtk_widget_realize (parentHandle);
+ GdkRectangle rect = new GdkRectangle ();
+ OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
+@@ -494,14 +494,14 @@ public Rectangle getBounds () {
+ // shifted a bit too far right on later versions of GTK - however, old Tree also had this problem
+ checkWidget ();
+ if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
+- int /*long*/ parentHandle = parent.handle;
+- int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, 0);
++ long /*int*/ parentHandle = parent.handle;
++ long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, 0);
+ if (column == 0) return new Rectangle (0, 0, 0, 0);
+- int /*long*/ textRenderer = parent.getTextRenderer (column);
+- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);
++ long /*int*/ textRenderer = parent.getTextRenderer (column);
++ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
+ if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);
+
+- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ OS.gtk_widget_realize (parentHandle);
+
+ boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
+@@ -594,7 +594,7 @@ public boolean getChecked () {
+ */
+ public boolean getExpanded () {
+ checkWidget();
+- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ boolean answer = OS.gtk_tree_view_row_expanded (parent.handle, path);
+ OS.gtk_tree_path_free (path);
+ return answer;
+@@ -746,18 +746,18 @@ public Rectangle getImageBounds (int index) {
+ // TODO fully test on early and later versions of GTK
+ checkWidget ();
+ if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
+- int /*long*/ parentHandle = parent.handle;
+- int /*long*/ column = 0;
++ long /*int*/ parentHandle = parent.handle;
++ long /*int*/ column = 0;
+ if (index >= 0 && index < parent.getColumnCount ()) {
+ column = parent.columns [index].handle;
+ } else {
+ column = OS.gtk_tree_view_get_column (parentHandle, index);
+ }
+ if (column == 0) return new Rectangle (0, 0, 0, 0);
+- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);
++ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
+ if (pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);
+ GdkRectangle rect = new GdkRectangle ();
+- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ OS.gtk_widget_realize (parentHandle);
+ OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
+ if ((parent.getStyle () & SWT.MIRRORED) != 0) rect.x = parent.getClientWidth () - rect.width - rect.x;
+@@ -908,12 +908,12 @@ public Tree getParent () {
+ */
+ public TreeItem getParentItem () {
+ checkWidget();
+- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ TreeItem item = null;
+ int depth = OS.gtk_tree_path_get_depth (path);
+ if (depth > 1) {
+ OS.gtk_tree_path_up (path);
+- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
++ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ if (OS.gtk_tree_model_get_iter (parent.modelHandle, iter, path)) {
+ item = parent._getItem (iter);
+ }
+@@ -971,19 +971,19 @@ public Rectangle getTextBounds (int index) {
+ if (0 > index || index > count - 1) return new Rectangle (0, 0, 0, 0);
+ // TODO fully test on early and later versions of GTK
+ // shifted a bit too far right on later versions of GTK - however, old Tree also had this problem
+- int /*long*/ parentHandle = parent.handle;
+- int /*long*/ column = 0;
++ long /*int*/ parentHandle = parent.handle;
++ long /*int*/ column = 0;
+ if (index >= 0 && index < parent.columnCount) {
+ column = parent.columns [index].handle;
+ } else {
+ column = OS.gtk_tree_view_get_column (parentHandle, index);
+ }
+ if (column == 0) return new Rectangle (0, 0, 0, 0);
+- int /*long*/ textRenderer = parent.getTextRenderer (column);
+- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);
++ long /*int*/ textRenderer = parent.getTextRenderer (column);
++ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
+ if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);
+
+- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ OS.gtk_widget_realize (parentHandle);
+
+ boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
+@@ -1066,8 +1066,8 @@ public int indexOf (TreeItem item) {
+ if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
+ int index = -1;
+ boolean isParent = false;
+- int /*long*/ currentPath = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+- int /*long*/ parentPath = OS.gtk_tree_model_get_path (parent.modelHandle, item.handle);
++ long /*int*/ currentPath = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
++ long /*int*/ parentPath = OS.gtk_tree_model_get_path (parent.modelHandle, item.handle);
+ int depth = OS.gtk_tree_path_get_depth (parentPath);
+ if (depth > 1 && OS.gtk_tree_path_up(parentPath)) {
+ if (OS.gtk_tree_path_compare(currentPath, parentPath) == 0) isParent = true;
+@@ -1075,9 +1075,9 @@ public int indexOf (TreeItem item) {
+ OS.gtk_tree_path_free (currentPath);
+ OS.gtk_tree_path_free (parentPath);
+ if (!isParent) return index;
+- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, item.handle);
++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, item.handle);
+ if (depth > 1) {
+- int /*long*/ indices = OS.gtk_tree_path_get_indices (path);
++ long /*int*/ indices = OS.gtk_tree_path_get_indices (path);
+ if (indices != 0) {
+ int[] temp = new int[depth];
+ OS.memmove (temp, indices, 4 * temp.length);
+@@ -1089,13 +1089,13 @@ public int indexOf (TreeItem item) {
+ }
+
+ void redraw () {
+- int /*long*/ parentHandle = parent.handle;
++ long /*int*/ parentHandle = parent.handle;
+ if ((OS.GTK_WIDGET_FLAGS (parentHandle) & OS.GTK_REALIZED) != 0) {
+- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ GdkRectangle rect = new GdkRectangle ();
+ OS.gtk_tree_view_get_cell_area (parentHandle, path, 0, rect);
+ OS.gtk_tree_path_free (path);
+- int /*long*/ window = OS.gtk_tree_view_get_bin_window (parentHandle);
++ long /*int*/ window = OS.gtk_tree_view_get_bin_window (parentHandle);
+ rect.x = 0;
+ int [] w = new int [1], h = new int [1];
+ OS.gdk_drawable_get_size (window, w, h);
+@@ -1136,15 +1136,15 @@ void releaseWidget () {
+ */
+ public void removeAll () {
+ checkWidget ();
+- int /*long*/ modelHandle = parent.modelHandle;
++ long /*int*/ modelHandle = parent.modelHandle;
+ int length = OS.gtk_tree_model_iter_n_children (modelHandle, handle);
+ if (length == 0) return;
+- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
++ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ if (iter == 0) error (SWT.ERROR_NO_HANDLES);
+ if (parent.fixAccessibility ()) {
+ parent.ignoreAccessibility = true;
+ }
+- int /*long*/ selection = OS.gtk_tree_view_get_selection (parent.handle);
++ long /*int*/ selection = OS.gtk_tree_view_get_selection (parent.handle);
+ int [] value = new int [1];
+ while (OS.gtk_tree_model_iter_children (modelHandle, iter, handle)) {
+ OS.gtk_tree_model_get (modelHandle, iter, Tree.ID_COLUMN, value, -1);
+@@ -1249,16 +1249,16 @@ public void setBackground (int index, Color color) {
+ boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
+ if (!customDraw) {
+ if ((parent.style & SWT.VIRTUAL) == 0) {
+- int /*long*/ parentHandle = parent.handle;
+- int /*long*/ column = 0;
++ long /*int*/ parentHandle = parent.handle;
++ long /*int*/ column = 0;
+ if (parent.columnCount > 0) {
+ column = parent.columns [index].handle;
+ } else {
+ column = OS.gtk_tree_view_get_column (parentHandle, index);
+ }
+ if (column == 0) return;
+- int /*long*/ textRenderer = parent.getTextRenderer (column);
+- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);
++ long /*int*/ textRenderer = parent.getTextRenderer (column);
++ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
+ OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
+ OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
+ }
+@@ -1309,7 +1309,7 @@ public void setChecked (boolean checked) {
+ */
+ public void setExpanded (boolean expanded) {
+ checkWidget();
+- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
++ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ if (expanded) {
+ OS.g_signal_handlers_block_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_EXPAND_ROW);
+ OS.gtk_tree_view_expand_row (parent.handle, path, false);
+@@ -1351,7 +1351,7 @@ public void setFont (Font font){
+ if (oldFont == font) return;
+ this.font = font;
+ if (oldFont != null && oldFont.equals (font)) return;
+- int /*long*/ fontHandle = font != null ? font.handle : 0;
++ long /*int*/ fontHandle = font != null ? font.handle : 0;
+ OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.FONT_COLUMN, fontHandle, -1);
+ /*
+ * Bug in GTK. When using fixed-height-mode,
+@@ -1402,7 +1402,7 @@ public void setFont (int index, Font font) {
+ if (oldFont != null && oldFont.equals (font)) return;
+
+ int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
+- int /*long*/ fontHandle = font != null ? font.handle : 0;
++ long /*int*/ fontHandle = font != null ? font.handle : 0;
+ OS.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_FONT, fontHandle, -1);
+ /*
+ * Bug in GTK. When using fixed-height-mode,
+@@ -1420,16 +1420,16 @@ public void setFont (int index, Font font) {
+ boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
+ if (!customDraw) {
+ if ((parent.style & SWT.VIRTUAL) == 0) {
+- int /*long*/ parentHandle = parent.handle;
+- int /*long*/ column = 0;
++ long /*int*/ parentHandle = parent.handle;
++ long /*int*/ column = 0;
+ if (parent.columnCount > 0) {
+ column = parent.columns [index].handle;
+ } else {
+ column = OS.gtk_tree_view_get_column (parentHandle, index);
+ }
+ if (column == 0) return;
+- int /*long*/ textRenderer = parent.getTextRenderer (column);
+- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);
++ long /*int*/ textRenderer = parent.getTextRenderer (column);
++ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
+ OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
+ OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
+ }
+@@ -1529,16 +1529,16 @@ public void setForeground (int index, Color color){
+ boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
+ if (!customDraw) {
+ if ((parent.style & SWT.VIRTUAL) == 0) {
+- int /*long*/ parentHandle = parent.handle;
+- int /*long*/ column = 0;
++ long /*int*/ parentHandle = parent.handle;
++ long /*int*/ column = 0;
+ if (parent.columnCount > 0) {
+ column = parent.columns [index].handle;
+ } else {
+ column = OS.gtk_tree_view_get_column (parentHandle, index);
+ }
+ if (column == 0) return;
+- int /*long*/ textRenderer = parent.getTextRenderer (column);
+- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);
++ long /*int*/ textRenderer = parent.getTextRenderer (column);
++ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
+ OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
+ OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
+ }
+@@ -1571,7 +1571,7 @@ public void setGrayed (boolean grayed) {
+ * GTK+'s "inconsistent" state does not match SWT's concept of grayed.
+ * Render checked+grayed as "inconsistent", unchecked+grayed as blank.
+ */
+- int /*long*/ [] ptr = new int /*long*/ [1];
++ long /*int*/ [] ptr = new long /*int*/ [1];
+ OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.CHECKED_COLUMN, ptr, -1);
+ OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.GRAYED_COLUMN, ptr [0] == 0 ? false : grayed, -1);
+ cached = true;
+@@ -1603,7 +1603,7 @@ public void setImage (int index, Image image) {
+ }
+ int count = Math.max (1, parent.getColumnCount ());
+ if (0 > index || index > count - 1) return;
+- int /*long*/ pixbuf = 0;
++ long /*int*/ pixbuf = 0;
+ if (image != null) {
+ ImageList imageList = parent.imageList;
+ if (imageList == null) imageList = parent.imageList = new ImageList ();
+@@ -1633,10 +1633,10 @@ public void setImage (int index, Image image) {
+ if ((parent.style & SWT.VIRTUAL) != 0 && parent.currentItem == null) {
+ if (OS.GTK_VERSION >= OS.VERSION (2, 3, 2)) {
+ if (image != null) {
+- int /*long*/parentHandle = parent.handle;
+- int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, index);
++ long /*int*/parentHandle = parent.handle;
++ long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, index);
+ int [] w = new int [1];
+- int /*long*/ pixbufRenderer = parent.getPixbufRenderer(column);
++ long /*int*/ pixbufRenderer = parent.getPixbufRenderer(column);
+ OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w);
+ if (w[0] < image.getBounds().width) {
+ /*
+@@ -1644,7 +1644,7 @@ public void setImage (int index, Image image) {
+ * are relying on the fact that it is done as part of modifying
+ * the style.
+ */
+- int /*long*/ style = OS.gtk_widget_get_modifier_style (parentHandle);
++ long /*int*/ style = OS.gtk_widget_get_modifier_style (parentHandle);
+ parent.modifyStyle (parentHandle, style);
+ }
+ }
+diff --git a/org/eclipse/swt/widgets/Widget.java b/org/eclipse/swt/widgets/Widget.java
+index a391ca1..b8712cb 100644
+--- a/org/eclipse/swt/widgets/Widget.java
++++ b/org/eclipse/swt/widgets/Widget.java
+@@ -54,7 +54,7 @@ public abstract class Widget {
* platforms and should never be accessed from application code.
* </p>
*/
@@ -45000,7 +45281,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
int style, state;
Display display;
EventTable eventTable;
-@@ -269,7 +269,7 @@
+@@ -269,7 +269,7 @@ public void addDisposeListener (DisposeListener listener) {
addListener (SWT.Dispose, typedListener);
}
@@ -45009,7 +45290,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
return 0;
}
-@@ -285,7 +285,7 @@
+@@ -285,7 +285,7 @@ static int checkBits (int style, int int0, int int1, int int2, int int3, int int
return style;
}
@@ -45018,7 +45299,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
return 0;
}
-@@ -406,7 +406,7 @@
+@@ -406,7 +406,7 @@ void deregister () {
}
void destroyWidget () {
@@ -45027,7 +45308,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
releaseHandle ();
if (topHandle != 0 && (state & HANDLE) != 0) {
OS.gtk_widget_destroy (topHandle);
-@@ -600,269 +600,269 @@
+@@ -600,269 +600,269 @@ public int getStyle () {
}
@@ -45364,7 +45645,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
return 0;
}
-@@ -870,11 +870,11 @@
+@@ -870,11 +870,11 @@ boolean filters (int eventType) {
return display.filters (eventType);
}
@@ -45378,7 +45659,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
return OS.Call (Display.oldFixedSizeAllocateProc, widget, allocationPtr);
}
-@@ -973,15 +973,15 @@
+@@ -973,15 +973,15 @@ boolean hooks (int eventType) {
return eventTable.hooks (eventType);
}
@@ -45397,7 +45678,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
if (!mnemonicMatch (mnemonicHandle, key)) return false;
OS.g_signal_handlers_block_matched (mnemonicHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, MNEMONIC_ACTIVATE);
boolean result = OS.gtk_widget_mnemonic_activate (mnemonicHandle, false);
-@@ -989,13 +989,13 @@
+@@ -989,13 +989,13 @@ boolean mnemonicHit (int /*long*/ mnemonicHandle, char key) {
return result;
}
@@ -45413,7 +45694,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
OS.gtk_widget_modify_style (handle, style);
}
-@@ -1138,11 +1138,11 @@
+@@ -1138,11 +1138,11 @@ protected void removeListener (int eventType, SWTEventListener handler) {
eventTable.unhook (eventType, handler);
}
@@ -45427,7 +45708,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
return 0;
}
-@@ -1229,7 +1229,7 @@
+@@ -1229,7 +1229,7 @@ boolean sendKeyEvent (int type, GdkEventKey keyEvent) {
char [] sendIMKeyEvent (int type, GdkEventKey keyEvent, char [] chars) {
int index = 0, count = 0, state = 0;
@@ -45436,7 +45717,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
if (keyEvent == null) {
ptr = OS.gtk_get_current_event ();
if (ptr != 0) {
-@@ -1384,8 +1384,8 @@
+@@ -1384,8 +1384,8 @@ public void setData (String key, Object value) {
}
}
@@ -45447,7 +45728,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_NORMAL, color);
OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_ACTIVE, color);
OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_PRELIGHT, color);
-@@ -1473,15 +1473,15 @@
+@@ -1473,15 +1473,15 @@ boolean setTabItemFocus (boolean next) {
return false;
}
@@ -45466,7 +45747,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
return 0;
}
-@@ -1500,15 +1500,15 @@
+@@ -1500,15 +1500,15 @@ public String toString () {
return getName () + " {" + string + "}";
}
@@ -45485,7 +45766,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
return 0;
}
-@@ -1516,7 +1516,7 @@
+@@ -1516,7 +1516,7 @@ boolean translateTraversal (int event) {
return false;
}
@@ -45494,7 +45775,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
switch ((int)/*64*/user_data) {
case ACTIVATE: return gtk_activate (handle);
case CHANGED: return gtk_changed (handle);
-@@ -1540,13 +1540,13 @@
+@@ -1540,13 +1540,13 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) {
}
}
@@ -45511,7 +45792,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
if (window != paintWindow) return 0;
return (state & OBSCURED) != 0 ? 1 : 0;
}
-@@ -1589,7 +1589,7 @@
+@@ -1589,7 +1589,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ us
}
}
@@ -45520,7 +45801,7 @@ diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets
switch ((int)/*64*/user_data) {
case DELETE_RANGE: return gtk_delete_range (handle, arg0, arg1);
case DELETE_TEXT: return gtk_delete_text (handle, arg0, arg1);
-@@ -1604,7 +1604,7 @@
+@@ -1604,7 +1604,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ ar
}
}
diff --git a/debian/patches/common/bp-accessible-object.diff b/debian/patches/common/bp-accessible-object.diff
deleted file mode 100644
index cdbe52e..0000000
--- a/debian/patches/common/bp-accessible-object.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Binary files swt-gtk/.git/index and swt-gtk.new/.git/index differ
-diff -Nur -x '*.orig' -x '*~' swt-gtk/org/eclipse/swt/accessibility/AccessibleObject.java swt-gtk.new/org/eclipse/swt/accessibility/AccessibleObject.java
---- swt-gtk/org/eclipse/swt/accessibility/AccessibleObject.java 2010-09-13 13:31:45.687685180 -0400
-+++ swt-gtk.new/org/eclipse/swt/accessibility/AccessibleObject.java 2010-09-14 18:26:56.111986733 -0400
-@@ -1176,7 +1176,10 @@
- }
-
- static AccessibleObject getAccessibleObject (int /*long*/ atkObject) {
-- return (AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
-+ AccessibleObject object = (AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
-+ if (object == null) return null;
-+ if (object.accessible == null) return null;
-+ return object;
- }
-
- AccessibleObject getChildByHandle (int /*long*/ handle) {
diff --git a/debian/rules b/debian/rules
index 02ce996..ae3f064 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,10 @@ ifneq (,$(filter $(DEB_HOST_ARCH), powerpc))
AWT_LIB_DIR = ppc
endif
+ifneq (,$(filter $(DEB_HOST_ARCH), powerpcspe))
+ AWT_LIB_DIR = ppc
+endif
+
ifneq (,$(filter $(DEB_HOST_ARCH), sh4))
AWT_LIB_DIR = sh
endif
hooks/post-receive
--
Debian packaging for swt-gtk.
More information about the pkg-java-commits
mailing list