[SCM] Debian packaging for swt-gtk. branch, master-3.8, updated. debian/3.8.0-m6-1-5-g9a18b63
Jakub Adam
jakub.adam at ktknet.cz
Sun May 6 23:20:07 UTC 2012
The following commit has been merged in the master-3.8 branch:
commit 63c94c1d523eefec993c3470d7ea61487b97b33b
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Mon May 7 00:01:41 2012 +0200
Updated arch64.diff patch for new upstream release
diff --git a/debian/patches/64/arch64.diff b/debian/patches/64/arch64.diff
index d7e3db3..cd20c83 100644
--- a/debian/patches/64/arch64.diff
+++ b/debian/patches/64/arch64.diff
@@ -1,7 +1,7 @@
-From 4bd21b6eb58c2367955e51878b9f99762f17fcf0 Mon Sep 17 00:00:00 2001
+From a2c81dcd95a8159db8c741033198854eb88cab11 Mon Sep 17 00:00:00 2001
From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Sun, 18 Mar 2012 21:54:47 +0100
-Subject: [PATCH] Update arch64.diff
+Date: Sun, 6 May 2012 23:59:03 +0200
+Subject: [PATCH] arch64
---
org/eclipse/swt/accessibility/Accessible.java | 10 +-
@@ -13,7 +13,7 @@ Subject: [PATCH] Update arch64.diff
org/eclipse/swt/browser/DownloadFactory.java | 30 +-
org/eclipse/swt/browser/DownloadFactory_1_8.java | 30 +-
org/eclipse/swt/browser/Download_1_8.java | 186 +-
- org/eclipse/swt/browser/External.java | 166 +-
+ org/eclipse/swt/browser/External.java | 214 +-
org/eclipse/swt/browser/ExternalFactory.java | 30 +-
org/eclipse/swt/browser/FilePicker.java | 96 +-
org/eclipse/swt/browser/FilePickerFactory.java | 34 +-
@@ -24,8 +24,8 @@ Subject: [PATCH] Update arch64.diff
.../swt/browser/HelperAppLauncherDialog_10.java | 6 +-
.../swt/browser/HelperAppLauncherDialog_1_9.java | 32 +-
org/eclipse/swt/browser/InputStream.java | 36 +-
- org/eclipse/swt/browser/Mozilla.java | 522 ++--
- org/eclipse/swt/browser/MozillaDelegate.java | 22 +-
+ org/eclipse/swt/browser/Mozilla.java | 524 +--
+ org/eclipse/swt/browser/MozillaDelegate.java | 26 +-
org/eclipse/swt/browser/PromptAuth2.java | 42 +-
org/eclipse/swt/browser/PromptDialog.java | 2 +-
org/eclipse/swt/browser/PromptFactory.java | 30 +-
@@ -84,7 +84,7 @@ Subject: [PATCH] Update arch64.diff
.../internal/accessibility/gtk/AtkTextRange.java | 2 +-
.../internal/accessibility/gtk/AtkValueIface.java | 8 +-
.../internal/accessibility/gtk/GtkAccessible.java | 2 +-
- org/eclipse/swt/internal/cairo/Cairo.java | 546 ++--
+ org/eclipse/swt/internal/cairo/Cairo.java | 546 +--
org/eclipse/swt/internal/cairo/cairo_path_t.java | 2 +-
org/eclipse/swt/internal/cde/CDE.java | 60 +-
org/eclipse/swt/internal/cde/DtActionArg.java | 2 +-
@@ -116,7 +116,7 @@ Subject: [PATCH] Update arch64.diff
org/eclipse/swt/internal/gtk/GtkTargetEntry.java | 2 +-
org/eclipse/swt/internal/gtk/GtkTargetPair.java | 2 +-
org/eclipse/swt/internal/gtk/GtkWidgetClass.java | 124 +-
- org/eclipse/swt/internal/gtk/OS.java | 4906 ++++++++++----------
+ org/eclipse/swt/internal/gtk/OS.java | 4970 ++++++++++----------
org/eclipse/swt/internal/gtk/PangoAttribute.java | 2 +-
org/eclipse/swt/internal/gtk/PangoItem.java | 10 +-
org/eclipse/swt/internal/gtk/PangoLayoutLine.java | 4 +-
@@ -126,8 +126,8 @@ Subject: [PATCH] Update arch64.diff
org/eclipse/swt/internal/gtk/XCrossingEvent.java | 4 +-
.../swt/internal/gtk/XRenderPictureAttributes.java | 6 +-
org/eclipse/swt/internal/gtk/XWindowChanges.java | 2 +-
- org/eclipse/swt/internal/mozilla/XPCOM.java | 972 ++--
- org/eclipse/swt/internal/mozilla/XPCOMObject.java | 652 ++--
+ org/eclipse/swt/internal/mozilla/XPCOM.java | 986 ++--
+ org/eclipse/swt/internal/mozilla/XPCOMObject.java | 652 +--
.../swt/internal/mozilla/init/GREProperty.java | 4 +-
.../swt/internal/mozilla/init/GREVersionRange.java | 4 +-
.../swt/internal/mozilla/init/XPCOMInit.java | 4 +-
@@ -169,7 +169,6 @@ Subject: [PATCH] Update arch64.diff
.../mozilla/nsIDirectoryServiceProvider.java | 4 +-
.../mozilla/nsIDirectoryServiceProvider2.java | 4 +-
org/eclipse/swt/internal/mozilla/nsIDocShell.java | 38 +-
- .../swt/internal/mozilla/nsIDocShell_1_8.java | 40 +-
org/eclipse/swt/internal/mozilla/nsIDownload.java | 22 +-
.../swt/internal/mozilla/nsIDownload_1_8.java | 18 +-
.../internal/mozilla/nsIEmbeddingSiteWindow.java | 6 +-
@@ -208,7 +207,6 @@ Subject: [PATCH] Update arch64.diff
org/eclipse/swt/internal/mozilla/nsIRequest.java | 12 +-
org/eclipse/swt/internal/mozilla/nsISSLStatus.java | 6 +-
.../internal/mozilla/nsIScriptSecurityManager.java | 48 +-
- .../mozilla/nsISecurityCheckedComponent.java | 10 +-
.../swt/internal/mozilla/nsISeekableStream.java | 2 +-
.../swt/internal/mozilla/nsISerializable.java | 6 +-
.../swt/internal/mozilla/nsIServiceManager.java | 6 +-
@@ -220,7 +218,7 @@ Subject: [PATCH] Update arch64.diff
org/eclipse/swt/internal/mozilla/nsIURI.java | 58 +-
.../internal/mozilla/nsIURIContentListener.java | 18 +-
.../swt/internal/mozilla/nsIUploadChannel.java | 6 +-
- org/eclipse/swt/internal/mozilla/nsIVariant.java | 36 +-
+ org/eclipse/swt/internal/mozilla/nsIVariant.java | 38 +-
.../swt/internal/mozilla/nsIWeakReference.java | 4 +-
.../swt/internal/mozilla/nsIWebBrowser.java | 16 +-
.../swt/internal/mozilla/nsIWebBrowserChrome.java | 6 +-
@@ -240,6 +238,7 @@ Subject: [PATCH] Update arch64.diff
org/eclipse/swt/internal/mozilla/nsIX509Cert.java | 54 +-
.../swt/internal/mozilla/nsIX509CertValidity.java | 18 +-
.../internal/mozilla/nsIXPCSecurityManager.java | 10 +-
+ org/eclipse/swt/internal/mozilla/nsIXPConnect.java | 6 +-
org/eclipse/swt/internal/opengl/glx/GLX.java | 70 +-
.../swt/internal/opengl/glx/XVisualInfo.java | 2 +-
org/eclipse/swt/internal/theme/ButtonDrawData.java | 18 +-
@@ -254,7 +253,7 @@ Subject: [PATCH] Update arch64.diff
.../swt/internal/theme/ToolBarDrawData.java | 6 +-
.../swt/internal/theme/ToolItemDrawData.java | 20 +-
.../swt/internal/webkit/JSClassDefinition.java | 30 +-
- org/eclipse/swt/internal/webkit/WebKitGTK.java | 418 +-
+ org/eclipse/swt/internal/webkit/WebKitGTK.java | 422 +-
org/eclipse/swt/opengl/GLCanvas.java | 34 +-
org/eclipse/swt/printing/PrintDialog.java | 28 +-
org/eclipse/swt/printing/Printer.java | 62 +-
@@ -297,8 +296,8 @@ Subject: [PATCH] Update arch64.diff
org/eclipse/swt/widgets/TableColumn.java | 28 +-
org/eclipse/swt/widgets/TableItem.java | 94 +-
org/eclipse/swt/widgets/Text.java | 214 +-
- org/eclipse/swt/widgets/ToolBar.java | 24 +-
- org/eclipse/swt/widgets/ToolItem.java | 52 +-
+ org/eclipse/swt/widgets/ToolBar.java | 32 +-
+ org/eclipse/swt/widgets/ToolItem.java | 66 +-
org/eclipse/swt/widgets/ToolTip.java | 54 +-
org/eclipse/swt/widgets/TouchSource.java | 4 +-
org/eclipse/swt/widgets/Tracker.java | 26 +-
@@ -306,8 +305,8 @@ Subject: [PATCH] Update arch64.diff
org/eclipse/swt/widgets/Tree.java | 360 +-
org/eclipse/swt/widgets/TreeColumn.java | 28 +-
org/eclipse/swt/widgets/TreeItem.java | 118 +-
- org/eclipse/swt/widgets/Widget.java | 196 +-
- 303 files changed, 8948 insertions(+), 8948 deletions(-)
+ org/eclipse/swt/widgets/Widget.java | 198 +-
+ 302 files changed, 9007 insertions(+), 9007 deletions(-)
diff --git a/org/eclipse/swt/accessibility/Accessible.java b/org/eclipse/swt/accessibility/Accessible.java
index 9c2821c..2b8fcc0 100644
@@ -2147,11 +2146,11 @@ index 2718463..8c1844e 100644
loadLibrary ();
handle = getAWTHandle (parent);
diff --git a/org/eclipse/swt/browser/AppFileLocProvider.java b/org/eclipse/swt/browser/AppFileLocProvider.java
-index 7de3b85..0e0d7d8 100644
+index cb4b2d2..cf2ce11 100644
--- a/org/eclipse/swt/browser/AppFileLocProvider.java
+++ b/org/eclipse/swt/browser/AppFileLocProvider.java
-@@ -46,7 +46,7 @@ AppFileLocProvider (String mozillaPath, String profilePath, boolean isXULRunner)
- this.profilePath = profilePath + SEPARATOR_OS;
+@@ -47,7 +47,7 @@ AppFileLocProvider (String mozillaPath, String profilePath, String cacheParentPa
+ this.cacheParentPath = cacheParentPath;
this.isXULRunner = isXULRunner;
if (!Compatibility.fileExists (profilePath, "")) { //$NON-NLS-1$
- int /*long*/[] result = new int /*long*/[1];
@@ -2159,7 +2158,7 @@ index 7de3b85..0e0d7d8 100644
nsEmbedString pathString = new nsEmbedString (profilePath);
int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-@@ -69,24 +69,24 @@ int AddRef () {
+@@ -70,24 +70,24 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -2196,7 +2195,7 @@ index 7de3b85..0e0d7d8 100644
};
}
-@@ -105,32 +105,32 @@ void disposeCOMInterfaces () {
+@@ -106,32 +106,32 @@ void disposeCOMInterfaces () {
}
}
@@ -2235,7 +2234,7 @@ index 7de3b85..0e0d7d8 100644
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -142,7 +142,7 @@ int Release () {
+@@ -143,7 +143,7 @@ int Release () {
/* nsIDirectoryServiceProvider2 */
@@ -2244,7 +2243,7 @@ index 7de3b85..0e0d7d8 100644
int size = XPCOM.strlen (prop);
byte[] bytes = new byte[size];
XPCOM.memmove (bytes, prop, size);
-@@ -153,7 +153,7 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) {
+@@ -154,7 +154,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 */
@@ -2253,7 +2252,7 @@ index 7de3b85..0e0d7d8 100644
if (ptr != 0) {
int length = C.strlen (ptr);
byte[] buffer = new byte[length];
-@@ -204,9 +204,9 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) {
+@@ -205,9 +205,9 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) {
propertyValues = pluginDirs;
}
@@ -2265,7 +2264,7 @@ index 7de3b85..0e0d7d8 100644
nsISupports[] files = new nsISupports [propertyValues.length];
int index = 0;
for (int i = 0; i < propertyValues.length; i++) {
-@@ -240,7 +240,7 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) {
+@@ -241,7 +241,7 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) {
SimpleEnumerator enumerator = new SimpleEnumerator (files);
enumerator.AddRef ();
@@ -2274,7 +2273,7 @@ index 7de3b85..0e0d7d8 100644
return XPCOM.NS_OK;
}
-@@ -249,7 +249,7 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) {
+@@ -250,7 +250,7 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) {
/* nsIDirectoryServiceProvider implementation */
@@ -2283,7 +2282,7 @@ index 7de3b85..0e0d7d8 100644
int size = XPCOM.strlen (prop);
byte[] bytes = new byte[size];
XPCOM.memmove (bytes, prop, size);
-@@ -303,9 +303,9 @@ int getFile(int /*long*/ prop, int /*long*/ persistent, int /*long*/ _retval) {
+@@ -304,9 +304,9 @@ int getFile(int /*long*/ prop, int /*long*/ persistent, int /*long*/ _retval) {
}
XPCOM.memmove (persistent, new boolean[] {true});
@@ -2295,7 +2294,7 @@ index 7de3b85..0e0d7d8 100644
nsEmbedString pathString = new nsEmbedString (propertyValue);
int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-@@ -318,7 +318,7 @@ int getFile(int /*long*/ prop, int /*long*/ persistent, int /*long*/ _retval) {
+@@ -319,7 +319,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);
@@ -3164,10 +3163,193 @@ index 3ec20e7..2a2e150 100644
}
}
diff --git a/org/eclipse/swt/browser/External.java b/org/eclipse/swt/browser/External.java
-index cd195fc..af2acca 100644
+index 231d698..3507e30 100644
--- a/org/eclipse/swt/browser/External.java
+++ b/org/eclipse/swt/browser/External.java
-@@ -39,40 +39,40 @@ int AddRef () {
+@@ -46,12 +46,12 @@ External () {
+ * QueryInterface answers an nsIScriptObjectOwner implementation (which points
+ * at this function) iff the detected XULRunner version is >= 4.
+ */
+-static int /*long*/ callJava (int /*long*/ cx, int /*long*/ argc, int /*long*/ vp) {
++static long /*int*/ callJava (long /*int*/ cx, long /*int*/ argc, long /*int*/ vp) {
+ int jsval_sizeof = 8;
+- int /*long*/ argsPtr = vp + 2 * jsval_sizeof;
++ long /*int*/ argsPtr = vp + 2 * jsval_sizeof;
+ nsIVariant resultVariant = null;
+
+- 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);
+@@ -82,14 +82,14 @@ static int /*long*/ callJava (int /*long*/ cx, int /*long*/ argc, int /*long*/ v
+ argsPtr += jsval_sizeof;
+ rc = connect.JSValToVariant (cx, argsPtr, result);
+ if (rc == XPCOM.NS_OK && result[0] != 0) {
+- int /*long*/ tokenVariant = result[0];
++ long /*int*/ tokenVariant = result[0];
+ result[0] = 0;
+
+ /* get the third argument variant (the invocation args) */
+ argsPtr += jsval_sizeof;
+ rc = connect.JSValToVariant (cx, argsPtr, result);
+ if (rc == XPCOM.NS_OK && result[0] != 0) {
+- int /*long*/ argsVariant = result[0];
++ long /*int*/ argsVariant = result[0];
+ result[0] = 0;
+
+ /* invoke the BrowserFunction */
+@@ -124,14 +124,14 @@ static int /*long*/ callJava (int /*long*/ cx, int /*long*/ argc, int /*long*/ v
+
+ nsIMemory memory = new nsIMemory (result[0]);
+ result[0] = 0;
+- int /*long*/ jsVal = memory.Alloc (jsval_sizeof);
++ long /*int*/ jsVal = memory.Alloc (jsval_sizeof);
+ C.memset (jsVal, 0, jsval_sizeof);
+- int /*long*/ globalObject = XPCOM.JS_GetGlobalObject (Mozilla.getJSLibPathBytes (), cx);
++ long /*int*/ globalObject = XPCOM.JS_GetGlobalObject (Mozilla.getJSLibPathBytes (), cx);
+ rc = connect.VariantToJS (cx, globalObject, resultVariant.getAddress (), jsVal);
+ resultVariant.Release ();
+ connect.Release ();
+
+- int /*long*/ returnValue = XPCOM.JS_FALSE;
++ long /*int*/ returnValue = XPCOM.JS_FALSE;
+ if (rc == XPCOM.NS_OK) {
+ /* write the jsval to the return value slot */
+ C.memmove (vp, jsVal, jsval_sizeof);
+@@ -143,9 +143,9 @@ static int /*long*/ callJava (int /*long*/ cx, int /*long*/ argc, int /*long*/ v
+ }
+
+ /* this is the BrowserFunction entry point when the detected XULRunner version is < 4 */
+-static int callJava (int functionId, int /*long*/ tokenVariant, int /*long*/ argsVariant, int /*long*/ returnPtr) {
+- int /*long*/ resultVariant = invokeFunction (functionId, tokenVariant, argsVariant);
+- C.memmove (returnPtr, new int /*long*/[] {resultVariant}, C.PTR_SIZEOF);
++static int callJava (int functionId, long /*int*/ tokenVariant, long /*int*/ argsVariant, long /*int*/ returnPtr) {
++ long /*int*/ resultVariant = invokeFunction (functionId, tokenVariant, argsVariant);
++ C.memmove (returnPtr, new long /*int*/[] {resultVariant}, C.PTR_SIZEOF);
+ return XPCOM.NS_OK;
+ }
+
+@@ -167,7 +167,7 @@ static Object convertToJava (nsIVariant variant, short type) {
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ return new Double (intResult[0]);
+ case nsIDataType.VTYPE_DOUBLE:
+- int /*long*/ doubleReturn = C.malloc (8);
++ long /*int*/ doubleReturn = C.malloc (8);
+ rc = variant.GetAsDouble (doubleReturn);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ double[] doubleResult = new double[1];
+@@ -176,7 +176,7 @@ static Object convertToJava (nsIVariant variant, short type) {
+ return new Double (doubleResult[0]);
+ case nsIDataType.VTYPE_WSTRING_SIZE_IS:
+ int[] size = new int[1]; /* PRInt32 */
+- int /*long*/[] wString = new int /*long*/[1];
++ long /*int*/[] wString = new long /*int*/[1];
+ rc = variant.GetAsWStringWithSize (size, wString);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ char[] chars = new char[size[0]];
+@@ -184,11 +184,11 @@ static Object convertToJava (nsIVariant variant, short type) {
+ return new String (chars);
+ case nsIDataType.VTYPE_ARRAY:
+ Object[] arrayReturn = new Object[0];
+- int /*long*/ iid = C.malloc (nsID.sizeof);
++ long /*int*/ iid = C.malloc (nsID.sizeof);
+ C.memset (iid, 0, nsID.sizeof);
+ int[] count = new int[1]; /* PRUint32 */
+ short[] currentType = new short[1];
+- int /*long*/[] ptr = new int /*long*/[1];
++ long /*int*/[] ptr = new long /*int*/[1];
+ 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);
+@@ -196,7 +196,7 @@ static Object convertToJava (nsIVariant variant, short type) {
+ XPCOM.memmove (id, iid, nsID.sizeof);
+ C.free (iid);
+
+- int /*long*/[] result = new int /*long*/[1];
++ long /*int*/[] result = new long /*int*/[1];
+ rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+@@ -215,7 +215,7 @@ static Object convertToJava (nsIVariant variant, short type) {
+ if (id.Equals (nsIVariant.NS_IVARIANT_IID) || id.Equals (nsIVariant.NS_IVARIANT_10_IID)) {
+ arrayReturn = new Object[count[0]];
+ for (int i = 0; i < count[0]; i++) {
+- int /*long*/[] arrayPtr = new int /*long*/[1];
++ long /*int*/[] arrayPtr = new long /*int*/[1];
+ C.memmove (arrayPtr, ptr[0] + i * C.PTR_SIZEOF, C.PTR_SIZEOF);
+ nsISupports supports = new nsISupports (arrayPtr[0]);
+ rc = supports.QueryInterface (id, result);
+@@ -267,8 +267,8 @@ static Object convertToJava (nsIVariant variant, short type) {
+ case nsIDataType.VTYPE_WCHAR_STR:
+ arrayReturn = new Object[count[0]];
+ for (int i = 0; i < count[0]; i++) {
+- int /*long*/ currentPtr = ptr[0] + i * C.PTR_SIZEOF;
+- int /*long*/[] stringPtr = new int /*long*/[1];
++ long /*int*/ currentPtr = ptr[0] + i * C.PTR_SIZEOF;
++ long /*int*/[] stringPtr = new long /*int*/[1];
+ C.memmove (stringPtr, currentPtr, C.PTR_SIZEOF);
+ int length = XPCOM.strlen_PRUnichar (stringPtr[0]);
+ char[] dest = new char[length];
+@@ -291,7 +291,7 @@ static Object convertToJava (nsIVariant variant, short type) {
+ }
+
+ static nsIVariant convertToJS (Object value, nsIComponentManager componentManager) {
+- int /*long*/[] result = new int /*long*/[1];
++ long /*int*/[] result = new long /*int*/[1];
+ 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]);
+@@ -330,26 +330,26 @@ static nsIVariant convertToJS (Object value, nsIComponentManager componentManage
+ rc = variant.SetAsEmptyArray ();
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ } else {
+- int /*long*/ arrayPtr = C.malloc (C.PTR_SIZEOF * length);
++ long /*int*/ arrayPtr = C.malloc (C.PTR_SIZEOF * length);
+ for (int i = 0; i < length; i++) {
+ Object currentObject = arrayValue[i];
+ try {
+ nsIVariant currentVariant = convertToJS (currentObject, componentManager);
+- C.memmove (arrayPtr + C.PTR_SIZEOF * i, new int /*long*/[] {currentVariant.getAddress ()}, C.PTR_SIZEOF);
++ C.memmove (arrayPtr + C.PTR_SIZEOF * i, new long /*int*/[] {currentVariant.getAddress ()}, C.PTR_SIZEOF);
+ } catch (SWTException e) {
+ /* invalid return value type */
+ C.free (arrayPtr);
+ variant.Release ();
+ /* release the variants that had previously been added to the array */
+ for (int j = 0; j < i; j++) {
+- int /*long*/[] ptr = new int /*long*/[1];
++ long /*int*/[] ptr = new long /*int*/[1];
+ C.memmove (ptr, arrayPtr + C.PTR_SIZEOF * j, C.PTR_SIZEOF);
+ new nsISupports (ptr[0]).Release ();
+ }
+ throw e;
+ }
+ }
+- int /*long*/ idPtr = C.malloc (nsID.sizeof);
++ long /*int*/ idPtr = C.malloc (nsID.sizeof);
+ XPCOM.memmove (idPtr, Mozilla.IsPre_4 ? nsIVariant.NS_IVARIANT_IID : nsIVariant.NS_IVARIANT_10_IID, nsID.sizeof);
+ rc = variant.SetAsArray (nsIDataType.VTYPE_INTERFACE_IS, idPtr, length, arrayPtr);
+ C.free (idPtr);
+@@ -364,7 +364,7 @@ static nsIVariant convertToJS (Object value, nsIComponentManager componentManage
+ return null;
+ }
+
+-static int /*long*/ invokeFunction (int functionId, int /*long*/ tokenVariant, int /*long*/ args) {
++static long /*int*/ invokeFunction (int functionId, long /*int*/ tokenVariant, long /*int*/ args) {
+ Object key = new Integer (functionId);
+ BrowserFunction function = (BrowserFunction)Mozilla.AllFunctions.get (key);
+ Object returnValue = null;
+@@ -405,7 +405,7 @@ static int /*long*/ invokeFunction (int functionId, int /*long*/ tokenVariant, i
+ }
+ }
+
+- int /*long*/[] result = new int /*long*/[1];
++ long /*int*/[] result = new long /*int*/[1];
+ int rc = XPCOM.NS_GetComponentManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+@@ -431,48 +431,48 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -3231,9 +3413,22 @@ index cd195fc..af2acca 100644
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return callJava ((int)/*64*/args[0], args[1], args[2], args[3]);}
};
-
+
+ scriptObjectOwner = new XPCOMObject (new int[] {2, 0, 0, 2, 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 getScriptObject (args[0], args[1]);}
+- public int /*long*/ method4 (int /*long*/[] args) {return setScriptObject (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 getScriptObject (args[0], args[1]);}
++ public long /*int*/ method4 (long /*int*/[] args) {return setScriptObject (args[0]);}
+ };
}
-@@ -88,37 +88,37 @@ void disposeCOMInterfaces () {
+
+@@ -499,45 +499,45 @@ void disposeCOMInterfaces () {
}
}
@@ -3260,7 +3455,7 @@ index cd195fc..af2acca 100644
AddRef();
return XPCOM.NS_OK;
}
- if (guid.Equals (nsISecurityCheckedComponent.NS_ISECURITYCHECKEDCOMPONENT_IID)) {
+ if (guid.Equals (XPCOM.NS_ISECURITYCHECKEDCOMPONENT_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {securityCheckedComponent.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {securityCheckedComponent.getAddress ()}, C.PTR_SIZEOF);
AddRef();
@@ -3273,12 +3468,21 @@ index cd195fc..af2acca 100644
return XPCOM.NS_OK;
}
+ if (!Mozilla.IsPre_4) {
+ if (guid.Equals(XPCOM.NS_ISCRIPTOBJECTOWNER_IID)) {
+- XPCOM.memmove (ppvObject, new int /*long*/[] {scriptObjectOwner.getAddress ()}, C.PTR_SIZEOF);
++ XPCOM.memmove (ppvObject, new long /*int*/[] {scriptObjectOwner.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;
}
-@@ -130,8 +130,8 @@ int Release () {
+@@ -549,8 +549,8 @@ int Release () {
/* nsIClassInfo */
@@ -3289,7 +3493,7 @@ index cd195fc..af2acca 100644
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 @@ int getClassDescription (int /*long*/ _retValue) {
+@@ -566,43 +566,43 @@ int getClassDescription (int /*long*/ _retValue) {
nsIMemory memory = new nsIMemory (result[0]);
result[0] = 0;
byte[] bytes = MozillaDelegate.wcsToMbcs (null, "external", true); //$NON-NLS-1$
@@ -3337,7 +3541,6 @@ index cd195fc..af2acca 100644
return XPCOM.NS_OK;
}
-
-int getInterfaces (int /*long*/ count, int /*long*/ array) {
- int /*long*/[] result = new int /*long*/[1];
+int getInterfaces (long /*int*/ count, long /*int*/ array) {
@@ -3345,28 +3548,61 @@ index cd195fc..af2acca 100644
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 @@ int getInterfaces (int /*long*/ count, int /*long*/ array) {
+@@ -617,20 +617,20 @@ int getInterfaces (int /*long*/ count, int /*long*/ array) {
nsIMemory memory = new nsIMemory (result[0]);
result[0] = 0;
- int /*long*/ securityCheckedComponentIID = memory.Alloc (nsID.sizeof);
+ long /*int*/ securityCheckedComponentIID = memory.Alloc (nsID.sizeof);
- XPCOM.memmove (securityCheckedComponentIID, nsISecurityCheckedComponent.NS_ISECURITYCHECKEDCOMPONENT_IID, nsID.sizeof);
+ XPCOM.memmove (securityCheckedComponentIID, XPCOM.NS_ISECURITYCHECKEDCOMPONENT_IID, nsID.sizeof);
- int /*long*/ externalIID = memory.Alloc (nsID.sizeof);
+ long /*int*/ externalIID = memory.Alloc (nsID.sizeof);
XPCOM.memmove (externalIID, EXTERNAL_IID, nsID.sizeof);
-- int /*long*/ ptrArray = memory.Alloc (2 * C.PTR_SIZEOF);
+- int /*long*/ ptrArray = memory.Alloc (3 * C.PTR_SIZEOF);
- C.memmove (ptrArray, new int /*long*/[] {securityCheckedComponentIID}, C.PTR_SIZEOF);
- C.memmove (ptrArray + C.PTR_SIZEOF, new int /*long*/[] {externalIID}, C.PTR_SIZEOF);
-- C.memmove (array, new int /*long*/[] {ptrArray}, C.PTR_SIZEOF);
-+ long /*int*/ ptrArray = memory.Alloc (2 * C.PTR_SIZEOF);
++ long /*int*/ ptrArray = memory.Alloc (3 * C.PTR_SIZEOF);
+ C.memmove (ptrArray, new long /*int*/[] {securityCheckedComponentIID}, C.PTR_SIZEOF);
+ C.memmove (ptrArray + C.PTR_SIZEOF, new long /*int*/[] {externalIID}, C.PTR_SIZEOF);
+
+ nsID NS_ASDF_IID = new nsID("a40ce52e-2d8c-400f-9af2-f8784a656070");
+- int /*long*/ asdfIID = memory.Alloc (nsID.sizeof);
++ long /*int*/ asdfIID = memory.Alloc (nsID.sizeof);
+ XPCOM.memmove (asdfIID, NS_ASDF_IID, nsID.sizeof);
+- C.memmove (ptrArray + 2 * C.PTR_SIZEOF, new int /*long*/[] {asdfIID}, C.PTR_SIZEOF);
++ C.memmove (ptrArray + 2 * C.PTR_SIZEOF, new long /*int*/[] {asdfIID}, C.PTR_SIZEOF);
+
+- C.memmove (array, new int /*long*/[] {ptrArray}, C.PTR_SIZEOF);
+ C.memmove (array, new long /*int*/[] {ptrArray}, C.PTR_SIZEOF);
memory.Release ();
- C.memmove (count, new int[] {2}, 4); /* PRUint */
-@@ -215,8 +215,8 @@ int getInterfaces (int /*long*/ count, int /*long*/ array) {
+ C.memmove (count, new int[] {3}, 4); /* PRUint */
+@@ -639,27 +639,27 @@ int getInterfaces (int /*long*/ count, int /*long*/ array) {
+
+ /* nsIScriptObjectOwner */
+
+-int getScriptObject (int /*long*/ aContext, int /*long*/ aScriptObject) {
++int getScriptObject (long /*int*/ aContext, long /*int*/ aScriptObject) {
+ byte[] jsLibPath = Mozilla.getJSLibPathBytes ();
+- int /*long*/ nativeContext = XPCOM.nsIScriptContext_GetNativeContext (aContext);
+- int /*long*/ globalJSObject = XPCOM.JS_GetGlobalObject (jsLibPath, nativeContext);
+- int /*long*/ newObject = XPCOM.JS_NewObject (jsLibPath, nativeContext, 0, 0, globalJSObject);
++ long /*int*/ nativeContext = XPCOM.nsIScriptContext_GetNativeContext (aContext);
++ long /*int*/ globalJSObject = XPCOM.JS_GetGlobalObject (jsLibPath, nativeContext);
++ long /*int*/ newObject = XPCOM.JS_NewObject (jsLibPath, nativeContext, 0, 0, globalJSObject);
+
+ byte[] functionName = MozillaDelegate.wcsToMbcs (null, "callJava", true); //$NON-NLS-1$
+ int flags = XPCOM.JSPROP_ENUMERATE | XPCOM.JSPROP_READONLY | XPCOM.JSPROP_PERMANENT;
+ XPCOM.JS_DefineFunction (jsLibPath, nativeContext, newObject, functionName, XPCOM.CALLBACK_JSNative (CallJavaProc.getAddress ()), 3, flags);
+- XPCOM.memmove (aScriptObject, new int /*long*/[] {newObject}, C.PTR_SIZEOF);
++ XPCOM.memmove (aScriptObject, new long /*int*/[] {newObject}, C.PTR_SIZEOF);
+ return XPCOM.NS_OK;
+ }
+
+-int setScriptObject (int /*long*/ aScriptObject) {
++int setScriptObject (long /*int*/ aScriptObject) {
+ return XPCOM.NS_COMFALSE;
+ }
/* nsISecurityCheckedComponent */
@@ -3377,7 +3613,7 @@ index cd195fc..af2acca 100644
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 @@ int canCreateWrapper (int /*long*/ iid, int /*long*/ _retVal) {
+@@ -675,16 +675,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$
@@ -3398,7 +3634,7 @@ index cd195fc..af2acca 100644
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 @@ int canCallMethod (int /*long*/ iid, int /*long*/ methodName, int /*long*/ _retV
+@@ -709,16 +709,16 @@ int canCallMethod (int /*long*/ iid, int /*long*/ methodName, int /*long*/ _retV
} else {
bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$
}
@@ -3419,7 +3655,7 @@ index cd195fc..af2acca 100644
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 @@ int canGetProperty (int /*long*/ iid, int /*long*/ propertyName, int /*long*/ _r
+@@ -734,16 +734,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$
@@ -3440,7 +3676,7 @@ index cd195fc..af2acca 100644
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 @@ int canSetProperty (int /*long*/ iid, int /*long*/ propertyName, int /*long*/ _r
+@@ -759,9 +759,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$
@@ -3452,134 +3688,6 @@ index cd195fc..af2acca 100644
memory.Release ();
return XPCOM.NS_OK;
-@@ -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:
-- int /*long*/ doubleReturn = C.malloc (8);
-+ long /*int*/ doubleReturn = C.malloc (8);
- rc = variant.GetAsDouble (doubleReturn);
- if (rc != XPCOM.NS_OK) Mozilla.error (rc);
- double[] doubleResult = new double[1];
-@@ -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 */
-- int /*long*/[] wString = new int /*long*/[1];
-+ long /*int*/[] wString = new long /*int*/[1];
- rc = variant.GetAsWStringWithSize (size, wString);
- if (rc != XPCOM.NS_OK) Mozilla.error (rc);
- char[] chars = new char[size[0]];
-@@ -361,11 +361,11 @@ Object convertToJava (nsIVariant variant, short type) {
- return new String (chars);
- case nsIDataType.VTYPE_ARRAY:
- Object[] arrayReturn = new Object[0];
-- int /*long*/ iid = C.malloc (nsID.sizeof);
-+ long /*int*/ iid = C.malloc (nsID.sizeof);
- C.memset (iid, 0, nsID.sizeof);
- int[] count = new int[1]; /* PRUint32 */
- short[] currentType = new short[1];
-- int /*long*/[] ptr = new int /*long*/[1];
-+ long /*int*/[] ptr = new long /*int*/[1];
- 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 @@ Object convertToJava (nsIVariant variant, short type) {
- XPCOM.memmove (id, iid, nsID.sizeof);
- C.free (iid);
-
-- int /*long*/[] result = new int /*long*/[1];
-+ long /*int*/[] result = new long /*int*/[1];
- 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 @@ 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++) {
-- int /*long*/[] arrayPtr = new int /*long*/[1];
-+ long /*int*/[] arrayPtr = new long /*int*/[1];
- 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 @@ Object convertToJava (nsIVariant variant, short type) {
- case nsIDataType.VTYPE_WCHAR_STR:
- arrayReturn = new Object[count[0]];
- for (int i = 0; i < count[0]; i++) {
-- int /*long*/ currentPtr = ptr[0] + i * C.PTR_SIZEOF;
-- int /*long*/[] stringPtr = new int /*long*/[1];
-+ long /*int*/ currentPtr = ptr[0] + i * C.PTR_SIZEOF;
-+ long /*int*/[] stringPtr = new long /*int*/[1];
- C.memmove (stringPtr, currentPtr, C.PTR_SIZEOF);
- int length = XPCOM.strlen_PRUnichar (stringPtr[0]);
- char[] dest = new char[length];
-@@ -468,7 +468,7 @@ Object convertToJava (nsIVariant variant, short type) {
- }
-
- nsIVariant convertToJS (Object value, nsIComponentManager componentManager) {
-- int /*long*/[] result = new int /*long*/[1];
-+ long /*int*/[] result = new long /*int*/[1];
- 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]);
-@@ -507,26 +507,26 @@ nsIVariant convertToJS (Object value, nsIComponentManager componentManager) {
- rc = variant.SetAsEmptyArray ();
- if (rc != XPCOM.NS_OK) Mozilla.error (rc);
- } else {
-- int /*long*/ arrayPtr = C.malloc (C.PTR_SIZEOF * length);
-+ long /*int*/ arrayPtr = C.malloc (C.PTR_SIZEOF * length);
- for (int i = 0; i < length; i++) {
- Object currentObject = arrayValue[i];
- try {
- nsIVariant currentVariant = convertToJS (currentObject, componentManager);
-- C.memmove (arrayPtr + C.PTR_SIZEOF * i, new int /*long*/[] {currentVariant.getAddress ()}, C.PTR_SIZEOF);
-+ C.memmove (arrayPtr + C.PTR_SIZEOF * i, new long /*int*/[] {currentVariant.getAddress ()}, C.PTR_SIZEOF);
- } catch (SWTException e) {
- /* invalid return value type */
- C.free (arrayPtr);
- variant.Release ();
- /* release the variants that had previously been added to the array */
- for (int j = 0; j < i; j++) {
-- int /*long*/[] ptr = new int /*long*/[1];
-+ long /*int*/[] ptr = new long /*int*/[1];
- C.memmove (ptr, arrayPtr + C.PTR_SIZEOF * j, C.PTR_SIZEOF);
- new nsISupports (ptr[0]).Release ();
- }
- throw e;
- }
- }
-- int /*long*/ idPtr = C.malloc (nsID.sizeof);
-+ long /*int*/ idPtr = C.malloc (nsID.sizeof);
- XPCOM.memmove (idPtr, nsIVariant.NS_IVARIANT_IID, nsID.sizeof);
- rc = variant.SetAsArray (nsIDataType.VTYPE_INTERFACE_IS, idPtr, length, arrayPtr);
- C.free (idPtr);
-@@ -541,7 +541,7 @@ nsIVariant convertToJS (Object value, nsIComponentManager componentManager) {
- return null;
- }
-
--int callJava (int functionId, int /*long*/ tokenVariant, int /*long*/ args, int /*long*/ returnPtr) {
-+int callJava (int functionId, long /*int*/ tokenVariant, long /*int*/ args, long /*int*/ returnPtr) {
- Object key = new Integer (functionId);
- BrowserFunction function = (BrowserFunction)Mozilla.AllFunctions.get (key);
- Object returnValue = null;
-@@ -582,7 +582,7 @@ int callJava (int functionId, int /*long*/ tokenVariant, int /*long*/ args, int
- }
- }
-
-- int /*long*/[] result = new int /*long*/[1];
-+ long /*int*/[] result = new long /*int*/[1];
- int rc = XPCOM.NS_GetComponentManager (result);
- if (rc != XPCOM.NS_OK) Mozilla.error (rc);
- if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-@@ -596,7 +596,7 @@ int callJava (int functionId, int /*long*/ tokenVariant, int /*long*/ args, int
- variant = convertToJS (WebBrowser.CreateErrorString (e.getLocalizedMessage ()), componentManager);
- }
- componentManager.Release ();
-- C.memmove (returnPtr, new int /*long*/[] {variant.getAddress ()}, C.PTR_SIZEOF);
-+ C.memmove (returnPtr, new long /*int*/[] {variant.getAddress ()}, C.PTR_SIZEOF);
-
- return XPCOM.NS_OK;
- }
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
@@ -3981,65 +4089,65 @@ index 1a184f7..4e532eb 100644
return XPCOM.NS_OK;
}
diff --git a/org/eclipse/swt/browser/FilePicker_10.java b/org/eclipse/swt/browser/FilePicker_10.java
-index 4affcfc..fad4bec 100644
+index b976233..5ad410c 100644
--- a/org/eclipse/swt/browser/FilePicker_10.java
+++ b/org/eclipse/swt/browser/FilePicker_10.java
@@ -17,32 +17,32 @@ class FilePicker_10 extends FilePicker_1_8 {
- 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, 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 XPCOM.NS_ERROR_NOT_IMPLEMENTED;}
-- public int /*long*/ method18 (int /*long*/[] args) {return XPCOM.NS_ERROR_NOT_IMPLEMENTED;}
-- public int /*long*/ method19 (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 XPCOM.NS_ERROR_NOT_IMPLEMENTED;}
-+ public long /*int*/ method18 (long /*int*/[] args) {return XPCOM.NS_ERROR_NOT_IMPLEMENTED;}
-+ public long /*int*/ method19 (long /*int*/[] args) {return Show (args[0]);}
- };
- }
-
+ 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, 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 XPCOM.NS_ERROR_NOT_IMPLEMENTED;}
+- public int /*long*/ method18 (int /*long*/[] args) {return XPCOM.NS_ERROR_NOT_IMPLEMENTED;}
+- public int /*long*/ method19 (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 XPCOM.NS_ERROR_NOT_IMPLEMENTED;}
++ public long /*int*/ method18 (long /*int*/[] args) {return XPCOM.NS_ERROR_NOT_IMPLEMENTED;}
++ public long /*int*/ method19 (long /*int*/[] args) {return Show (args[0]);}
+ };
+ }
+
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
@@ -4514,7 +4622,7 @@ index 4dccd62..e051d80 100644
XPCOM.memmove (_retval, new boolean[] {false});
return XPCOM.NS_OK;
diff --git a/org/eclipse/swt/browser/Mozilla.java b/org/eclipse/swt/browser/Mozilla.java
-index 0a97422..3d563fd 100644
+index c4ed39d..9c66042 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.*;
@@ -4535,7 +4643,7 @@ index 0a97422..3d563fd 100644
Point location, size;
boolean visible, isChild, ignoreDispose, isRetrievingBadCert, isViewingErrorPage, ignoreAllMessages, untrustedText;
boolean updateLastNavigateUrl;
-@@ -123,7 +123,7 @@ class Mozilla extends WebBrowser {
+@@ -124,7 +124,7 @@ class Mozilla extends WebBrowser {
public void handleEvent (Event event) {
if (BrowserCount > 0) return; /* another display is still active */
@@ -4544,7 +4652,7 @@ index 0a97422..3d563fd 100644
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -188,18 +188,18 @@ class Mozilla extends WebBrowser {
+@@ -189,18 +189,18 @@ class Mozilla extends WebBrowser {
// int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
// /* alloc memory for two structs, the second is empty to signify the end of the list */
@@ -4566,7 +4674,7 @@ index 0a97422..3d563fd 100644
// result[0] = 0;
// C.free (functionLoad.function);
// C.free (functionLoad.functionName);
-@@ -221,7 +221,7 @@ class Mozilla extends WebBrowser {
+@@ -222,7 +222,7 @@ class Mozilla extends WebBrowser {
boolean hostSet = oldProxyHostFTP != null || oldProxyHostHTTP != null || oldProxyHostSSL != null;
if (!hostSet && oldProxyPortFTP == -1 && oldProxyPortHTTP == -1 && oldProxyPortSSL == -1 && oldProxyType == -1) return;
@@ -4575,7 +4683,7 @@ index 0a97422..3d563fd 100644
byte[] buffer = new byte[1];
int rc = prefService.GetBranch (buffer, result); /* empty buffer denotes root preference level */
if (rc != XPCOM.NS_OK) error (rc);
-@@ -326,7 +326,7 @@ class Mozilla extends WebBrowser {
+@@ -327,7 +327,7 @@ class Mozilla extends WebBrowser {
MozillaClearSessions = new Runnable () {
public void run () {
if (!Initialized) return;
@@ -4584,7 +4692,7 @@ index 0a97422..3d563fd 100644
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -356,9 +356,9 @@ class Mozilla extends WebBrowser {
+@@ -357,9 +357,9 @@ class Mozilla extends WebBrowser {
rc = cookie.GetExpires (expires);
if (expires[0] == 0) {
/* indicates a session cookie */
@@ -4597,7 +4705,7 @@ index 0a97422..3d563fd 100644
cookie.GetHost (domain);
cookie.GetName (name);
cookie.GetPath (path);
-@@ -381,7 +381,7 @@ class Mozilla extends WebBrowser {
+@@ -382,7 +382,7 @@ class Mozilla extends WebBrowser {
public void run() {
if (!Initialized) return;
@@ -4606,7 +4714,7 @@ index 0a97422..3d563fd 100644
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -395,7 +395,7 @@ class Mozilla extends WebBrowser {
+@@ -396,7 +396,7 @@ class Mozilla extends WebBrowser {
nsIIOService ioService = new nsIIOService (result[0]);
result[0] = 0;
byte[] bytes = MozillaDelegate.wcsToMbcs (null, CookieUrl, false);
@@ -4615,7 +4723,7 @@ index 0a97422..3d563fd 100644
rc = ioService.NewURI (aSpec, null, 0, result);
XPCOM.nsEmbedCString_delete (aSpec);
ioService.Release ();
-@@ -409,7 +409,7 @@ class Mozilla extends WebBrowser {
+@@ -410,7 +410,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);
@@ -4624,7 +4732,7 @@ index 0a97422..3d563fd 100644
if (rc == XPCOM.NS_OK && result[0] != 0) {
nsICookieService cookieService = new nsICookieService (result[0]);
result[0] = 0;
-@@ -484,7 +484,7 @@ class Mozilla extends WebBrowser {
+@@ -485,7 +485,7 @@ class Mozilla extends WebBrowser {
public void run() {
if (!Initialized) return;
@@ -4633,7 +4741,7 @@ index 0a97422..3d563fd 100644
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -498,7 +498,7 @@ class Mozilla extends WebBrowser {
+@@ -499,7 +499,7 @@ class Mozilla extends WebBrowser {
nsIIOService ioService = new nsIIOService (result[0]);
result[0] = 0;
byte[] bytes = MozillaDelegate.wcsToMbcs (null, CookieUrl, false);
@@ -4642,7 +4750,7 @@ index 0a97422..3d563fd 100644
rc = ioService.NewURI (aSpec, null, 0, result);
XPCOM.nsEmbedCString_delete (aSpec);
ioService.Release ();
-@@ -619,7 +619,7 @@ static void LoadLibraries () {
+@@ -631,7 +631,7 @@ static void LoadLibraries () {
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 */
@@ -4651,7 +4759,7 @@ index 0a97422..3d563fd 100644
if (ptr == 0) {
IsXULRunner = false;
} else {
-@@ -663,7 +663,7 @@ public void create (Composite parent, int style) {
+@@ -675,7 +675,7 @@ public void create (Composite parent, int style) {
delegate = new MozillaDelegate (browser);
final Display display = parent.getDisplay ();
@@ -4660,7 +4768,7 @@ index 0a97422..3d563fd 100644
if (!Initialized) {
LoadLibraries ();
-@@ -959,7 +959,7 @@ public void create (Composite parent, int style) {
+@@ -972,7 +972,7 @@ public void create (Composite parent, int style) {
/* if tabbing onto a page for the first time then full-Browser focus ring should be shown */
@@ -4669,7 +4777,7 @@ index 0a97422..3d563fd 100644
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -1046,7 +1046,7 @@ public void create (Composite parent, int style) {
+@@ -1059,7 +1059,7 @@ public void create (Composite parent, int style) {
public boolean back () {
htmlBytes = null;
@@ -4678,7 +4786,7 @@ index 0a97422..3d563fd 100644
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);
-@@ -1076,122 +1076,122 @@ public boolean close () {
+@@ -1089,122 +1089,122 @@ public boolean close () {
void createCOMInterfaces () {
// Create each of the interfaces that this object implements
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -4881,7 +4989,7 @@ index 0a97422..3d563fd 100644
};
}
-@@ -1270,7 +1270,7 @@ public boolean execute (String script) {
+@@ -1283,7 +1283,7 @@ public boolean execute (String script) {
* workaround is to invoke the javascript handler directly via C++, which is
* exposed as of mozilla 1.9.
*/
@@ -4890,7 +4998,7 @@ index 0a97422..3d563fd 100644
if (!IsPre_1_9) {
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -1319,13 +1319,13 @@ public boolean execute (String script) {
+@@ -1332,13 +1332,13 @@ public boolean execute (String script) {
interfaceRequestor.Release ();
if (rc == XPCOM.NS_OK && result[0] != 0) {
@@ -4906,7 +5014,7 @@ index 0a97422..3d563fd 100644
new nsISupports (scriptGlobalObject).Release ();
if (scriptContext != 0) {
-@@ -1348,7 +1348,7 @@ public boolean execute (String script) {
+@@ -1361,7 +1361,7 @@ public boolean execute (String script) {
new nsISupports (result[0]).Release ();
result[0] = 0;
@@ -4915,25 +5023,21 @@ index 0a97422..3d563fd 100644
if (nativeContext != 0) {
int length = script.length ();
char[] scriptChars = new char[length];
-@@ -1356,7 +1356,7 @@ public boolean execute (String script) {
+@@ -1369,11 +1369,11 @@ 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) {
- int /*long*/ principals = result[0];
+ long /*int*/ principals = result[0];
result[0] = 0;
- String jsLibraryName = IsPre_4 ? MozillaDelegate.getJSLibraryName_Pre4() : MozillaDelegate.getJSLibraryName();
- if (pathBytes_JSEvaluateUCScriptForPrincipals == null) {
-@@ -1368,7 +1368,7 @@ public boolean execute (String script) {
- }
- }
-
-- int /*long*/ globalJSObject = XPCOM.JS_GetGlobalObject (pathBytes_JSEvaluateUCScriptForPrincipals, nativeContext);
-+ long /*int*/ globalJSObject = XPCOM.JS_GetGlobalObject (pathBytes_JSEvaluateUCScriptForPrincipals, nativeContext);
+
+ byte[] jsLibPath = getJSLibPathBytes ();
+- int /*long*/ globalJSObject = XPCOM.JS_GetGlobalObject (jsLibPath, nativeContext);
++ long /*int*/ globalJSObject = XPCOM.JS_GetGlobalObject (jsLibPath, nativeContext);
if (globalJSObject != 0) {
aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_CONTEXTSTACK_CONTRACTID, true);
rc = serviceManager.GetServiceByContractID (aContractID, nsIJSContextStack.NS_IJSCONTEXTSTACK_IID, result);
-@@ -1418,12 +1418,12 @@ public boolean execute (String script) {
+@@ -1423,12 +1423,12 @@ public boolean execute (String script) {
return rc == XPCOM.NS_OK;
}
@@ -4949,7 +5053,7 @@ index 0a97422..3d563fd 100644
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-@@ -1443,7 +1443,7 @@ static Browser getBrowser (int /*long*/ aDOMWindow) {
+@@ -1448,7 +1448,7 @@ static Browser getBrowser (int /*long*/ aDOMWindow) {
rc = window.GetTop (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
@@ -4958,7 +5062,7 @@ index 0a97422..3d563fd 100644
result[0] = 0;
rc = windowWatcher.GetChromeForWindow (topDOMWindow, result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-@@ -1471,7 +1471,7 @@ static Browser getBrowser (int /*long*/ aDOMWindow) {
+@@ -1478,7 +1478,7 @@ static Browser getBrowser (int /*long*/ aDOMWindow) {
public boolean forward () {
htmlBytes = null;
@@ -4967,7 +5071,7 @@ index 0a97422..3d563fd 100644
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);
-@@ -1491,7 +1491,7 @@ static String getMozillaPath () {
+@@ -1511,7 +1511,7 @@ static String getMozillaPath () {
if (LocationProvider != null) return LocationProvider.mozillaPath;
if (!Initialized) return "";
@@ -4976,7 +5080,7 @@ index 0a97422..3d563fd 100644
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -1521,11 +1521,11 @@ static String getMozillaPath () {
+@@ -1541,11 +1541,11 @@ static String getMozillaPath () {
nsIFile mozillaDir = new nsIFile (result[0]);
result[0] = 0;
@@ -4990,7 +5094,7 @@ index 0a97422..3d563fd 100644
char[] chars = new char[length];
XPCOM.memmove (chars, ptr, length * 2);
XPCOM.nsEmbedString_delete (path);
-@@ -1539,7 +1539,7 @@ int getNextFunctionIndex () {
+@@ -1559,7 +1559,7 @@ int getNextFunctionIndex () {
}
public String getText () {
@@ -4999,7 +5103,7 @@ index 0a97422..3d563fd 100644
int rc = webBrowser.GetContentDOMWindow (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -1551,7 +1551,7 @@ public String getText () {
+@@ -1571,7 +1571,7 @@ public String getText () {
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
window.Release ();
@@ -5008,7 +5112,7 @@ index 0a97422..3d563fd 100644
result[0] = 0;
rc = XPCOM.NS_GetComponentManager (result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -1568,12 +1568,12 @@ public String getText () {
+@@ -1588,12 +1588,12 @@ public String getText () {
nsIDOMSerializer_1_7 serializer = new nsIDOMSerializer_1_7 (result[0]);
result[0] = 0;
@@ -5023,7 +5127,7 @@ index 0a97422..3d563fd 100644
chars = new char[length];
XPCOM.memmove (chars, buffer, length * 2);
XPCOM.nsEmbedString_delete (string);
-@@ -1598,13 +1598,13 @@ public String getText () {
+@@ -1618,13 +1618,13 @@ public String getText () {
}
public String getUrl () {
@@ -5039,7 +5143,7 @@ index 0a97422..3d563fd 100644
rc = webNavigation.GetCurrentURI (aCurrentURI);
if (rc != XPCOM.NS_OK) error (rc);
webNavigation.Release ();
-@@ -1612,11 +1612,11 @@ public String getUrl () {
+@@ -1632,11 +1632,11 @@ public String getUrl () {
byte[] dest = null;
if (aCurrentURI[0] != 0) {
nsIURI uri = new nsIURI (aCurrentURI[0]);
@@ -5053,7 +5157,7 @@ index 0a97422..3d563fd 100644
dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
XPCOM.nsEmbedCString_delete (aSpec);
-@@ -1679,29 +1679,29 @@ static String InitDiscoverXULRunner () {
+@@ -1699,29 +1699,29 @@ static String InitDiscoverXULRunner () {
GREVersionRange range = new GREVersionRange ();
byte[] bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_LOWER, true);
@@ -5088,7 +5192,7 @@ index 0a97422..3d563fd 100644
int rc = XPCOMInit.GRE_GetGREPathWithProperties (range, 1, property, 1, greBuffer, length);
if (rc != XPCOM.NS_OK) {
-@@ -1760,7 +1760,7 @@ void initExternal (String profilePath) {
+@@ -1787,7 +1787,7 @@ void initExternal (String profilePath) {
}
void initFactories (nsIServiceManager serviceManager, nsIComponentManager componentManager, boolean isXULRunner) {
@@ -5097,7 +5201,7 @@ index 0a97422..3d563fd 100644
int rc = componentManager.QueryInterface (nsIComponentRegistrar.NS_ICOMPONENTREGISTRAR_IID, result);
if (rc != XPCOM.NS_OK) {
-@@ -1886,7 +1886,7 @@ void initJavaXPCOM (String mozillaPath) {
+@@ -1921,7 +1921,7 @@ void initJavaXPCOM (String mozillaPath) {
String initMozilla (String mozillaPath) {
/* attempt to use the GRE pointed at by MOZILLA_FIVE_HOME */
@@ -5106,7 +5210,7 @@ index 0a97422..3d563fd 100644
if (ptr != 0) {
int length = C.strlen (ptr);
byte[] buffer = new byte[length];
-@@ -1940,7 +1940,7 @@ String initMozilla (String mozillaPath) {
+@@ -1975,7 +1975,7 @@ String initMozilla (String mozillaPath) {
}
void initXPCOM (String mozillaPath, boolean isXULRunner) {
@@ -5115,7 +5219,7 @@ index 0a97422..3d563fd 100644
nsEmbedString pathString = new nsEmbedString (mozillaPath);
int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
-@@ -1959,7 +1959,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
+@@ -1994,7 +1994,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
if (isXULRunner) {
int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
/* alloc memory for two structs, the second is empty to signify the end of the list */
@@ -5124,7 +5228,7 @@ index 0a97422..3d563fd 100644
C.memset (ptr, 0, size * 2);
nsDynamicFunctionLoad functionLoad = new nsDynamicFunctionLoad ();
-@@ -1971,7 +1971,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
+@@ -2006,7 +2006,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
functionLoad.functionName = C.malloc (bytes.length);
C.memmove (functionLoad.functionName, bytes, bytes.length);
functionLoad.function = C.malloc (C.PTR_SIZEOF);
@@ -5133,7 +5237,7 @@ index 0a97422..3d563fd 100644
XPCOM.memmove (ptr, functionLoad, XPCOM.nsDynamicFunctionLoad_sizeof ());
rc = XPCOM.XPCOMGlueLoadXULFunctions (ptr);
if (rc == XPCOM.NS_OK) {
-@@ -1994,7 +1994,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
+@@ -2029,7 +2029,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
}
C.memmove (result, functionLoad.function, C.PTR_SIZEOF);
@@ -5142,7 +5246,7 @@ index 0a97422..3d563fd 100644
result[0] = 0;
C.free (functionLoad.function);
C.free (functionLoad.functionName);
-@@ -2023,7 +2023,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
+@@ -2058,7 +2058,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
}
void initPreferences (nsIServiceManager serviceManager, nsIComponentManager componentManager) {
@@ -5151,7 +5255,7 @@ index 0a97422..3d563fd 100644
/*
* As a result of using a common profile the user cannot change their locale
-@@ -2382,7 +2382,7 @@ void initPreferences (nsIServiceManager serviceManager, nsIComponentManager comp
+@@ -2417,7 +2417,7 @@ void initPreferences (nsIServiceManager serviceManager, nsIComponentManager comp
}
void initProfile (nsIServiceManager serviceManager, boolean isXULRunner) {
@@ -5160,7 +5264,7 @@ index 0a97422..3d563fd 100644
byte[] buffer = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_OBSERVER_CONTRACTID, true);
int rc = serviceManager.GetServiceByContractID (buffer, nsIObserverService.NS_IOBSERVERSERVICE_IID, result);
-@@ -2417,18 +2417,18 @@ void initProfile (nsIServiceManager serviceManager, boolean isXULRunner) {
+@@ -2452,18 +2452,18 @@ void initProfile (nsIServiceManager serviceManager, boolean isXULRunner) {
if (isXULRunner) {
int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
/* alloc memory for two structs, the second is empty to signify the end of the list */
@@ -5182,7 +5286,7 @@ index 0a97422..3d563fd 100644
result[0] = 0;
C.free (functionLoad.function);
C.free (functionLoad.functionName);
-@@ -2446,7 +2446,7 @@ void initProfile (nsIServiceManager serviceManager, boolean isXULRunner) {
+@@ -2481,7 +2481,7 @@ void initProfile (nsIServiceManager serviceManager, boolean isXULRunner) {
void initSpinup (nsIComponentManager componentManager) {
if (MozillaDelegate.needsSpinup ()) {
@@ -5191,7 +5295,7 @@ index 0a97422..3d563fd 100644
/* nsIAppShell is discontinued as of xulrunner 1.9, so do not fail if it is not found */
int rc = componentManager.CreateInstance (XPCOM.NS_APPSHELL_CID, 0, nsIAppShell.NS_IAPPSHELL_IID, result);
-@@ -2483,7 +2483,7 @@ void initWebBrowserWindows () {
+@@ -2518,7 +2518,7 @@ void initWebBrowserWindows () {
error (rc);
}
@@ -5200,7 +5304,7 @@ index 0a97422..3d563fd 100644
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
if (rc != XPCOM.NS_OK) {
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
-@@ -2529,7 +2529,7 @@ void initWindowCreator (nsIServiceManager serviceManager) {
+@@ -2564,7 +2564,7 @@ void initWindowCreator (nsIServiceManager serviceManager) {
WindowCreator = new WindowCreator2 ();
WindowCreator.AddRef ();
@@ -5209,7 +5313,7 @@ index 0a97422..3d563fd 100644
byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_WINDOWWATCHER_CONTRACTID, true);
int rc = serviceManager.GetServiceByContractID (aContractID, nsIWindowWatcher.NS_IWINDOWWATCHER_IID, result);
if (rc != XPCOM.NS_OK) {
-@@ -2578,7 +2578,7 @@ String initXULRunner (String mozillaPath) {
+@@ -2613,7 +2613,7 @@ String initXULRunner (String mozillaPath) {
}
public boolean isBackEnabled () {
@@ -5218,7 +5322,7 @@ index 0a97422..3d563fd 100644
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);
-@@ -2591,7 +2591,7 @@ public boolean isBackEnabled () {
+@@ -2626,7 +2626,7 @@ public boolean isBackEnabled () {
}
public boolean isForwardEnabled () {
@@ -5227,7 +5331,7 @@ index 0a97422..3d563fd 100644
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);
-@@ -2633,7 +2633,7 @@ void onDispose (Display display) {
+@@ -2668,7 +2668,7 @@ void onDispose (Display display) {
unhookDOMListeners ();
@@ -5236,7 +5340,7 @@ index 0a97422..3d563fd 100644
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
if (rc != XPCOM.NS_OK) {
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
-@@ -2681,7 +2681,7 @@ void onDispose (Display display) {
+@@ -2716,7 +2716,7 @@ void onDispose (Display display) {
}
void Activate () {
@@ -5245,7 +5349,7 @@ index 0a97422..3d563fd 100644
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);
-@@ -2693,7 +2693,7 @@ void Activate () {
+@@ -2728,7 +2728,7 @@ void Activate () {
}
void Deactivate () {
@@ -5254,7 +5358,7 @@ index 0a97422..3d563fd 100644
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);
-@@ -2704,11 +2704,11 @@ void Deactivate () {
+@@ -2739,11 +2739,11 @@ void Deactivate () {
webBrowserFocus.Release ();
}
@@ -5268,7 +5372,7 @@ index 0a97422..3d563fd 100644
byte[] postData = null;
final Vector headers = new Vector ();
int rc = request.QueryInterface (nsIUploadChannel.NS_IUPLOADCHANNEL_IID, result);
-@@ -2768,37 +2768,37 @@ void navigate (int /*long*/ requestHandle) {
+@@ -2803,37 +2803,37 @@ void navigate (int /*long*/ requestHandle) {
/* get the request headers */
XPCOMObject visitor = new XPCOMObject (new int[] {2, 0, 0, 2}) {
int refCount = 0;
@@ -5317,7 +5421,7 @@ index 0a97422..3d563fd 100644
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
String header = new String (dest);
-@@ -2833,11 +2833,11 @@ void navigate (int /*long*/ requestHandle) {
+@@ -2868,11 +2868,11 @@ void navigate (int /*long*/ requestHandle) {
/* a request's name often (but not always) is its url */
String url = lastNavigateURL;
@@ -5331,7 +5435,7 @@ index 0a97422..3d563fd 100644
byte[] bytes = new byte[length];
XPCOM.memmove (bytes, buffer, length);
String value = new String (bytes);
-@@ -2853,7 +2853,7 @@ void onResize () {
+@@ -2888,7 +2888,7 @@ void onResize () {
int width = Math.max (1, rect.width);
int height = Math.max (1, rect.height);
@@ -5340,7 +5444,7 @@ index 0a97422..3d563fd 100644
int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
if (rc != XPCOM.NS_OK) {
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
-@@ -2871,7 +2871,7 @@ void onResize () {
+@@ -2906,7 +2906,7 @@ void onResize () {
public void refresh () {
htmlBytes = null;
@@ -5349,7 +5453,7 @@ index 0a97422..3d563fd 100644
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);
-@@ -2941,7 +2941,7 @@ public boolean setText (String html, boolean trusted) {
+@@ -2976,7 +2976,7 @@ public boolean setText (String html, boolean trusted) {
*/
delegate.removeWindowSubclass ();
@@ -5358,7 +5462,7 @@ index 0a97422..3d563fd 100644
int rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
if (rc == XPCOM.NS_OK && result[0] != 0) {
/*
-@@ -2975,9 +2975,9 @@ public boolean setText (String html, boolean trusted) {
+@@ -3010,9 +3010,9 @@ public boolean setText (String html, boolean trusted) {
webNavigation.Release ();
} else {
byte[] contentCharsetBuffer = MozillaDelegate.wcsToMbcs (null, "UTF-8", false); //$NON-NLS-1$
@@ -5370,7 +5474,7 @@ index 0a97422..3d563fd 100644
rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -2997,7 +2997,7 @@ public boolean setText (String html, boolean trusted) {
+@@ -3032,7 +3032,7 @@ public boolean setText (String html, boolean trusted) {
} else {
aString = MozillaDelegate.wcsToMbcs (null, ABOUT_BLANK, false);
}
@@ -5379,7 +5483,7 @@ index 0a97422..3d563fd 100644
rc = ioService.NewURI (aSpec, null, 0, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -3050,7 +3050,7 @@ public boolean setUrl (String url, String postData, String[] headers) {
+@@ -3085,7 +3085,7 @@ public boolean setUrl (String url, String postData, String[] headers) {
boolean setUrl (String url, byte[] postData, String[] headers) {
htmlBytes = null;
@@ -5388,7 +5492,7 @@ index 0a97422..3d563fd 100644
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);
-@@ -3152,7 +3152,7 @@ boolean setUrl (String url, byte[] postData, String[] headers) {
+@@ -3187,7 +3187,7 @@ boolean setUrl (String url, byte[] postData, String[] headers) {
public void stop () {
htmlBytes = null;
@@ -5397,7 +5501,7 @@ index 0a97422..3d563fd 100644
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);
-@@ -3211,7 +3211,7 @@ void hookDOMListeners (nsIDOMEventTarget target, boolean isTop) {
+@@ -3246,7 +3246,7 @@ void hookDOMListeners (nsIDOMEventTarget target, boolean isTop) {
}
void unhookDOMListeners () {
@@ -5406,7 +5510,7 @@ index 0a97422..3d563fd 100644
int rc = webBrowser.GetContentDOMWindow (result);
if (rc != XPCOM.NS_OK || result[0] == 0) return;
-@@ -3300,73 +3300,73 @@ void unhookDOMListeners (nsIDOMEventTarget target) {
+@@ -3335,73 +3335,73 @@ void unhookDOMListeners (nsIDOMEventTarget target) {
/* nsISupports */
@@ -5494,7 +5598,7 @@ index 0a97422..3d563fd 100644
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -3383,18 +3383,18 @@ int Release () {
+@@ -3418,18 +3418,18 @@ int Release () {
/* nsIWeakReference */
@@ -5516,7 +5620,7 @@ index 0a97422..3d563fd 100644
int rc = webBrowser.GetContentDOMWindow (aContentDOMWindow);
if (rc != XPCOM.NS_OK) error (rc);
if (aContentDOMWindow[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -3404,15 +3404,15 @@ int GetInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+@@ -3439,15 +3439,15 @@ int GetInterface (int /*long*/ riid, int /*long*/ ppvObject) {
return QueryInterface (riid, ppvObject);
}
@@ -5535,7 +5639,7 @@ index 0a97422..3d563fd 100644
if (registerFunctionsOnState != 0 && ((aStateFlags & registerFunctionsOnState) == registerFunctionsOnState)) {
registerFunctionsOnState = 0;
Enumeration elements = functions.elements ();
-@@ -3443,11 +3443,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3478,11 +3478,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
*/
if (updateLastNavigateUrl && aStateFlags == (nsIWebProgressListener.STATE_IS_REQUEST | nsIWebProgressListener.STATE_START)) {
nsIRequest request = new nsIRequest (aRequest);
@@ -5549,7 +5653,7 @@ index 0a97422..3d563fd 100644
byte[] bytes = new byte[length];
XPCOM.memmove (bytes, buffer, length);
String value = new String (bytes);
-@@ -3458,7 +3458,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3493,7 +3493,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
if ((aStateFlags & nsIWebProgressListener.STATE_IS_DOCUMENT) == 0) return XPCOM.NS_OK;
if ((aStateFlags & nsIWebProgressListener.STATE_START) != 0) {
@@ -5558,7 +5662,7 @@ index 0a97422..3d563fd 100644
/*
* When navigating to a site that is known to have a bad certificate, request notification
-@@ -3538,13 +3538,13 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3573,13 +3573,13 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
* are typically added.
*/
@@ -5574,7 +5678,7 @@ index 0a97422..3d563fd 100644
nsIWebProgress progress = new nsIWebProgress (aWebProgress);
rc = progress.GetDOMWindow (window);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -3583,11 +3583,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3618,11 +3618,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
*/
if (htmlBytes != null) {
nsIRequest req = new nsIRequest (aRequest);
@@ -5588,7 +5692,7 @@ index 0a97422..3d563fd 100644
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
String url = new String (dest);
-@@ -3620,7 +3620,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3655,7 +3655,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
} else {
aString = MozillaDelegate.wcsToMbcs (null, URI_FILEROOT, false);
}
@@ -5597,7 +5701,7 @@ index 0a97422..3d563fd 100644
rc = ioService.NewURI (aSpec, null, 0, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -3638,7 +3638,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3673,7 +3673,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
result[0] = 0;
byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", false); // $NON-NLS-1$
@@ -5606,7 +5710,7 @@ index 0a97422..3d563fd 100644
rc = stream.OpenStream (uri.getAddress (), aContentType);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -3662,11 +3662,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3697,11 +3697,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
*/
registerFunctionsOnState = nsIWebProgressListener.STATE_IS_REQUEST | nsIWebProgressListener.STATE_START;
@@ -5620,7 +5724,7 @@ index 0a97422..3d563fd 100644
for (int i = 0; i < pageCount; i++) {
length = i == pageCount - 1 ? htmlBytes.length % pageSize : pageSize;
if (length > 0) {
-@@ -3690,7 +3690,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3725,7 +3725,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
*/
deferCompleted = true;
@@ -5629,7 +5733,7 @@ index 0a97422..3d563fd 100644
nsIWebProgress progress = new nsIWebProgress (aWebProgress);
rc = progress.GetDOMWindow (window);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -3760,7 +3760,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3799,7 +3799,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
updateLastNavigateUrl = false;
nsIRequest request = new nsIRequest (aRequest);
@@ -5638,7 +5742,7 @@ index 0a97422..3d563fd 100644
int rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_10_IID, result);
if (rc != XPCOM.NS_OK) {
rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_IID, result);
-@@ -3775,11 +3775,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3814,11 +3814,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
nsIURI uri = new nsIURI (result[0]);
result[0] = 0;
@@ -5652,7 +5756,7 @@ index 0a97422..3d563fd 100644
byte[] bytes = new byte[length];
XPCOM.memmove (bytes, buffer, length);
lastNavigateURL = new String (bytes);
-@@ -3792,7 +3792,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3831,7 +3831,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.
*/
@@ -5661,7 +5765,7 @@ index 0a97422..3d563fd 100644
nsIWebProgress progress = new nsIWebProgress (aWebProgress);
int rc = progress.GetDOMWindow (result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -3831,7 +3831,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3870,7 +3870,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
return XPCOM.NS_OK;
}
@@ -5670,7 +5774,7 @@ index 0a97422..3d563fd 100644
if (progressListeners.length == 0) return XPCOM.NS_OK;
ProgressEvent event = new ProgressEvent (browser);
event.display = browser.getDisplay ();
-@@ -3844,7 +3844,7 @@ int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCur
+@@ -3883,7 +3883,7 @@ int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCur
return XPCOM.NS_OK;
}
@@ -5679,7 +5783,7 @@ index 0a97422..3d563fd 100644
/*
* 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
-@@ -3859,12 +3859,12 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
+@@ -3898,12 +3898,12 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
if (locationListeners.length == 0) return XPCOM.NS_OK;
nsIWebProgress webProgress = new nsIWebProgress (aWebProgress);
@@ -5694,7 +5798,7 @@ index 0a97422..3d563fd 100644
nsIDOMWindow domWindow = new nsIDOMWindow (aDOMWindow[0]);
rc = domWindow.GetTop (aTop);
domWindow.Release ();
-@@ -3874,10 +3874,10 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
+@@ -3913,10 +3913,10 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
topWindow.Release ();
nsIURI location = new nsIURI (aLocation);
@@ -5707,7 +5811,7 @@ index 0a97422..3d563fd 100644
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
XPCOM.nsEmbedCString_delete (aSpec);
-@@ -3914,7 +3914,7 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
+@@ -3953,7 +3953,7 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
return XPCOM.NS_OK;
}
@@ -5716,7 +5820,7 @@ index 0a97422..3d563fd 100644
if (statusTextListeners.length == 0) return XPCOM.NS_OK;
StatusTextEvent event = new StatusTextEvent (browser);
event.display = browser.getDisplay ();
-@@ -3929,13 +3929,13 @@ int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatu
+@@ -3968,13 +3968,13 @@ int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatu
return XPCOM.NS_OK;
}
@@ -5732,7 +5836,7 @@ index 0a97422..3d563fd 100644
if (statusTextListeners.length == 0) return XPCOM.NS_OK;
StatusTextEvent event = new StatusTextEvent (browser);
event.display = browser.getDisplay ();
-@@ -3951,8 +3951,8 @@ int SetStatus (int statusType, int /*long*/ status) {
+@@ -3990,8 +3990,8 @@ int SetStatus (int statusType, int /*long*/ status) {
return XPCOM.NS_OK;
}
@@ -5743,7 +5847,7 @@ index 0a97422..3d563fd 100644
if (webBrowser != null) {
webBrowser.AddRef ();
ret[0] = webBrowser.getAddress ();
-@@ -3961,13 +3961,13 @@ int GetWebBrowser (int /*long*/ aWebBrowser) {
+@@ -4000,13 +4000,13 @@ int GetWebBrowser (int /*long*/ aWebBrowser) {
return XPCOM.NS_OK;
}
@@ -5759,7 +5863,7 @@ index 0a97422..3d563fd 100644
int[] ret = new int[1];
ret[0] = chromeFlags;
XPCOM.memmove (aChromeFlags, ret, 4); /* PRUint32 */
-@@ -4007,7 +4007,7 @@ int SizeBrowserTo (int aCX, int aCY) {
+@@ -4046,7 +4046,7 @@ int SizeBrowserTo (int aCX, int aCY) {
}
int ShowAsModal () {
@@ -5768,7 +5872,7 @@ index 0a97422..3d563fd 100644
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -4037,7 +4037,7 @@ int ShowAsModal () {
+@@ -4076,7 +4076,7 @@ int ShowAsModal () {
return XPCOM.NS_OK;
}
@@ -5777,7 +5881,7 @@ index 0a97422..3d563fd 100644
boolean result = (chromeFlags & nsIWebBrowserChrome.CHROME_MODAL) != 0;
XPCOM.memmove (retval, new boolean[] {result});
return XPCOM.NS_OK;
-@@ -4071,7 +4071,7 @@ int SetDimensions (int flags, int x, int y, int cx, int cy) {
+@@ -4110,7 +4110,7 @@ int SetDimensions (int flags, int x, int y, int cx, int cy) {
return XPCOM.NS_OK;
}
@@ -5786,7 +5890,7 @@ index 0a97422..3d563fd 100644
if ((flags & nsIEmbeddingSiteWindow.DIM_FLAGS_POSITION) != 0) {
Point location = browser.getShell ().getLocation ();
if (x != 0) C.memmove (x, new int[] {location.x}, 4); /* PRInt32 */
-@@ -4091,7 +4091,7 @@ int GetDimensions (int flags, int /*long*/ x, int /*long*/ y, int /*long*/ cx, i
+@@ -4130,7 +4130,7 @@ int GetDimensions (int flags, int /*long*/ x, int /*long*/ y, int /*long*/ cx, i
}
int SetFocus () {
@@ -5795,7 +5899,7 @@ index 0a97422..3d563fd 100644
int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
if (rc != XPCOM.NS_OK) {
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
-@@ -4112,7 +4112,7 @@ int SetFocus () {
+@@ -4151,7 +4151,7 @@ int SetFocus () {
return XPCOM.NS_OK;
}
@@ -5804,7 +5908,7 @@ index 0a97422..3d563fd 100644
boolean visible = browser.isVisible () && !browser.getShell ().getMinimized ();
XPCOM.memmove (aVisibility, new boolean[] {visible});
return XPCOM.NS_OK;
-@@ -4155,11 +4155,11 @@ int SetVisibility (int aVisibility) {
+@@ -4194,11 +4194,11 @@ int SetVisibility (int aVisibility) {
return XPCOM.NS_OK;
}
@@ -5818,25 +5922,27 @@ index 0a97422..3d563fd 100644
if (titleListeners.length == 0) return XPCOM.NS_OK;
TitleEvent event = new TitleEvent (browser);
event.display = browser.getDisplay ();
-@@ -4183,7 +4183,7 @@ int SetTitle (int /*long*/ aTitle) {
+@@ -4222,7 +4222,7 @@ int SetTitle (int /*long*/ aTitle) {
return XPCOM.NS_OK;
}
-int GetSiteWindow (int /*long*/ aSiteWindow) {
+int GetSiteWindow (long /*int*/ aSiteWindow) {
/*
- * Note. The handle is expected to be an HWND on Windows and
- * a GtkWidget* on GTK. This callback is invoked on Windows
-@@ -4191,7 +4191,7 @@ int GetSiteWindow (int /*long*/ aSiteWindow) {
- * dialog comes up. If no handle is returned, the print dialog
- * does not come up on this platform.
+ * This is expected to be an HWND on Windows, a GtkWidget* on GTK, and
+ * a WindowPtr on OS X. This callback is invoked on Windows when the
+@@ -4230,8 +4230,8 @@ int GetSiteWindow (int /*long*/ aSiteWindow) {
+ * dialog is shown with XULRunner versions < 4.
*/
-- XPCOM.memmove (aSiteWindow, new int /*long*/[] {embedHandle}, C.PTR_SIZEOF);
-+ XPCOM.memmove (aSiteWindow, new long /*int*/[] {embedHandle}, C.PTR_SIZEOF);
+
+- int /*long*/ siteWindow = delegate.getSiteWindow ();
+- XPCOM.memmove (aSiteWindow, new int /*long*/[] {siteWindow}, C.PTR_SIZEOF);
++ long /*int*/ siteWindow = delegate.getSiteWindow ();
++ XPCOM.memmove (aSiteWindow, new long /*int*/[] {siteWindow}, C.PTR_SIZEOF);
return XPCOM.NS_OK;
- }
+ }
-@@ -4231,9 +4231,9 @@ int FocusPrevElement () {
+@@ -4271,9 +4271,9 @@ int FocusPrevElement () {
/* nsIContextMenuListener */
@@ -5848,7 +5954,7 @@ index 0a97422..3d563fd 100644
int rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_10_IID : nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -4263,15 +4263,15 @@ int OnShowContextMenu (int aContextFlags, int /*long*/ aEvent, int /*long*/ aNod
+@@ -4303,15 +4303,15 @@ int OnShowContextMenu (int aContextFlags, int /*long*/ aEvent, int /*long*/ aNod
/* nsIURIContentListener */
@@ -5867,16 +5973,16 @@ index 0a97422..3d563fd 100644
buffer = XPCOM.nsEmbedCString_get (aSpec);
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
-@@ -4327,7 +4327,7 @@ int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
- if (jsEnabledChanged) {
- jsEnabledChanged = false;
-
+@@ -4366,7 +4366,7 @@ int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
+ if (doit) {
+ if (jsEnabled != jsEnabledOnNextPage) {
+ jsEnabled = jsEnabledOnNextPage;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIWebBrowserSetup.NS_IWEBBROWSERSETUP_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -4346,11 +4346,11 @@ int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
+@@ -4385,11 +4385,11 @@ int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
return XPCOM.NS_OK;
}
@@ -5890,7 +5996,7 @@ index 0a97422..3d563fd 100644
boolean preferred = false;
int size = XPCOM.strlen (aContentType);
if (size > 0) {
-@@ -4361,7 +4361,7 @@ int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, in
+@@ -4400,7 +4400,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 */
@@ -5899,7 +6005,7 @@ index 0a97422..3d563fd 100644
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -4373,7 +4373,7 @@ int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, in
+@@ -4412,7 +4412,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, false);
@@ -5908,7 +6014,7 @@ index 0a97422..3d563fd 100644
nsIWebNavigationInfo info = new nsIWebNavigationInfo (result[0]);
result[0] = 0;
int[] isSupportedResult = new int[1]; /* PRUint32 */
-@@ -4403,34 +4403,34 @@ int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, in
+@@ -4442,34 +4442,34 @@ int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, in
XPCOM.memmove(retval, new boolean[] {preferred});
if (preferred) {
@@ -5950,7 +6056,7 @@ index 0a97422..3d563fd 100644
int length = XPCOM.strlen_PRUnichar (aTipText);
char[] dest = new char[length];
XPCOM.memmove (dest, aTipText, length * 2);
-@@ -4466,20 +4466,20 @@ int OnHideTooltip () {
+@@ -4505,20 +4505,20 @@ int OnHideTooltip () {
return XPCOM.NS_OK;
}
@@ -5975,7 +6081,7 @@ index 0a97422..3d563fd 100644
rc = domEvent.GetCurrentTarget (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -4496,7 +4496,7 @@ int HandleEvent (int /*long*/ event) {
+@@ -4535,7 +4535,7 @@ int HandleEvent (int /*long*/ event) {
}
if (XPCOM.DOMEVENT_KEYDOWN.equals (typeString)) {
@@ -5984,7 +6090,7 @@ index 0a97422..3d563fd 100644
rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMKeyEvent.NS_IDOMKEYEVENT_10_IID : nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -4604,7 +4604,7 @@ int HandleEvent (int /*long*/ event) {
+@@ -4643,7 +4643,7 @@ int HandleEvent (int /*long*/ event) {
case SWT.SCROLL_LOCK: return XPCOM.NS_OK;
}
@@ -5993,7 +6099,7 @@ index 0a97422..3d563fd 100644
rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMKeyEvent.NS_IDOMKEYEVENT_10_IID : nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -4660,7 +4660,7 @@ int HandleEvent (int /*long*/ event) {
+@@ -4699,7 +4699,7 @@ int HandleEvent (int /*long*/ event) {
}
if (XPCOM.DOMEVENT_KEYUP.equals (typeString)) {
@@ -6002,7 +6108,7 @@ index 0a97422..3d563fd 100644
rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMKeyEvent.NS_IDOMKEYEVENT_10_IID : nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -4717,7 +4717,7 @@ int HandleEvent (int /*long*/ event) {
+@@ -4756,7 +4756,7 @@ int HandleEvent (int /*long*/ event) {
/* mouse event */
@@ -6011,7 +6117,7 @@ index 0a97422..3d563fd 100644
rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_10_IID : nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -4835,10 +4835,10 @@ int HandleEvent (int /*long*/ event) {
+@@ -4874,10 +4874,10 @@ int HandleEvent (int /*long*/ event) {
/* nsIBadCertListener2 */
@@ -6024,7 +6130,7 @@ index 0a97422..3d563fd 100644
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
final String urlPort = new String (dest);
-@@ -4848,7 +4848,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
+@@ -4887,7 +4887,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
/* create text descriptions of the certificate problem(s) */
@@ -6033,7 +6139,7 @@ index 0a97422..3d563fd 100644
nsISupports supports = new nsISupports (status);
int rc = supports.QueryInterface (nsISSLStatus.NS_ISSLSTATUS_10_IID, result);
if (rc != XPCOM.NS_OK) {
-@@ -4871,7 +4871,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
+@@ -4910,7 +4910,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
rc = sslStatus.GetIsDomainMismatch (intResult);
if (intResult[0] != 0) {
@@ -6042,7 +6148,7 @@ index 0a97422..3d563fd 100644
rc = cert.GetCommonName (ptr);
if (rc != XPCOM.NS_OK) SWT.error (rc);
length = XPCOM.nsEmbedString_Length (ptr);
-@@ -4894,7 +4894,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
+@@ -4933,7 +4933,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
nsIX509CertValidity validity = new nsIX509CertValidity(result[0]);
result[0] = 0;
@@ -6051,7 +6157,7 @@ index 0a97422..3d563fd 100644
rc = validity.GetNotBeforeGMT (ptr);
if (rc != XPCOM.NS_OK) SWT.error (rc);
length = XPCOM.nsEmbedString_Length (ptr);
-@@ -4923,7 +4923,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
+@@ -4962,7 +4962,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
rc = sslStatus.GetIsUntrusted (intResult);
if (intResult[0] != 0) {
@@ -6060,7 +6166,7 @@ index 0a97422..3d563fd 100644
rc = cert.GetIssuerCommonName (ptr);
if (rc != XPCOM.NS_OK) SWT.error (rc);
length = XPCOM.nsEmbedString_Length (ptr);
-@@ -4952,7 +4952,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
+@@ -4991,7 +4991,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
if (url.equals (lastNavigateURL)) {
String message = Compatibility.getMessage ("SWT_InvalidCert_Message", new String[] {urlPort}); //$NON-NLS-1$
if (new PromptDialog (browser.getShell ()).invalidCert (browser, message, finalProblems, cert)) {
@@ -6069,7 +6175,7 @@ index 0a97422..3d563fd 100644
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -4968,7 +4968,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
+@@ -5007,7 +5007,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);
@@ -6079,10 +6185,10 @@ index 0a97422..3d563fd 100644
navigate (badCertRequest);
XPCOM.nsEmbedCString_delete (hostString);
diff --git a/org/eclipse/swt/browser/MozillaDelegate.java b/org/eclipse/swt/browser/MozillaDelegate.java
-index e368390..cfa0297 100644
+index 956f0fc..6aa9e12 100644
--- a/org/eclipse/swt/browser/MozillaDelegate.java
+++ b/org/eclipse/swt/browser/MozillaDelegate.java
-@@ -20,11 +20,11 @@ import org.eclipse.swt.widgets.*;
+@@ -22,11 +22,11 @@ import org.eclipse.swt.widgets.*;
class MozillaDelegate {
Browser browser;
Shell eventShell;
@@ -6096,7 +6202,7 @@ index e368390..cfa0297 100644
static final int STOP_PROPOGATE = 1;
static boolean IsSparc;
-@@ -48,8 +48,8 @@ MozillaDelegate (Browser browser) {
+@@ -50,8 +50,8 @@ MozillaDelegate (Browser browser) {
this.browser = browser;
}
@@ -6107,7 +6213,7 @@ index e368390..cfa0297 100644
parent = OS.gtk_widget_get_parent (parent);
if (parent == 0) return 0;
Widget widget = Display.getCurrent ().findWidget (parent);
-@@ -59,12 +59,12 @@ static int /*long*/ eventProc (int /*long*/ handle, int /*long*/ gdkEvent, int /
+@@ -61,12 +61,12 @@ static int /*long*/ eventProc (int /*long*/ handle, int /*long*/ gdkEvent, int /
return 0;
}
@@ -6122,7 +6228,16 @@ index e368390..cfa0297 100644
Display display = Display.getCurrent ();
return (Browser)display.findWidget (parent);
}
-@@ -114,7 +114,7 @@ int createBaseWindow (nsIBaseWindow baseWindow) {
+@@ -96,7 +96,7 @@ static String getProfilePath () {
+ * then attempt to read the value from the environment directly.
+ */
+ if (baseDir.equals ("?")) { //$NON-NLS-1$
+- int /*long*/ ptr = C.getenv (wcsToMbcs (null, "HOME", true)); //$NON-NLS-1$
++ long /*int*/ ptr = C.getenv (wcsToMbcs (null, "HOME", true)); //$NON-NLS-1$
+ if (ptr != 0) {
+ int length = C.strlen (ptr);
+ byte[] bytes = new byte[length];
+@@ -166,7 +166,7 @@ int createBaseWindow (nsIBaseWindow baseWindow) {
return baseWindow.Create ();
}
@@ -6131,8 +6246,13 @@ index e368390..cfa0297 100644
/*
* Bug in Mozilla Linux GTK. Embedding Mozilla into a GtkFixed
* handle causes problems with some Mozilla plug-ins. For some
-@@ -136,7 +136,7 @@ String getProfilePath () {
- return baseDir + Mozilla.SEPARATOR_OS + ".mozilla" + Mozilla.SEPARATOR_OS + "eclipse"; //$NON-NLS-1$ //$NON-NLS-2$
+@@ -183,11 +183,11 @@ int /*long*/ getHandle () {
+ return embedHandle;
+ }
+
+-int /*long*/ getSiteWindow () {
++long /*int*/ getSiteWindow () {
+ return embedHandle;
}
-int /*long*/ gtk_event (int /*long*/ handle, int /*long*/ gdkEvent, int /*long*/ pointer) {
@@ -6140,7 +6260,7 @@ index e368390..cfa0297 100644
GdkEvent event = new GdkEvent ();
OS.memmove (event, gdkEvent, GdkEvent.sizeof);
if (event.type == OS.GDK_BUTTON_PRESS) {
-@@ -208,7 +208,7 @@ void init () {
+@@ -259,7 +259,7 @@ void init () {
* forward the event to the parent embedder before Mozilla received and consumed
* them.
*/
@@ -6149,7 +6269,7 @@ index e368390..cfa0297 100644
if (list != 0) {
mozillaHandle = OS.g_list_data (list);
OS.g_list_free (list);
-@@ -230,7 +230,7 @@ void init () {
+@@ -281,7 +281,7 @@ void init () {
}
}
@@ -6158,7 +6278,7 @@ index e368390..cfa0297 100644
if (listener != null) {
eventShell.getDisplay ().removeFilter (SWT.FocusIn, listener);
eventShell.removeListener (SWT.Deactivate, listener);
-@@ -248,7 +248,7 @@ boolean sendTraverse () {
+@@ -299,7 +299,7 @@ boolean sendTraverse () {
return true;
}
@@ -7189,7 +7309,7 @@ index 75f58ad..7da18df 100644
}
}
diff --git a/org/eclipse/swt/browser/WebKit.java b/org/eclipse/swt/browser/WebKit.java
-index e9485da..52c288d 100644
+index 5312ead..56640dc 100644
--- a/org/eclipse/swt/browser/WebKit.java
+++ b/org/eclipse/swt/browser/WebKit.java
@@ -24,7 +24,7 @@ import org.eclipse.swt.layout.*;
@@ -7201,16 +7321,16 @@ index e9485da..52c288d 100644
int failureCount, lastKeyCode, lastCharCode;
String postData;
String[] headers;
-@@ -32,7 +32,7 @@ class WebKit extends WebBrowser {
- byte[] htmlBytes;
+@@ -33,7 +33,7 @@ class WebKit extends WebBrowser {
BrowserFunction eventFunction;
-- static int /*long*/ ExternalClass, PostString;
-+ static long /*int*/ ExternalClass, PostString;
- static boolean IsWebKitGTK14orNewer, LibraryLoaded;
+ static int DisabledJSCount;
+- static int /*long*/ ExternalClass, PostString, WebViewType;
++ static long /*int*/ ExternalClass, PostString, WebViewType;
+ static boolean IsWebKit14orNewer, LibraryLoaded;
static Hashtable WindowMappings = new Hashtable ();
-@@ -122,16 +122,16 @@ class WebKit extends WebBrowser {
+@@ -125,16 +125,16 @@ class WebKit extends WebBrowser {
NativeClearSessions = new Runnable () {
public void run () {
if (!LibraryLoaded) return;
@@ -7234,7 +7354,7 @@ index e9485da..52c288d 100644
if (expires == 0) {
/* indicates a session cookie */
WebKitGTK.soup_cookie_jar_delete_cookie (jar, cookie);
-@@ -146,14 +146,14 @@ class WebKit extends WebBrowser {
+@@ -149,14 +149,14 @@ class WebKit extends WebBrowser {
NativeGetCookie = new Runnable () {
public void run () {
if (!LibraryLoaded) return;
@@ -7254,7 +7374,7 @@ index e9485da..52c288d 100644
WebKitGTK.soup_uri_free (uri);
if (cookies == 0) return;
int length = OS.strlen (cookies);
-@@ -179,9 +179,9 @@ class WebKit extends WebBrowser {
+@@ -182,9 +182,9 @@ class WebKit extends WebBrowser {
NativeSetCookie = new Runnable () {
public void run () {
if (!LibraryLoaded) return;
@@ -7267,7 +7387,7 @@ index e9485da..52c288d 100644
if (jar == 0) {
/* this happens if a navigation has not occurred yet */
WebKitGTK.soup_session_add_feature_by_type (session, type);
-@@ -189,10 +189,10 @@ class WebKit extends WebBrowser {
+@@ -192,10 +192,10 @@ class WebKit extends WebBrowser {
}
if (jar == 0) return;
byte[] bytes = Converter.wcsToMbcs (null, CookieUrl, true);
@@ -7280,7 +7400,7 @@ index e9485da..52c288d 100644
if (cookie != 0) {
WebKitGTK.soup_cookie_jar_add_cookie (jar, cookie);
// the following line is intentionally commented
-@@ -210,9 +210,9 @@ class WebKit extends WebBrowser {
+@@ -213,9 +213,9 @@ class WebKit extends WebBrowser {
}
}
@@ -7292,7 +7412,7 @@ index e9485da..52c288d 100644
parent = OS.gtk_widget_get_parent (parent);
return (Browser)Display.getCurrent ().findWidget (parent);
}
-@@ -233,12 +233,12 @@ static boolean IsInstalled () {
+@@ -236,12 +236,12 @@ static boolean IsInstalled () {
(major == MIN_VERSION[0] && minor == MIN_VERSION[1] && micro >= MIN_VERSION[2]);
}
@@ -7308,7 +7428,7 @@ index e9485da..52c288d 100644
C.memmove (handle, ptr, C.PTR_SIZEOF);
Browser browser = FindBrowser (handle[0]);
if (browser == null) return 0;
-@@ -246,20 +246,20 @@ static int /*long*/ JSObjectCallAsFunctionProc (int /*long*/ ctx, int /*long*/ f
+@@ -249,20 +249,20 @@ static int /*long*/ JSObjectCallAsFunctionProc (int /*long*/ ctx, int /*long*/ f
return webkit.callJava (ctx, function, thisObject, argumentCount, arguments, exception);
}
@@ -7333,17 +7453,17 @@ index e9485da..52c288d 100644
byte[] bytes = null;
try {
bytes = (FUNCTIONNAME_CALLJAVA + '\0').getBytes (CHARSET_UTF8); //$NON-NLS-1$
-@@ -269,7 +269,7 @@ static int /*long*/ JSObjectHasPropertyProc (int /*long*/ ctx, int /*long*/ obje
+@@ -272,7 +272,7 @@ static int /*long*/ JSObjectHasPropertyProc (int /*long*/ ctx, int /*long*/ obje
return WebKitGTK.JSStringIsEqualToUTF8CString (propertyName, bytes);
}
--static int /*long*/ JSDOMEventProc (int /*long*/ window, int /*long*/ event, int /*long*/ user_data) {
-+static long /*int*/ JSDOMEventProc (long /*int*/ window, long /*int*/ event, long /*int*/ user_data) {
- LONG webViewHandle = (LONG)WindowMappings.get (new LONG (window));
- if (webViewHandle == null) return 0;
- Browser browser = FindBrowser (webViewHandle.value);
-@@ -278,14 +278,14 @@ static int /*long*/ JSDOMEventProc (int /*long*/ window, int /*long*/ event, int
- return webkit.handleEvent (event, (int)user_data) ? 0 : 1;
+-static int /*long*/ JSDOMEventProc (int /*long*/ arg0, int /*long*/ event, int /*long*/ user_data) {
++static long /*int*/ JSDOMEventProc (long /*int*/ arg0, long /*int*/ event, long /*int*/ user_data) {
+ if (OS.GTK_IS_SCROLLED_WINDOW (arg0)) {
+ /*
+ * Stop the propagation of events that are not consumed by WebKit, before
+@@ -342,15 +342,15 @@ static int /*long*/ JSDOMEventProc (int /*long*/ arg0, int /*long*/ event, int /
+ return webkit.handleDOMEvent (event, (int)user_data) ? 0 : STOP_PROPOGATE;
}
-static int /*long*/ Proc (int /*long*/ handle, int /*long*/ user_data) {
@@ -7355,20 +7475,13 @@ index e9485da..52c288d 100644
}
-static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
-+static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
- if (OS.GTK_IS_SCROLLED_WINDOW (handle)) {
- /*
- * Stop the propagation of events that are not consumed by WebKit, before
-@@ -294,7 +294,7 @@ static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ u
- return user_data;
- }
-
- int /*long*/ webView;
++static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
+ long /*int*/ webView;
if (OS.G_TYPE_CHECK_INSTANCE_TYPE (handle, WebKitGTK.webkit_web_frame_get_type ())) {
webView = WebKitGTK.webkit_web_frame_get_web_view (handle);
} else {
-@@ -310,15 +310,15 @@ static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ u
+@@ -366,15 +366,15 @@ static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ u
}
}
@@ -7387,7 +7500,7 @@ index e9485da..52c288d 100644
if (OS.G_TYPE_CHECK_INSTANCE_TYPE (handle, WebKitGTK.soup_session_get_type ())) {
webView = user_data;
} else {
-@@ -334,14 +334,14 @@ static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ a
+@@ -390,14 +390,14 @@ static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ a
}
}
@@ -7404,7 +7517,7 @@ index e9485da..52c288d 100644
/* authentication challenges are currently the only notification received from the session */
if (retrying == 0) {
failureCount = 0;
-@@ -349,8 +349,8 @@ int /*long*/ sessionProc (int /*long*/ session, int /*long*/ msg, int /*long*/ a
+@@ -405,8 +405,8 @@ int /*long*/ sessionProc (int /*long*/ session, int /*long*/ msg, int /*long*/ a
if (++failureCount >= 3) return 0;
}
@@ -7415,7 +7528,7 @@ index e9485da..52c288d 100644
int length = C.strlen (uriString);
byte[] bytes = new byte[length];
OS.memmove (bytes, uriString, length);
-@@ -376,14 +376,14 @@ int /*long*/ sessionProc (int /*long*/ session, int /*long*/ msg, int /*long*/ a
+@@ -432,14 +432,14 @@ int /*long*/ sessionProc (int /*long*/ session, int /*long*/ msg, int /*long*/ a
return 0;
}
@@ -7432,7 +7545,7 @@ index e9485da..52c288d 100644
switch ((int)/*64*/user_data) {
case CLOSE_WEB_VIEW: return webkit_close_web_view (handle);
case WEB_VIEW_READY: return webkit_web_view_ready (handle);
-@@ -391,7 +391,7 @@ int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ user_data) {
+@@ -447,7 +447,7 @@ int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ user_data) {
}
}
@@ -7441,7 +7554,7 @@ index e9485da..52c288d 100644
switch ((int)/*64*/user_data) {
case CREATE_WEB_VIEW: return webkit_create_web_view (handle, arg0);
case DOWNLOAD_REQUESTED: return webkit_download_requested (handle, arg0);
-@@ -404,14 +404,14 @@ int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ u
+@@ -460,14 +460,14 @@ int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ u
}
}
@@ -7458,7 +7571,7 @@ index e9485da..52c288d 100644
switch ((int)/*64*/user_data) {
case CONSOLE_MESSAGE: return webkit_console_message (handle, arg0, arg1, arg2);
case WINDOW_OBJECT_CLEARED: return webkit_window_object_cleared (handle, arg0, arg1, arg2);
-@@ -419,7 +419,7 @@ int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ a
+@@ -475,7 +475,7 @@ int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ a
}
}
@@ -7467,7 +7580,7 @@ index e9485da..52c288d 100644
switch ((int)/*64*/user_data) {
case MIME_TYPE_POLICY_DECISION_REQUESTED: return webkit_mime_type_policy_decision_requested (handle, arg0, arg1, arg2, arg3);
case NAVIGATION_POLICY_DECISION_REQUESTED: return webkit_navigation_policy_decision_requested (handle, arg0, arg1, arg2, arg3);
-@@ -442,7 +442,7 @@ public void create (Composite parent, int style) {
+@@ -498,7 +498,7 @@ public void create (Composite parent, int style) {
OS.memmove (jsClassDefinition.className, bytes, bytes.length);
jsClassDefinition.hasProperty = JSObjectHasPropertyProc.getAddress ();
jsClassDefinition.getProperty = JSObjectGetPropertyProc.getAddress ();
@@ -7476,25 +7589,25 @@ index e9485da..52c288d 100644
WebKitGTK.memmove (classDefinitionPtr, jsClassDefinition, JSClassDefinition.sizeof);
ExternalClass = WebKitGTK.JSClassCreate (classDefinitionPtr);
-@@ -455,7 +455,7 @@ public void create (Composite parent, int style) {
- OS.gtk_scrolled_window_set_policy (scrolledWindow, OS.GTK_POLICY_AUTOMATIC, OS.GTK_POLICY_AUTOMATIC);
- webView = WebKitGTK.webkit_web_view_new ();
- webViewData = C.malloc (C.PTR_SIZEOF);
-- C.memmove (webViewData, new int /*long*/[] {webView}, C.PTR_SIZEOF);
-+ C.memmove (webViewData, new long /*int*/[] {webView}, C.PTR_SIZEOF);
- OS.gtk_container_add (scrolledWindow, webView);
- OS.gtk_container_add (browser.handle, scrolledWindow);
- OS.gtk_widget_show (scrolledWindow);
-@@ -491,7 +491,7 @@ public void create (Composite parent, int style) {
- OS.g_signal_connect (scrolledWindow, OS.scroll_event, Proc3.getAddress (), STOP_PROPOGATE);
- OS.g_signal_connect (scrolledWindow, OS.motion_notify_event, Proc3.getAddress (), STOP_PROPOGATE);
-
-- int /*long*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
-+ long /*int*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
- OS.g_object_set (settings, WebKitGTK.javascript_can_open_windows_automatically, 1, 0);
- OS.g_object_set (settings, WebKitGTK.enable_universal_access_from_file_uris, 1, 0);
- byte[] bytes = Converter.wcsToMbcs (null, "UTF-8", true); // $NON-NLS-1$
-@@ -533,8 +533,8 @@ public void create (Composite parent, int style) {
+@@ -511,7 +511,7 @@ public void create (Composite parent, int style) {
+ OS.gtk_scrolled_window_set_policy (scrolledWindow, OS.GTK_POLICY_AUTOMATIC, OS.GTK_POLICY_AUTOMATIC);
+ webView = WebKitGTK.webkit_web_view_new ();
+ webViewData = C.malloc (C.PTR_SIZEOF);
+- C.memmove (webViewData, new int /*long*/[] {webView}, C.PTR_SIZEOF);
++ C.memmove (webViewData, new long /*int*/[] {webView}, C.PTR_SIZEOF);
+ OS.gtk_container_add (scrolledWindow, webView);
+ OS.gtk_container_add (browser.handle, scrolledWindow);
+ OS.gtk_widget_show (scrolledWindow);
+@@ -553,7 +553,7 @@ public void create (Composite parent, int style) {
+ OS.g_signal_connect (scrolledWindow, OS.scroll_event, JSDOMEventProc.getAddress (), STOP_PROPOGATE);
+ OS.g_signal_connect (scrolledWindow, OS.motion_notify_event, JSDOMEventProc.getAddress (), STOP_PROPOGATE);
+
+- int /*long*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
++ long /*int*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
+ OS.g_object_set (settings, WebKitGTK.javascript_can_open_windows_automatically, 1, 0);
+ OS.g_object_set (settings, WebKitGTK.enable_universal_access_from_file_uris, 1, 0);
+ byte[] bytes = Converter.wcsToMbcs (null, "UTF-8", true); // $NON-NLS-1$
+@@ -595,8 +595,8 @@ public void create (Composite parent, int style) {
* queue by removing the default Authenticate listener, adding ours,
* and then re-adding the default listener.
*/
@@ -7505,7 +7618,7 @@ index e9485da..52c288d 100644
WebKitGTK.soup_session_feature_detach (originalAuth, session);
OS.g_signal_connect (session, WebKitGTK.authenticate, Proc5.getAddress (), webView);
WebKitGTK.soup_session_feature_attach (originalAuth, session);
-@@ -560,7 +560,7 @@ public void create (Composite parent, int style) {
+@@ -622,7 +622,7 @@ public void create (Composite parent, int style) {
}
proxyHost += ":" + port; //$NON-NLS-1$
bytes = Converter.wcsToMbcs (null, proxyHost, true);
@@ -7514,19 +7627,25 @@ index e9485da..52c288d 100644
if (uri != 0) {
OS.g_object_set (session, WebKitGTK.SOUP_SESSION_PROXY_URI, uri, 0);
WebKitGTK.soup_uri_free (uri);
-@@ -584,9 +584,9 @@ public void create (Composite parent, int style) {
+@@ -646,7 +646,7 @@ public void create (Composite parent, int style) {
browser.setData (KEY_CHECK_SUBWINDOW, Boolean.FALSE);
}
-void addEventHandlers (int /*long*/ web_view, boolean top) {
+void addEventHandlers (long /*int*/ web_view, boolean top) {
- if (top && IsWebKitGTK14orNewer) {
+ /*
+ * If JS is disabled (causes DOM events to not be delivered) then do not add event
+ * listeners here, DOM events will be inferred from received GDK events instead.
+@@ -654,7 +654,7 @@ void addEventHandlers (int /*long*/ web_view, boolean top) {
+ if (!jsEnabled) return;
+
+ if (top && IsWebKit14orNewer) {
- int /*long*/ domDocument = WebKitGTK.webkit_web_view_get_dom_document (web_view);
+ long /*int*/ domDocument = WebKitGTK.webkit_web_view_get_dom_document (web_view);
if (domDocument != 0) {
WindowMappings.put (new LONG (domDocument), new LONG (web_view));
WebKitGTK.webkit_dom_event_target_add_event_listener (domDocument, WebKitGTK.dragstart, JSDOMEventProc.getAddress (), 0, SWT.DragDetect);
-@@ -698,8 +698,8 @@ boolean close (boolean showPrompters) {
+@@ -766,8 +766,8 @@ boolean close (boolean showPrompters) {
}
public boolean execute (String script) {
@@ -7537,7 +7656,7 @@ index e9485da..52c288d 100644
byte[] bytes = null;
try {
-@@ -707,16 +707,16 @@ public boolean execute (String script) {
+@@ -775,16 +775,16 @@ public boolean execute (String script) {
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, script, true);
}
@@ -7557,7 +7676,7 @@ index e9485da..52c288d 100644
WebKitGTK.JSStringRelease (urlString);
WebKitGTK.JSStringRelease (scriptString);
return result != 0;
-@@ -733,13 +733,13 @@ public String getBrowserType () {
+@@ -801,13 +801,13 @@ public String getBrowserType () {
}
public String getText () {
@@ -7575,7 +7694,7 @@ index e9485da..52c288d 100644
int length = OS.strlen (encoding);
byte[] bytes = new byte [length];
OS.memmove (bytes, encoding, length);
-@@ -747,7 +747,7 @@ public String getText () {
+@@ -815,7 +815,7 @@ public String getText () {
length = OS.GString_len (data);
bytes = new byte[length];
@@ -7584,7 +7703,7 @@ index e9485da..52c288d 100644
C.memmove (bytes, string, length);
try {
-@@ -758,7 +758,7 @@ public String getText () {
+@@ -826,7 +826,7 @@ public String getText () {
}
public String getUrl () {
@@ -7593,16 +7712,16 @@ index e9485da..52c288d 100644
/* WebKit auto-navigates to about:blank at startup */
if (uri == 0) return ABOUT_BLANK;
-@@ -783,7 +783,7 @@ public String getUrl () {
+@@ -851,7 +851,7 @@ public String getUrl () {
return url;
}
--boolean handleEvent (int /*long*/ event, int type) {
-+boolean handleEvent (long /*int*/ event, int type) {
+-boolean handleDOMEvent (int /*long*/ event, int type) {
++boolean handleDOMEvent (long /*int*/ event, int type) {
/*
* This method handles JS events that are received through the DOM
* listener API that was introduced in WebKitGTK 1.4.
-@@ -1138,7 +1138,7 @@ boolean handleMouseEvent (String type, int screenX, int screenY, int detail, int
+@@ -1206,7 +1206,7 @@ boolean handleMouseEvent (String type, int screenX, int screenY, int detail, int
return true;
}
@@ -7611,7 +7730,7 @@ index e9485da..52c288d 100644
int length = OS.strlen (uri);
byte[] bytes = new byte[length];
OS.memmove (bytes, uri, length);
-@@ -1176,7 +1176,7 @@ int /*long*/ handleLoadCommitted (int /*long*/ uri, boolean top) {
+@@ -1244,7 +1244,7 @@ int /*long*/ handleLoadCommitted (int /*long*/ uri, boolean top) {
return 0;
}
@@ -7620,7 +7739,7 @@ index e9485da..52c288d 100644
int length = OS.strlen (uri);
byte[] bytes = new byte[length];
OS.memmove (bytes, uri, length);
-@@ -1228,8 +1228,8 @@ int /*long*/ handleLoadFinished (int /*long*/ uri, boolean top) {
+@@ -1296,8 +1296,8 @@ int /*long*/ handleLoadFinished (int /*long*/ uri, boolean top) {
* the event here with the page's url as the title.
*/
if (top) {
@@ -7631,7 +7750,7 @@ index e9485da..52c288d 100644
if (title == 0) {
TitleEvent newEvent = new TitleEvent (browser);
newEvent.display = browser.getDisplay ();
-@@ -1295,7 +1295,7 @@ void onResize (Event e) {
+@@ -1363,7 +1363,7 @@ void onResize (Event e) {
OS.gtk_widget_set_size_request (scrolledWindow, rect.width, rect.height);
}
@@ -7640,7 +7759,7 @@ index e9485da..52c288d 100644
final Shell shell = new Shell ();
String msg = Compatibility.getMessage ("SWT_FileDownload"); //$NON-NLS-1$
shell.setText (msg);
-@@ -1305,12 +1305,12 @@ void openDownloadWindow (final int /*long*/ webkitDownload) {
+@@ -1373,12 +1373,12 @@ void openDownloadWindow (final int /*long*/ webkitDownload) {
gridLayout.verticalSpacing = 20;
shell.setLayout (gridLayout);
@@ -7655,7 +7774,7 @@ index e9485da..52c288d 100644
length = OS.strlen (url);
bytes = new byte[length];
OS.memmove (bytes, url, length);
-@@ -1442,7 +1442,7 @@ public boolean setUrl (String url, String postData, String[] headers) {
+@@ -1510,7 +1510,7 @@ public boolean setUrl (String url, String postData, String[] headers) {
* set the value on the WebView when initiating the load request and then
* remove it afterwards.
*/
@@ -7664,7 +7783,7 @@ index e9485da..52c288d 100644
if (headers != null) {
for (int i = 0; i < headers.length; i++) {
String current = headers[i];
-@@ -1471,11 +1471,11 @@ public void stop () {
+@@ -1539,11 +1539,11 @@ public void stop () {
WebKitGTK.webkit_web_view_stop_loading (webView);
}
@@ -7678,7 +7797,7 @@ index e9485da..52c288d 100644
return handleLoadCommitted (uri, false);
}
case WebKitGTK.WEBKIT_LOAD_FINISHED: {
-@@ -1485,9 +1485,9 @@ int /*long*/ webframe_notify_load_status (int /*long*/ web_frame, int /*long*/ p
+@@ -1553,9 +1553,9 @@ int /*long*/ webframe_notify_load_status (int /*long*/ web_frame, int /*long*/ p
* response to navigating to a main document containing frames) then
* treat this as a completed load.
*/
@@ -7690,7 +7809,7 @@ index e9485da..52c288d 100644
return handleLoadFinished (uri, false);
}
}
-@@ -1495,7 +1495,7 @@ int /*long*/ webframe_notify_load_status (int /*long*/ web_frame, int /*long*/ p
+@@ -1563,7 +1563,7 @@ int /*long*/ webframe_notify_load_status (int /*long*/ web_frame, int /*long*/ p
return 0;
}
@@ -7699,7 +7818,7 @@ index e9485da..52c288d 100644
WindowEvent newEvent = new WindowEvent (browser);
newEvent.display = browser.getDisplay ();
newEvent.widget = browser;
-@@ -1506,11 +1506,11 @@ int /*long*/ webkit_close_web_view (int /*long*/ web_view) {
+@@ -1574,11 +1574,11 @@ int /*long*/ webkit_close_web_view (int /*long*/ web_view) {
return 0;
}
@@ -7713,7 +7832,7 @@ index e9485da..52c288d 100644
WindowEvent newEvent = new WindowEvent (browser);
newEvent.display = browser.getDisplay ();
newEvent.widget = browser;
-@@ -1530,8 +1530,8 @@ int /*long*/ webkit_create_web_view (int /*long*/ web_view, int /*long*/ frame)
+@@ -1598,8 +1598,8 @@ int /*long*/ webkit_create_web_view (int /*long*/ web_view, int /*long*/ frame)
return 0;
}
@@ -7724,7 +7843,7 @@ index e9485da..52c288d 100644
int length = OS.strlen (name);
byte[] bytes = new byte[length];
OS.memmove (bytes, name, length);
-@@ -1553,7 +1553,7 @@ int /*long*/ webkit_download_requested (int /*long*/ web_view, int /*long*/ down
+@@ -1621,7 +1621,7 @@ int /*long*/ webkit_download_requested (int /*long*/ web_view, int /*long*/ down
return 1;
}
@@ -7733,7 +7852,7 @@ index e9485da..52c288d 100644
if (uri != 0) {
int length = OS.strlen (uri);
byte[] bytes = new byte[length];
-@@ -1570,7 +1570,7 @@ int /*long*/ webkit_hovering_over_link (int /*long*/ web_view, int /*long*/ titl
+@@ -1638,7 +1638,7 @@ int /*long*/ webkit_hovering_over_link (int /*long*/ web_view, int /*long*/ titl
return 0;
}
@@ -7742,7 +7861,7 @@ index e9485da..52c288d 100644
boolean canShow = WebKitGTK.webkit_web_view_can_show_mime_type (webView, mimetype) != 0;
if (!canShow) {
WebKitGTK.webkit_web_policy_decision_download (policy_decision);
-@@ -1579,7 +1579,7 @@ int /*long*/ webkit_mime_type_policy_decision_requested (int /*long*/ web_view,
+@@ -1647,7 +1647,7 @@ int /*long*/ webkit_mime_type_policy_decision_requested (int /*long*/ web_view,
return 0;
}
@@ -7751,7 +7870,7 @@ index e9485da..52c288d 100644
if (loadingText) {
/*
* WebKit is auto-navigating to about:blank in response to a
-@@ -1590,7 +1590,7 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
+@@ -1658,7 +1658,7 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
return 0;
}
@@ -7760,10 +7879,10 @@ index e9485da..52c288d 100644
int length = OS.strlen (uri);
byte[] bytes = new byte[length];
OS.memmove (bytes, uri, length);
-@@ -1622,12 +1622,12 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
- if (newEvent.doit && !browser.isDisposed ()) {
- if (jsEnabledChanged) {
- jsEnabledChanged = false;
+@@ -1691,12 +1691,12 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
+ if (jsEnabled != jsEnabledOnNextPage) {
+ jsEnabled = jsEnabledOnNextPage;
+ DisabledJSCount += !jsEnabled ? 1 : -1;
- int /*long*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
+ long /*int*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
OS.g_object_set (settings, WebKitGTK.enable_scripts, jsEnabled ? 1 : 0, 0);
@@ -7775,7 +7894,7 @@ index e9485da..52c288d 100644
if (frame != mainFrame) {
int id = OS.g_signal_handler_find (frame, OS.G_SIGNAL_MATCH_FUNC | OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, Proc3.getAddress (), NOTIFY_LOAD_STATUS);
if (id == 0) {
-@@ -1650,22 +1650,22 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
+@@ -1719,22 +1719,22 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
return 0;
}
@@ -7802,7 +7921,7 @@ index e9485da..52c288d 100644
ProgressEvent event = new ProgressEvent (browser);
event.display = browser.getDisplay ();
event.widget = browser;
-@@ -1677,8 +1677,8 @@ int /*long*/ webkit_notify_progress (int /*long*/ web_view, int /*long*/ pspec)
+@@ -1746,8 +1746,8 @@ int /*long*/ webkit_notify_progress (int /*long*/ web_view, int /*long*/ pspec)
return 0;
}
@@ -7813,7 +7932,7 @@ index e9485da..52c288d 100644
String titleString;
if (title == 0) {
titleString = ""; //$NON-NLS-1$
-@@ -1698,7 +1698,7 @@ int /*long*/ webkit_notify_title (int /*long*/ web_view, int /*long*/ pspec) {
+@@ -1767,7 +1767,7 @@ int /*long*/ webkit_notify_title (int /*long*/ web_view, int /*long*/ pspec) {
return 0;
}
@@ -7822,7 +7941,7 @@ index e9485da..52c288d 100644
Point pt = browser.getDisplay ().getCursorLocation ();
Event event = new Event ();
event.x = pt.x;
-@@ -1706,10 +1706,10 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m
+@@ -1775,10 +1775,10 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m
browser.notifyListeners (SWT.MenuDetect, event);
if (!event.doit) {
/* clear the menu */
@@ -7836,7 +7955,7 @@ index e9485da..52c288d 100644
OS.gtk_container_remove (webkit_menu, item);
current = OS.g_list_next (current);
}
-@@ -1723,10 +1723,10 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m
+@@ -1792,10 +1792,10 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m
}
menu.setVisible (true);
/* clear the menu */
@@ -7850,7 +7969,7 @@ index e9485da..52c288d 100644
OS.gtk_container_remove (webkit_menu, item);
current = OS.g_list_next (current);
}
-@@ -1735,18 +1735,18 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m
+@@ -1804,18 +1804,18 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m
return 0;
}
@@ -7873,7 +7992,7 @@ index e9485da..52c288d 100644
C.memmove (data, bytes, bytes.length);
WebKitGTK.soup_message_body_append (body, WebKitGTK.SOUP_MEMORY_TAKE, data, bytes.length);
WebKitGTK.soup_message_body_flatten (body);
-@@ -1773,7 +1773,7 @@ int /*long*/ webkit_resource_request_starting (int /*long*/ web_view, int /*long
+@@ -1842,7 +1842,7 @@ int /*long*/ webkit_resource_request_starting (int /*long*/ web_view, int /*long
}
/* headers */
@@ -7882,7 +8001,7 @@ index e9485da..52c288d 100644
for (int i = 0; i < headers.length; i++) {
String current = headers[i];
if (current != null) {
-@@ -1796,7 +1796,7 @@ int /*long*/ webkit_resource_request_starting (int /*long*/ web_view, int /*long
+@@ -1865,7 +1865,7 @@ int /*long*/ webkit_resource_request_starting (int /*long*/ web_view, int /*long
return 0;
}
@@ -7891,7 +8010,7 @@ index e9485da..52c288d 100644
int length = OS.strlen (text);
byte[] bytes = new byte[length];
OS.memmove (bytes, text, length);
-@@ -1810,12 +1810,12 @@ int /*long*/ webkit_status_bar_text_changed (int /*long*/ web_view, int /*long*/
+@@ -1879,12 +1879,12 @@ int /*long*/ webkit_status_bar_text_changed (int /*long*/ web_view, int /*long*/
return 0;
}
@@ -7906,7 +8025,7 @@ index e9485da..52c288d 100644
int[] result = new int[1];
OS.g_object_get (settings, WebKitGTK.locationbar_visible, result, 0);
newEvent.addressBar = result[0] != 0;
-@@ -1853,16 +1853,16 @@ int /*long*/ webkit_web_view_ready (int /*long*/ web_view) {
+@@ -1922,16 +1922,16 @@ int /*long*/ webkit_web_view_ready (int /*long*/ web_view) {
return 0;
}
@@ -7927,7 +8046,7 @@ index e9485da..52c288d 100644
WebKitGTK.JSObjectSetProperty (context, globalObject, name, externalObject, 0, null);
WebKitGTK.JSStringRelease (name);
Enumeration elements = functions.elements ();
-@@ -1870,16 +1870,16 @@ int /*long*/ webkit_window_object_cleared (int /*long*/ web_view, int /*long*/ f
+@@ -1939,16 +1939,16 @@ int /*long*/ webkit_window_object_cleared (int /*long*/ web_view, int /*long*/ f
BrowserFunction current = (BrowserFunction)elements.nextElement ();
execute (current.functionString);
}
@@ -7947,7 +8066,7 @@ index e9485da..52c288d 100644
C.memmove (result, arguments, C.PTR_SIZEOF);
int type = WebKitGTK.JSValueGetType (ctx, result[0]);
if (type == WebKitGTK.kJSTypeNumber) {
-@@ -1919,7 +1919,7 @@ int /*long*/ callJava (int /*long*/ ctx, int /*long*/ func, int /*long*/ thisObj
+@@ -1988,7 +1988,7 @@ int /*long*/ callJava (int /*long*/ ctx, int /*long*/ func, int /*long*/ thisObj
return convertToJS (ctx, returnValue);
}
@@ -7956,7 +8075,7 @@ index e9485da..52c288d 100644
if (value == null) {
return WebKitGTK.JSValueMakeUndefined (ctx);
}
-@@ -1930,8 +1930,8 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
+@@ -1999,8 +1999,8 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, (String)value, true);
}
@@ -7967,7 +8086,7 @@ index e9485da..52c288d 100644
WebKitGTK.JSStringRelease (stringRef);
return result;
}
-@@ -1944,10 +1944,10 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
+@@ -2013,10 +2013,10 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
if (value instanceof Object[]) {
Object[] arrayValue = (Object[]) value;
int length = arrayValue.length;
@@ -7980,7 +8099,7 @@ index e9485da..52c288d 100644
arguments[i] = jsObject;
}
return WebKitGTK.JSObjectMakeArray (ctx, length, arguments, null);
-@@ -1956,7 +1956,7 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
+@@ -2025,7 +2025,7 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
return 0;
}
@@ -7989,7 +8108,7 @@ index e9485da..52c288d 100644
int type = WebKitGTK.JSValueGetType (ctx, value);
switch (type) {
case WebKitGTK.kJSTypeBoolean: {
-@@ -1968,9 +1968,9 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) {
+@@ -2037,9 +2037,9 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) {
return new Double(result);
}
case WebKitGTK.kJSTypeString: {
@@ -8001,7 +8120,7 @@ index e9485da..52c288d 100644
byte[] bytes = new byte[(int)/*64*/length];
length = WebKitGTK.JSStringGetUTF8CString (string, bytes, length);
WebKitGTK.JSStringRelease (string);
-@@ -1991,15 +1991,15 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) {
+@@ -2060,15 +2060,15 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) {
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, PROPERTY_LENGTH, true);
}
@@ -8639,7 +8758,7 @@ index 8b0338f..f02ac24 100644
length = (int)/*64*/items_written[0];
char[] buffer = new char[length];
diff --git a/org/eclipse/swt/dnd/HTMLTransfer.java b/org/eclipse/swt/dnd/HTMLTransfer.java
-index 5d0ccae..a83bcfa 100644
+index 52fd526..f76a65f 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){
@@ -8980,7 +9099,7 @@ index d2efb77..3fecb04 100644
/* Allocate black. */
gdkColor = new GdkColor();
diff --git a/org/eclipse/swt/graphics/Cursor.java b/org/eclipse/swt/graphics/Cursor.java
-index 96dfe32..c9fb44c 100644
+index 8c4dae4..9ccbf0a 100644
--- a/org/eclipse/swt/graphics/Cursor.java
+++ b/org/eclipse/swt/graphics/Cursor.java
@@ -54,7 +54,7 @@ public final class Cursor extends Resource {
@@ -11618,7 +11737,7 @@ index 91f0a09..60a6882 100644
}
diff --git a/org/eclipse/swt/internal/Library.java b/org/eclipse/swt/internal/Library.java
-index d76b39a..2b0dfb3 100644
+index 71ce9e4..c0b94f3 100644
--- a/org/eclipse/swt/internal/Library.java
+++ b/org/eclipse/swt/internal/Library.java
@@ -42,7 +42,7 @@ public class Library {
@@ -15274,7 +15393,7 @@ index 691a60f..4de85dc 100644
+ public long /*int*/ screen_changed;
}
diff --git a/org/eclipse/swt/internal/gtk/OS.java b/org/eclipse/swt/internal/gtk/OS.java
-index 5306e6e..15bf432 100644
+index 62bc7a8..eb1efa2 100644
--- a/org/eclipse/swt/internal/gtk/OS.java
+++ b/org/eclipse/swt/internal/gtk/OS.java
@@ -37,7 +37,7 @@ public class OS extends C {
@@ -15295,7 +15414,7 @@ index 5306e6e..15bf432 100644
public static final int ATK_RELATION_LABELLED_BY = 4;
public static final int G_FILE_TEST_IS_DIR = 1 << 2;
public static final int G_FILE_TEST_IS_EXECUTABLE = 1 << 3;
-@@ -663,12 +663,12 @@ public static final native int XExposeEvent_sizeof();
+@@ -669,12 +669,12 @@ 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();
@@ -15310,7 +15429,7 @@ index 5306e6e..15bf432 100644
-@@ -676,82 +676,82 @@ public static final native int /*long*/ realpath(byte[] path, byte[] realPath);
+@@ -682,82 +682,82 @@ public static final native int /*long*/ realpath(byte[] path, byte[] realPath);
/** @param object_class cast=(GObjectClass *) */
@@ -15426,7 +15545,7 @@ index 5306e6e..15bf432 100644
/** X11 Native methods and constants */
public static final int Above = 0;
-@@ -769,7 +769,7 @@ public static final int FocusOut = 10;
+@@ -775,7 +775,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;
@@ -15435,7 +15554,7 @@ index 5306e6e..15bf432 100644
public static final int NotifyNormal = 0;
public static final int NotifyGrab = 1;
public static final int NotifyHint = 1;
-@@ -785,8 +785,8 @@ public static final int VisibilityChangeMask = 1 << 16;
+@@ -791,8 +791,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;
@@ -15446,7 +15565,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _Call(proc, arg1, arg2);
-@@ -794,8 +794,8 @@ public static final int Call(int /*long*/ proc, int /*long*/ arg1, int /*long*/
+@@ -800,8 +800,8 @@ public static final int Call(int /*long*/ proc, int /*long*/ arg1, int /*long*/
lock.unlock();
}
}
@@ -15457,7 +15576,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _call(function, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -806,8 +806,8 @@ public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0,
+@@ -812,8 +812,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 *) */
@@ -15468,7 +15587,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GDK_PIXMAP_XID(pixmap);
-@@ -820,8 +820,8 @@ public static final int /*long*/ GDK_PIXMAP_XID(int /*long*/ pixmap) {
+@@ -826,8 +826,8 @@ public static final int /*long*/ GDK_PIXMAP_XID(int /*long*/ pixmap) {
* @param event_mask cast=(long)
* @param event_return cast=(XEvent *)
*/
@@ -15479,7 +15598,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XCheckMaskEvent(display, event_mask, event_return);
-@@ -835,8 +835,8 @@ public static final boolean XCheckMaskEvent(int /*long*/ display, int /*long*/ e
+@@ -841,8 +841,8 @@ public static final boolean XCheckMaskEvent(int /*long*/ display, int /*long*/ e
* @param event_mask cast=(long)
* @param event_return cast=(XEvent *)
*/
@@ -15490,7 +15609,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XCheckWindowEvent(display, window, event_mask, event_return);
-@@ -850,8 +850,8 @@ public static final boolean XCheckWindowEvent(int /*long*/ display, int /*long*/
+@@ -856,8 +856,8 @@ public static final boolean XCheckWindowEvent(int /*long*/ display, int /*long*/
* @param predicate cast=(Bool (*)())
* @param arg cast=(XPointer)
*/
@@ -15501,7 +15620,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XCheckIfEvent(display, event_return, predicate, arg);
-@@ -860,8 +860,8 @@ public static final boolean XCheckIfEvent(int /*long*/ display, int /*long*/ eve
+@@ -866,8 +866,8 @@ public static final boolean XCheckIfEvent(int /*long*/ display, int /*long*/ eve
}
}
/** @param display cast=(Display *) */
@@ -15512,7 +15631,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XDefaultScreen(display);
-@@ -870,8 +870,8 @@ public static final int XDefaultScreen(int /*long*/ display) {
+@@ -876,8 +876,8 @@ public static final int XDefaultScreen(int /*long*/ display) {
}
}
/** @param display cast=(Display *) */
@@ -15523,7 +15642,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XDefaultRootWindow(display);
-@@ -880,8 +880,8 @@ public static final int /*long*/ XDefaultRootWindow(int /*long*/ display) {
+@@ -886,8 +886,8 @@ public static final int /*long*/ XDefaultRootWindow(int /*long*/ display) {
}
}
/** @param display cast=(Display *) */
@@ -15534,7 +15653,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_XFlush(display);
-@@ -890,8 +890,8 @@ public static final void XFlush(int /*long*/ display) {
+@@ -896,8 +896,8 @@ public static final void XFlush(int /*long*/ display) {
}
}
/** @param address cast=(void *) */
@@ -15545,7 +15664,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_XFree(address);
-@@ -905,8 +905,8 @@ public static final void XFree(int /*long*/ address) {
+@@ -911,8 +911,8 @@ public static final void XFree(int /*long*/ address) {
* @param window cast=(Window)
* @param time cast=(Time)
*/
@@ -15556,7 +15675,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XSetSelectionOwner(display, selection, window, time);
-@@ -918,8 +918,8 @@ public static final int /*long*/ XSetSelectionOwner(int /*long*/ display, int /*
+@@ -924,8 +924,8 @@ public static final int /*long*/ XSetSelectionOwner(int /*long*/ display, int /*
* @param display cast=(Display *)
* @param selection cast=(Atom)
*/
@@ -15567,7 +15686,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XGetSelectionOwner(display, selection);
-@@ -939,8 +939,8 @@ public static final int /*long*/ XGetSelectionOwner(int /*long*/ display, int /*
+@@ -945,8 +945,8 @@ public static final int /*long*/ XGetSelectionOwner(int /*long*/ display, int /*
* @param bytes_after_return cast=(unsigned long *)
* @param prop_return cast=(unsigned char **)
*/
@@ -15578,7 +15697,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XGetWindowProperty(display, window, property, offset, length, delete, req_type, actual_type_return, actual_format_return , nitems_return, bytes_after_return, prop_return);
-@@ -955,8 +955,8 @@ public static final int /*long*/ XGetWindowProperty(int /*long*/ display, int /*
+@@ -961,8 +961,8 @@ public static final int /*long*/ XGetWindowProperty(int /*long*/ display, int /*
* @param name cast=(char *)
* @param ifExists cast=(Bool)
*/
@@ -15589,7 +15708,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XInternAtom(display, name, ifExists);
-@@ -975,8 +975,8 @@ public static final int /*long*/ XInternAtom(int /*long*/ display, byte[] name,
+@@ -981,8 +981,8 @@ public static final int /*long*/ XInternAtom(int /*long*/ display, byte[] name,
* @param win_y_return cast=(int *)
* @param mask_return cast=(unsigned int *)
*/
@@ -15600,7 +15719,7 @@ index 5306e6e..15bf432 100644
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);
-@@ -992,8 +992,8 @@ public static final int XQueryPointer(int /*long*/ display, int /*long*/ w, int
+@@ -998,8 +998,8 @@ public static final int XQueryPointer(int /*long*/ display, int /*long*/ w, int
* @param children_return cast=(Window **)
* @param nchildren_return cast=(unsigned int *)
*/
@@ -15611,7 +15730,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XQueryTree(display, w, root_return, parent_return, children_return, nchildren_return);
-@@ -1005,8 +1005,8 @@ public static final int XQueryTree(int /*long*/ display, int /*long*/ w, int /*l
+@@ -1011,8 +1011,8 @@ public static final int XQueryTree(int /*long*/ display, int /*long*/ w, int /*l
* @param display cast=(Display *)
* @param keysym cast=(KeySym)
*/
@@ -15622,7 +15741,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XKeysymToKeycode(display, keysym);
-@@ -1019,8 +1019,8 @@ public static final int XKeysymToKeycode(int /*long*/ display, int /*long*/ keys
+@@ -1025,8 +1025,8 @@ public static final int XKeysymToKeycode(int /*long*/ display, int /*long*/ keys
* @param window cast=(Window)
* @param num_prop_return cast=(int *)
*/
@@ -15633,7 +15752,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XListProperties(display, window, num_prop_return);
-@@ -1033,8 +1033,8 @@ public static final int /*long*/ XListProperties(int /*long*/ display, int /*lon
+@@ -1039,8 +1039,8 @@ public static final int /*long*/ XListProperties(int /*long*/ display, int /*lon
* @param window cast=(Window)
* @param values flags=no_out
*/
@@ -15644,7 +15763,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XReconfigureWMWindow(display, window, screen, valueMask, values);
-@@ -1047,8 +1047,8 @@ public static final int XReconfigureWMWindow(int /*long*/ display, int /*long*/
+@@ -1053,8 +1053,8 @@ public static final int XReconfigureWMWindow(int /*long*/ display, int /*long*/
* @param w cast=(Window)
* @param event_send cast=(XEvent *)
*/
@@ -15655,7 +15774,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XSendEvent(display, w, propogate, event_mask, event_send);
-@@ -1057,8 +1057,8 @@ public static final int XSendEvent(int /*long*/ display, int /*long*/ w, boolean
+@@ -1063,8 +1063,8 @@ public static final int XSendEvent(int /*long*/ display, int /*long*/ w, boolean
}
}
/** @param handler cast=(XIOErrorHandler) */
@@ -15666,7 +15785,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XSetIOErrorHandler(handler);
-@@ -1067,8 +1067,8 @@ public static final int /*long*/ XSetIOErrorHandler(int /*long*/ handler) {
+@@ -1073,8 +1073,8 @@ public static final int /*long*/ XSetIOErrorHandler(int /*long*/ handler) {
}
}
/** @param handler cast=(XErrorHandler) */
@@ -15677,7 +15796,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XSetErrorHandler(handler);
-@@ -1080,8 +1080,8 @@ public static final int /*long*/ XSetErrorHandler(int /*long*/ handler) {
+@@ -1086,8 +1086,8 @@ public static final int /*long*/ XSetErrorHandler(int /*long*/ handler) {
* @param display cast=(Display *)
* @param window cast=(Window)
*/
@@ -15688,7 +15807,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XSetInputFocus(display, window, revert, time);
-@@ -1094,8 +1094,8 @@ public static final int XSetInputFocus(int /*long*/ display, int /*long*/ window
+@@ -1100,8 +1100,8 @@ public static final int XSetInputFocus(int /*long*/ display, int /*long*/ window
* @param w cast=(Window)
* @param prop_window cast=(Window)
*/
@@ -15699,7 +15818,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XSetTransientForHint(display, w, prop_window);
-@@ -1104,8 +1104,8 @@ public static final int XSetTransientForHint(int /*long*/ display, int /*long*/
+@@ -1110,8 +1110,8 @@ public static final int XSetTransientForHint(int /*long*/ display, int /*long*/
}
}
/** @param display cast=(Display *) */
@@ -15710,7 +15829,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XSynchronize(display, onoff);
-@@ -1118,8 +1118,8 @@ public static final int /*long*/ XSynchronize(int /*long*/ display, boolean onof
+@@ -1124,8 +1124,8 @@ public static final int /*long*/ XSynchronize(int /*long*/ display, boolean onof
* @param is_press cast=(Bool)
* @param delay cast=(unsigned long)
*/
@@ -15721,7 +15840,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_XTestFakeButtonEvent(display, button, is_press, delay);
-@@ -1132,8 +1132,8 @@ public static final void XTestFakeButtonEvent(int /*long*/ display, int button,
+@@ -1138,8 +1138,8 @@ public static final void XTestFakeButtonEvent(int /*long*/ display, int button,
* @param is_press cast=(Bool)
* @param delay cast=(unsigned long)
*/
@@ -15732,7 +15851,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_XTestFakeKeyEvent(display, keycode, is_press, delay);
-@@ -1145,8 +1145,8 @@ public static final void XTestFakeKeyEvent(int /*long*/ display, int keycode, bo
+@@ -1151,8 +1151,8 @@ public static final void XTestFakeKeyEvent(int /*long*/ display, int keycode, bo
* @param display cast=(Display *)
* @param delay cast=(unsigned long)
*/
@@ -15743,7 +15862,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_XTestFakeMotionEvent(display, screen_number, x, y, delay);
-@@ -1159,8 +1159,8 @@ public static final void XTestFakeMotionEvent(int /*long*/ display, int screen_n
+@@ -1165,8 +1165,8 @@ public static final void XTestFakeMotionEvent(int /*long*/ display, int screen_n
* @param sourceWindow cast=(Window)
* @param destWindow cast=(Window)
*/
@@ -15754,7 +15873,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XWarpPointer(display, sourceWindow, destWindow, sourceX, sourceY, sourceWidth, sourceHeight, destX, destY);
-@@ -1169,8 +1169,8 @@ public static final int XWarpPointer(int /*long*/ display, int /*long*/ sourceWi
+@@ -1175,8 +1175,8 @@ public static final int XWarpPointer(int /*long*/ display, int /*long*/ sourceWi
}
}
/** @param atom cast=(GdkAtom) */
@@ -15765,7 +15884,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_x11_atom_to_xatom(atom);
-@@ -1179,8 +1179,8 @@ public static final int /*long*/ gdk_x11_atom_to_xatom(int /*long*/ atom) {
+@@ -1185,8 +1185,8 @@ public static final int /*long*/ gdk_x11_atom_to_xatom(int /*long*/ atom) {
}
}
/** @param colormap cast=(GdkColormap *) */
@@ -15776,7 +15895,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_x11_colormap_get_xcolormap(colormap);
-@@ -1189,8 +1189,8 @@ public static final int /*long*/ gdk_x11_colormap_get_xcolormap(int /*long*/ col
+@@ -1195,8 +1195,8 @@ public static final int /*long*/ gdk_x11_colormap_get_xcolormap(int /*long*/ col
}
}
/** @param gdkdisplay cast=(GdkDisplay *) */
@@ -15787,7 +15906,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_x11_display_get_xdisplay(gdkdisplay);
-@@ -1199,8 +1199,8 @@ public static final int /*long*/ gdk_x11_display_get_xdisplay (int /*long*/ gdkd
+@@ -1205,8 +1205,8 @@ public static final int /*long*/ gdk_x11_display_get_xdisplay (int /*long*/ gdkd
}
}
/** @param drawable cast=(GdkDrawable *) */
@@ -15798,7 +15917,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_x11_drawable_get_xdisplay(drawable);
-@@ -1209,8 +1209,8 @@ public static final int /*long*/ gdk_x11_drawable_get_xdisplay(int /*long*/ draw
+@@ -1215,8 +1215,8 @@ public static final int /*long*/ gdk_x11_drawable_get_xdisplay(int /*long*/ draw
}
}
/** @param drawable cast=(GdkDrawable *) */
@@ -15809,7 +15928,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_x11_drawable_get_xid(drawable);
-@@ -1223,8 +1223,8 @@ public static final int /*long*/ gdk_x11_drawable_get_xid(int /*long*/ drawable)
+@@ -1229,8 +1229,8 @@ public static final int /*long*/ gdk_x11_drawable_get_xid(int /*long*/ drawable)
* @param screen cast=(GdkScreen *)
* @param xvisualid cast=(VisualID)
*/
@@ -15820,7 +15939,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_x11_screen_lookup_visual(screen, xvisualid);
-@@ -1236,8 +1236,8 @@ public static final int /*long*/ gdk_x11_screen_lookup_visual(int /*long*/ scree
+@@ -1242,8 +1242,8 @@ public static final int /*long*/ gdk_x11_screen_lookup_visual(int /*long*/ scree
* @method flags=dynamic
* @param screen cast=(GdkScreen *)
*/
@@ -15831,7 +15950,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_x11_screen_get_window_manager_name(screen);
-@@ -1246,8 +1246,8 @@ public static final int /*long*/ gdk_x11_screen_get_window_manager_name(int /*lo
+@@ -1252,8 +1252,8 @@ public static final int /*long*/ gdk_x11_screen_get_window_manager_name(int /*lo
}
}
/** @param visual cast=(GdkVisual *) */
@@ -15842,7 +15961,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_x11_visual_get_xvisual(visual);
-@@ -1259,8 +1259,8 @@ public static final int /*long*/ gdk_x11_visual_get_xvisual(int /*long*/ visual)
+@@ -1265,8 +1265,8 @@ public static final int /*long*/ gdk_x11_visual_get_xvisual(int /*long*/ visual)
* @method flags=dynamic
* @param gdkdisplay cast=(GdkDisplay *)
*/
@@ -15853,7 +15972,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_x11_window_lookup_for_display(gdkdisplay, xid);
-@@ -1268,8 +1268,8 @@ public static final int /*long*/ gdk_x11_window_lookup_for_display(int /*long*/
+@@ -1274,8 +1274,8 @@ public static final int /*long*/ gdk_x11_window_lookup_for_display(int /*long*/
lock.unlock();
}
}
@@ -15864,7 +15983,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_pixmap_foreign_new(anid);
-@@ -1280,8 +1280,8 @@ public static final int /*long*/ gdk_pixmap_foreign_new(int /*long*/ anid) {
+@@ -1286,8 +1286,8 @@ public static final int /*long*/ gdk_pixmap_foreign_new(int /*long*/ anid) {
/**
* @method flags=dynamic
*/
@@ -15875,7 +15994,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_window_lookup(xid);
-@@ -1294,8 +1294,8 @@ public static final int /*long*/ gdk_window_lookup(int /*long*/ xid) {
+@@ -1300,8 +1300,8 @@ public static final int /*long*/ gdk_window_lookup(int /*long*/ xid) {
* @param function cast=(GdkFilterFunc)
* @param data cast=(gpointer)
*/
@@ -15886,7 +16005,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_add_filter(window, function, data);
-@@ -1308,8 +1308,8 @@ public static final void gdk_window_add_filter(int /*long*/ window, int /*long*/
+@@ -1314,8 +1314,8 @@ public static final void gdk_window_add_filter(int /*long*/ window, int /*long*/
* @param function cast=(GdkFilterFunc)
* @param data cast=(gpointer)
*/
@@ -15897,7 +16016,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_remove_filter(window, function, data);
-@@ -1322,49 +1322,49 @@ public static final void gdk_window_remove_filter(int /*long*/ window, int /*lon
+@@ -1328,49 +1328,49 @@ 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)
*/
@@ -15955,7 +16074,7 @@ index 5306e6e..15bf432 100644
/** @method flags=const */
public static final native int RTLD_GLOBAL();
-@@ -1384,8 +1384,8 @@ public static final int PictOpOver = 3;
+@@ -1390,8 +1390,8 @@ public static final int PictOpOver = 3;
public static final native int XRenderPictureAttributes_sizeof();
/** @method flags=dynamic */
@@ -15966,7 +16085,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XRenderQueryExtension(display, event_basep, error_basep);
-@@ -1394,8 +1394,8 @@ public static final boolean XRenderQueryExtension(int /*long*/ display, int[] ev
+@@ -1400,8 +1400,8 @@ public static final boolean XRenderQueryExtension(int /*long*/ display, int[] ev
}
}
/** @method flags=dynamic */
@@ -15977,7 +16096,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XRenderQueryVersion(display, major_versionp, minor_versionp);
-@@ -1407,8 +1407,8 @@ public static final int XRenderQueryVersion(int /*long*/ display, int[] major_ve
+@@ -1413,8 +1413,8 @@ public static final int XRenderQueryVersion(int /*long*/ display, int[] major_ve
* @method flags=dynamic
* @param attributes flags=no_out
*/
@@ -15988,7 +16107,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XRenderCreatePicture(display, drawable, format, valuemask, attributes);
-@@ -1417,8 +1417,8 @@ public static final int /*long*/ XRenderCreatePicture(int /*long*/ display, int
+@@ -1423,8 +1423,8 @@ public static final int /*long*/ XRenderCreatePicture(int /*long*/ display, int
}
}
/** @method flags=dynamic */
@@ -15999,7 +16118,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_XRenderSetPictureClipRectangles(display, picture, xOrigin, yOrigin, rects, count);
-@@ -1427,8 +1427,8 @@ public static final void XRenderSetPictureClipRectangles(int /*long*/ display, i
+@@ -1433,8 +1433,8 @@ public static final void XRenderSetPictureClipRectangles(int /*long*/ display, i
}
}
/** @method flags=dynamic */
@@ -16010,7 +16129,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_XRenderSetPictureTransform(display, picture, transform);
-@@ -1437,8 +1437,8 @@ public static final void XRenderSetPictureTransform(int /*long*/ display, int /*
+@@ -1443,8 +1443,8 @@ public static final void XRenderSetPictureTransform(int /*long*/ display, int /*
}
}
/** @method flags=dynamic */
@@ -16021,7 +16140,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_XRenderFreePicture(display, picture);
-@@ -1447,8 +1447,8 @@ public static final void XRenderFreePicture(int /*long*/ display, int /*long*/ p
+@@ -1453,8 +1453,8 @@ public static final void XRenderFreePicture(int /*long*/ display, int /*long*/ p
}
}
/** @method flags=dynamic */
@@ -16032,7 +16151,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_XRenderComposite(display, op, src, mask, dst, src_x, src_y, mask_x, mask_y, dst_x, dst_y, width, height);
-@@ -1457,8 +1457,8 @@ public static final void XRenderComposite(int /*long*/ display, int op, int /*lo
+@@ -1463,8 +1463,8 @@ public static final void XRenderComposite(int /*long*/ display, int op, int /*lo
}
}
/** @method flags=dynamic */
@@ -16043,7 +16162,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XRenderFindStandardFormat(display, format);
-@@ -1467,8 +1467,8 @@ public static final int /*long*/ XRenderFindStandardFormat(int /*long*/ display,
+@@ -1473,8 +1473,8 @@ public static final int /*long*/ XRenderFindStandardFormat(int /*long*/ display,
}
}
/** @method flags=dynamic */
@@ -16054,7 +16173,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _XRenderFindVisualFormat(display, visual);
-@@ -1480,15 +1480,15 @@ public static final int /*long*/ XRenderFindVisualFormat(int /*long*/ display, i
+@@ -1486,15 +1486,15 @@ public static final int /*long*/ XRenderFindVisualFormat(int /*long*/ display, i
/** Custom callbacks */
/** @method flags=no_gen */
@@ -16075,7 +16194,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GDK_TYPE_COLOR();
-@@ -1497,8 +1497,8 @@ public static final int /*long*/ GDK_TYPE_COLOR() {
+@@ -1503,8 +1503,8 @@ public static final int /*long*/ GDK_TYPE_COLOR() {
}
}
/** @method flags=const */
@@ -16086,7 +16205,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GDK_TYPE_PIXBUF();
-@@ -1506,8 +1506,8 @@ public static final int /*long*/ GDK_TYPE_PIXBUF() {
+@@ -1512,8 +1512,8 @@ public static final int /*long*/ GDK_TYPE_PIXBUF() {
lock.unlock();
}
}
@@ -16097,7 +16216,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_IS_ACCEL_LABEL(obj);
-@@ -1515,8 +1515,8 @@ public static final boolean GTK_IS_ACCEL_LABEL(int /*long*/ obj) {
+@@ -1521,8 +1521,8 @@ public static final boolean GTK_IS_ACCEL_LABEL(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16108,7 +16227,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_IS_BUTTON(obj);
-@@ -1524,8 +1524,8 @@ public static final boolean GTK_IS_BUTTON(int /*long*/ obj) {
+@@ -1530,8 +1530,8 @@ public static final boolean GTK_IS_BUTTON(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16119,7 +16238,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_IS_LABEL(obj);
-@@ -1533,8 +1533,8 @@ public static final boolean GTK_IS_LABEL(int /*long*/ obj) {
+@@ -1539,8 +1539,8 @@ public static final boolean GTK_IS_LABEL(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16130,7 +16249,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_IS_SCROLLED_WINDOW(obj);
-@@ -1542,8 +1542,8 @@ public static final boolean GTK_IS_SCROLLED_WINDOW(int /*long*/ obj) {
+@@ -1548,8 +1548,8 @@ public static final boolean GTK_IS_SCROLLED_WINDOW(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16141,7 +16260,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_IS_WINDOW(obj);
-@@ -1551,8 +1551,8 @@ public static final boolean GTK_IS_WINDOW(int /*long*/ obj) {
+@@ -1557,8 +1557,8 @@ public static final boolean GTK_IS_WINDOW(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16152,7 +16271,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_IS_CELL_RENDERER_PIXBUF(obj);
-@@ -1560,8 +1560,8 @@ public static final boolean GTK_IS_CELL_RENDERER_PIXBUF(int /*long*/ obj) {
+@@ -1566,8 +1566,8 @@ public static final boolean GTK_IS_CELL_RENDERER_PIXBUF(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16163,7 +16282,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_IS_CELL_RENDERER_TEXT(obj);
-@@ -1569,8 +1569,8 @@ public static final boolean GTK_IS_CELL_RENDERER_TEXT(int /*long*/ obj) {
+@@ -1575,8 +1575,8 @@ public static final boolean GTK_IS_CELL_RENDERER_TEXT(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16174,7 +16293,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_IS_CELL_RENDERER_TOGGLE(obj);
-@@ -1578,8 +1578,8 @@ public static final boolean GTK_IS_CELL_RENDERER_TOGGLE(int /*long*/ obj) {
+@@ -1584,8 +1584,8 @@ public static final boolean GTK_IS_CELL_RENDERER_TOGGLE(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16185,7 +16304,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_IS_CONTAINER(obj);
-@@ -1587,8 +1587,8 @@ public static final boolean GTK_IS_CONTAINER(int /*long*/ obj) {
+@@ -1593,8 +1593,8 @@ public static final boolean GTK_IS_CONTAINER(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16196,7 +16315,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_IS_IMAGE_MENU_ITEM(obj);
-@@ -1596,8 +1596,8 @@ public static final boolean GTK_IS_IMAGE_MENU_ITEM(int /*long*/ obj) {
+@@ -1602,8 +1602,8 @@ public static final boolean GTK_IS_IMAGE_MENU_ITEM(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16207,7 +16326,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_IS_MENU_ITEM(obj);
-@@ -1605,8 +1605,8 @@ public static final boolean GTK_IS_MENU_ITEM(int /*long*/ obj) {
+@@ -1611,8 +1611,8 @@ public static final boolean GTK_IS_MENU_ITEM(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16218,7 +16337,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_IS_PLUG(obj);
-@@ -1614,8 +1614,8 @@ public static final boolean GTK_IS_PLUG(int /*long*/ obj) {
+@@ -1620,8 +1620,8 @@ public static final boolean GTK_IS_PLUG(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16229,7 +16348,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_IS_SOCKET(obj);
-@@ -1624,8 +1624,8 @@ public static final boolean GTK_IS_SOCKET(int /*long*/ obj) {
+@@ -1630,8 +1630,8 @@ public static final boolean GTK_IS_SOCKET(int /*long*/ obj) {
}
}
/** @method flags=const */
@@ -16240,7 +16359,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_STOCK_CANCEL();
-@@ -1634,8 +1634,8 @@ public static final int /*long*/ GTK_STOCK_CANCEL() {
+@@ -1640,8 +1640,8 @@ public static final int /*long*/ GTK_STOCK_CANCEL() {
}
}
/** @method flags=const */
@@ -16251,7 +16370,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_STOCK_OK();
-@@ -1644,8 +1644,8 @@ public static final int /*long*/ GTK_STOCK_OK() {
+@@ -1650,8 +1650,8 @@ public static final int /*long*/ GTK_STOCK_OK() {
}
}
/** @method flags=const */
@@ -16262,7 +16381,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_TYPE_CELL_RENDERER_TEXT();
-@@ -1654,8 +1654,8 @@ public static final int /*long*/ GTK_TYPE_CELL_RENDERER_TEXT() {
+@@ -1660,8 +1660,8 @@ public static final int /*long*/ GTK_TYPE_CELL_RENDERER_TEXT() {
}
}
/** @method flags=const */
@@ -16273,7 +16392,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_TYPE_CELL_RENDERER_PIXBUF();
-@@ -1664,8 +1664,8 @@ public static final int /*long*/ GTK_TYPE_CELL_RENDERER_PIXBUF() {
+@@ -1670,8 +1670,8 @@ public static final int /*long*/ GTK_TYPE_CELL_RENDERER_PIXBUF() {
}
}
/** @method flags=const */
@@ -16284,7 +16403,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_TYPE_CELL_RENDERER_TOGGLE();
-@@ -1674,8 +1674,8 @@ public static final int /*long*/ GTK_TYPE_CELL_RENDERER_TOGGLE() {
+@@ -1680,8 +1680,8 @@ public static final int /*long*/ GTK_TYPE_CELL_RENDERER_TOGGLE() {
}
}
/** @method flags=const */
@@ -16295,7 +16414,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_TYPE_FIXED();
-@@ -1684,8 +1684,8 @@ public static final int /*long*/ GTK_TYPE_FIXED() {
+@@ -1690,8 +1690,8 @@ public static final int /*long*/ GTK_TYPE_FIXED() {
}
}
/** @method flags=const */
@@ -16306,7 +16425,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_TYPE_MENU();
-@@ -1694,8 +1694,8 @@ public static final int /*long*/ GTK_TYPE_MENU() {
+@@ -1700,8 +1700,8 @@ public static final int /*long*/ GTK_TYPE_MENU() {
}
}
/** @method flags=const */
@@ -16317,7 +16436,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_TYPE_WIDGET();
-@@ -1703,8 +1703,8 @@ public static final int /*long*/ GTK_TYPE_WIDGET() {
+@@ -1709,8 +1709,8 @@ public static final int /*long*/ GTK_TYPE_WIDGET() {
lock.unlock();
}
}
@@ -16328,7 +16447,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_WIDGET_FLAGS(wid);
-@@ -1712,8 +1712,8 @@ public static final int GTK_WIDGET_FLAGS(int /*long*/ wid) {
+@@ -1718,8 +1718,8 @@ public static final int GTK_WIDGET_FLAGS(int /*long*/ wid) {
lock.unlock();
}
}
@@ -16339,7 +16458,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_WIDGET_STATE(wid);
-@@ -1721,8 +1721,8 @@ public static final int GTK_WIDGET_STATE(int /*long*/ wid) {
+@@ -1727,8 +1727,8 @@ public static final int GTK_WIDGET_STATE(int /*long*/ wid) {
lock.unlock();
}
}
@@ -16350,7 +16469,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_WIDGET_HAS_DEFAULT(wid);
-@@ -1730,8 +1730,8 @@ public static final boolean GTK_WIDGET_HAS_DEFAULT(int /*long*/ wid) {
+@@ -1736,8 +1736,8 @@ public static final boolean GTK_WIDGET_HAS_DEFAULT(int /*long*/ wid) {
lock.unlock();
}
}
@@ -16361,7 +16480,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_WIDGET_HAS_FOCUS(wid);
-@@ -1739,8 +1739,8 @@ public static final boolean GTK_WIDGET_HAS_FOCUS(int /*long*/ wid) {
+@@ -1745,8 +1745,8 @@ public static final boolean GTK_WIDGET_HAS_FOCUS(int /*long*/ wid) {
lock.unlock();
}
}
@@ -16372,7 +16491,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_WIDGET_MAPPED(wid);
-@@ -1748,8 +1748,8 @@ public static final boolean GTK_WIDGET_MAPPED(int /*long*/ wid) {
+@@ -1754,8 +1754,8 @@ public static final boolean GTK_WIDGET_MAPPED(int /*long*/ wid) {
lock.unlock();
}
}
@@ -16383,7 +16502,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_WIDGET_SENSITIVE(wid);
-@@ -1757,8 +1757,8 @@ public static final boolean GTK_WIDGET_SENSITIVE(int /*long*/ wid) {
+@@ -1763,8 +1763,8 @@ public static final boolean GTK_WIDGET_SENSITIVE(int /*long*/ wid) {
lock.unlock();
}
}
@@ -16394,7 +16513,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_GTK_WIDGET_SET_FLAGS(wid, flag);
-@@ -1766,8 +1766,8 @@ public static final void GTK_WIDGET_SET_FLAGS(int /*long*/ wid, int flag) {
+@@ -1772,8 +1772,8 @@ public static final void GTK_WIDGET_SET_FLAGS(int /*long*/ wid, int flag) {
lock.unlock();
}
}
@@ -16405,7 +16524,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_GTK_WIDGET_UNSET_FLAGS(wid, flag);
-@@ -1775,8 +1775,8 @@ public static final void GTK_WIDGET_UNSET_FLAGS(int /*long*/ wid, int flag) {
+@@ -1781,8 +1781,8 @@ public static final void GTK_WIDGET_UNSET_FLAGS(int /*long*/ wid, int flag) {
lock.unlock();
}
}
@@ -16416,7 +16535,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GTK_WIDGET_VISIBLE(wid);
-@@ -1784,8 +1784,8 @@ public static final boolean GTK_WIDGET_VISIBLE(int /*long*/ wid) {
+@@ -1790,8 +1790,8 @@ public static final boolean GTK_WIDGET_VISIBLE(int /*long*/ wid) {
lock.unlock();
}
}
@@ -16427,7 +16546,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _G_OBJECT_CLASS(klass);
-@@ -1793,8 +1793,8 @@ public static final int /*long*/ G_OBJECT_CLASS (int /*long*/ klass) {
+@@ -1799,8 +1799,8 @@ public static final int /*long*/ G_OBJECT_CLASS (int /*long*/ klass) {
lock.unlock();
}
}
@@ -16438,7 +16557,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _G_OBJECT_GET_CLASS(object);
-@@ -1802,8 +1802,8 @@ public static final int /*long*/ G_OBJECT_GET_CLASS (int /*long*/ object) {
+@@ -1808,8 +1808,8 @@ public static final int /*long*/ G_OBJECT_GET_CLASS (int /*long*/ object) {
lock.unlock();
}
}
@@ -16449,7 +16568,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _G_OBJECT_TYPE_NAME(object);
-@@ -1811,8 +1811,8 @@ public static final int /*long*/ G_OBJECT_TYPE_NAME (int /*long*/ object) {
+@@ -1817,8 +1817,8 @@ public static final int /*long*/ G_OBJECT_TYPE_NAME (int /*long*/ object) {
lock.unlock();
}
}
@@ -16460,7 +16579,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _G_TYPE_CHECK_INSTANCE_TYPE(instance, type);
-@@ -1821,18 +1821,18 @@ public static final boolean G_TYPE_CHECK_INSTANCE_TYPE (int /*long*/ instance, i
+@@ -1827,18 +1827,18 @@ public static final boolean G_TYPE_CHECK_INSTANCE_TYPE (int /*long*/ instance, i
}
}
/** @method flags=const */
@@ -16487,7 +16606,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _G_OBJECT_TYPE(instance);
-@@ -1841,8 +1841,8 @@ public static final int /*long*/ G_OBJECT_TYPE (int /*long*/ instance) {
+@@ -1847,8 +1847,8 @@ public static final int /*long*/ G_OBJECT_TYPE (int /*long*/ instance) {
}
}
/** @method flags=const */
@@ -16498,7 +16617,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _G_TYPE_STRING();
-@@ -1860,8 +1860,8 @@ public static final int PANGO_PIXELS(int dimension) {
+@@ -1866,8 +1866,8 @@ public static final int PANGO_PIXELS(int dimension) {
}
}
/** @method flags=const */
@@ -16509,7 +16628,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _PANGO_TYPE_FONT_DESCRIPTION();
-@@ -1870,8 +1870,8 @@ public static final int /*long*/ PANGO_TYPE_FONT_DESCRIPTION() {
+@@ -1876,8 +1876,8 @@ public static final int /*long*/ PANGO_TYPE_FONT_DESCRIPTION() {
}
}
/** @method flags=const */
@@ -16520,7 +16639,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _PANGO_TYPE_LAYOUT();
-@@ -1880,8 +1880,8 @@ public static final int /*long*/ PANGO_TYPE_LAYOUT() {
+@@ -1886,8 +1886,8 @@ public static final int /*long*/ PANGO_TYPE_LAYOUT() {
}
}
/** @param handle cast=(void *) */
@@ -16531,7 +16650,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _dlclose(handle);
-@@ -1890,8 +1890,8 @@ public static final int dlclose(int /*long*/ handle) {
+@@ -1896,8 +1896,8 @@ public static final int dlclose(int /*long*/ handle) {
}
}
/** @param filename cast=(const char *) */
@@ -16542,7 +16661,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _dlopen(filename, flag);
-@@ -1903,8 +1903,8 @@ public static final int /*long*/ dlopen(byte[] filename, int flag) {
+@@ -1909,8 +1909,8 @@ public static final int /*long*/ dlopen(byte[] filename, int flag) {
* @param handle cast=(void *)
* @param symbol cast=(const char *)
*/
@@ -16553,7 +16672,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _dlsym(handle, symbol);
-@@ -1913,8 +1913,8 @@ public static final int /*long*/ dlsym(int /*long*/ handle, byte[] symbol) {
+@@ -1919,8 +1919,8 @@ public static final int /*long*/ dlsym(int /*long*/ handle, byte[] symbol) {
}
}
/** @method flags=dynamic */
@@ -16564,7 +16683,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_app_info_create_from_commandline(commandline, applName, flags, error);
-@@ -1923,8 +1923,8 @@ public static final int /*long*/ g_app_info_create_from_commandline(byte[] comma
+@@ -1929,8 +1929,8 @@ public static final int /*long*/ g_app_info_create_from_commandline(byte[] comma
}
}
/** @method flags=dynamic */
@@ -16575,7 +16694,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_app_info_get_all();
-@@ -1933,8 +1933,8 @@ public static final int /*long*/ g_app_info_get_all() {
+@@ -1939,8 +1939,8 @@ public static final int /*long*/ g_app_info_get_all() {
}
}
/** @method flags=dynamic */
@@ -16586,7 +16705,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_app_info_get_executable(appInfo);
-@@ -1943,8 +1943,8 @@ public static final int /*long*/ g_app_info_get_executable(int /*long*/ appInfo)
+@@ -1949,8 +1949,8 @@ public static final int /*long*/ g_app_info_get_executable(int /*long*/ appInfo)
}
}
/** @method flags=dynamic */
@@ -16597,7 +16716,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_app_info_get_icon(appInfo);
-@@ -1953,8 +1953,8 @@ public static final int /*long*/ g_app_info_get_icon(int /*long*/ appInfo) {
+@@ -1959,8 +1959,8 @@ public static final int /*long*/ g_app_info_get_icon(int /*long*/ appInfo) {
}
}
/** @method flags=dynamic */
@@ -16608,7 +16727,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_app_info_get_id(appInfo);
-@@ -1963,8 +1963,8 @@ public static final int /*long*/ g_app_info_get_id(int /*long*/ appInfo) {
+@@ -1969,8 +1969,8 @@ public static final int /*long*/ g_app_info_get_id(int /*long*/ appInfo) {
}
}
/** @method flags=dynamic */
@@ -16619,7 +16738,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_app_info_get_name(appInfo);
-@@ -1973,8 +1973,8 @@ public static final int /*long*/ g_app_info_get_name(int /*long*/ appInfo) {
+@@ -1979,8 +1979,8 @@ public static final int /*long*/ g_app_info_get_name(int /*long*/ appInfo) {
}
}
/** @method flags=dynamic */
@@ -16630,7 +16749,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_app_info_launch(appInfo, list, launchContext, error);
-@@ -1983,8 +1983,8 @@ public static final boolean g_app_info_launch(int /*long*/ appInfo, int /*long*/
+@@ -1989,8 +1989,8 @@ public static final boolean g_app_info_launch(int /*long*/ appInfo, int /*long*/
}
}
/** @method flags=dynamic */
@@ -16641,7 +16760,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_app_info_get_default_for_type(mimeType, mustSupportURIs);
-@@ -1993,8 +1993,8 @@ public static final int /*long*/ g_app_info_get_default_for_type(byte[] mimeType
+@@ -1999,8 +1999,8 @@ public static final int /*long*/ g_app_info_get_default_for_type(byte[] mimeType
}
}
/** @method flags=dynamic */
@@ -16652,7 +16771,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_app_info_launch_default_for_uri(appInfo, launchContext, error);
-@@ -2003,8 +2003,8 @@ public static final boolean g_app_info_launch_default_for_uri(int /*long*/ appIn
+@@ -2009,8 +2009,8 @@ public static final boolean g_app_info_launch_default_for_uri(int /*long*/ appIn
}
}
/** @method flags=dynamic */
@@ -16663,7 +16782,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_app_info_should_show(appInfo);
-@@ -2013,8 +2013,8 @@ public static final boolean g_app_info_should_show(int /*long*/ appInfo) {
+@@ -2019,8 +2019,8 @@ public static final boolean g_app_info_should_show(int /*long*/ appInfo) {
}
}
/** @method flags=dynamic */
@@ -16674,7 +16793,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_app_info_supports_uris(appInfo);
-@@ -2023,8 +2023,8 @@ public static final boolean g_app_info_supports_uris(int /*long*/ appInfo) {
+@@ -2029,8 +2029,8 @@ public static final boolean g_app_info_supports_uris(int /*long*/ appInfo) {
}
}
/** @method flags=dynamic */
@@ -16685,7 +16804,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_data_input_stream_new(input_stream);
-@@ -2033,8 +2033,8 @@ public static final int /*long*/ g_data_input_stream_new(int /*long*/ input_stre
+@@ -2039,8 +2039,8 @@ public static final int /*long*/ g_data_input_stream_new(int /*long*/ input_stre
}
}
/** @method flags=dynamic */
@@ -16696,7 +16815,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_data_input_stream_read_line(stream, count, cancellable, error);
-@@ -2043,8 +2043,8 @@ public static final int /*long*/ g_data_input_stream_read_line(int /*long*/ stre
+@@ -2049,8 +2049,8 @@ public static final int /*long*/ g_data_input_stream_read_line(int /*long*/ stre
}
}
/** @method flags=dynamic */
@@ -16707,7 +16826,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_content_type_equals(type1, type2);
-@@ -2053,8 +2053,8 @@ public static final boolean g_content_type_equals(int /*long*/ type1, byte[] typ
+@@ -2059,8 +2059,8 @@ public static final boolean g_content_type_equals(int /*long*/ type1, byte[] typ
}
}
/** @method flags=dynamic */
@@ -16718,7 +16837,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_content_type_is_a(type, supertype);
-@@ -2063,8 +2063,8 @@ public static final boolean g_content_type_is_a(int /*long*/ type, byte[] supert
+@@ -2069,8 +2069,8 @@ public static final boolean g_content_type_is_a(int /*long*/ type, byte[] supert
}
}
/** @method flags=dynamic */
@@ -16729,7 +16848,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_content_type_get_mime_type(mime_type);
-@@ -2073,8 +2073,8 @@ public static final int /*long*/ g_content_type_get_mime_type(byte[] mime_type)
+@@ -2079,8 +2079,8 @@ public static final int /*long*/ g_content_type_get_mime_type(byte[] mime_type)
}
}
/** @method flags=dynamic */
@@ -16740,7 +16859,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_content_types_get_registered();
-@@ -2083,8 +2083,8 @@ public static final int /*long*/ g_content_types_get_registered() {
+@@ -2089,8 +2089,8 @@ public static final int /*long*/ g_content_types_get_registered() {
}
}
/** @method flags=dynamic */
@@ -16751,7 +16870,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_desktop_app_info_new_from_filename(fileName);
-@@ -2093,8 +2093,8 @@ public static final int /*long*/ g_desktop_app_info_new_from_filename(byte[] fil
+@@ -2099,8 +2099,8 @@ public static final int /*long*/ g_desktop_app_info_new_from_filename(byte[] fil
}
}
/** @method flags=dynamic */
@@ -16762,7 +16881,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_file_info_get_content_type (info);
-@@ -2103,8 +2103,8 @@ public static final int /*long*/ g_file_info_get_content_type (int /*long*/ info
+@@ -2109,8 +2109,8 @@ public static final int /*long*/ g_file_info_get_content_type (int /*long*/ info
}
}
/** @method flags=dynamic */
@@ -16773,7 +16892,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_file_get_path(file);
-@@ -2113,8 +2113,8 @@ public static final int /*long*/ g_file_get_path (int /*long*/ file) {
+@@ -2119,8 +2119,8 @@ public static final int /*long*/ g_file_get_path (int /*long*/ file) {
}
}
/** @method flags=dynamic */
@@ -16784,7 +16903,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_file_get_uri(file);
-@@ -2123,8 +2123,8 @@ public static final int /*long*/ g_file_get_uri (int /*long*/ file) {
+@@ -2129,8 +2129,8 @@ public static final int /*long*/ g_file_get_uri (int /*long*/ file) {
}
}
/** @method flags=dynamic */
@@ -16795,7 +16914,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_file_info_get_modification_time(info, result);
-@@ -2133,8 +2133,8 @@ public static final void g_file_info_get_modification_time(int /*long*/ info, in
+@@ -2139,8 +2139,8 @@ public static final void g_file_info_get_modification_time(int /*long*/ info, in
}
}
/** @method flags=dynamic */
@@ -16806,7 +16925,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_file_icon_get_file(icon);
-@@ -2143,8 +2143,8 @@ public static final int /*long*/ g_file_icon_get_file(int /*long*/ icon) {
+@@ -2149,8 +2149,8 @@ public static final int /*long*/ g_file_icon_get_file(int /*long*/ icon) {
}
}
/** @method flags=dynamic */
@@ -16817,7 +16936,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_file_new_for_path(fileName);
-@@ -2153,8 +2153,8 @@ public static final int /*long*/ g_file_new_for_path(byte[] fileName) {
+@@ -2159,8 +2159,8 @@ public static final int /*long*/ g_file_new_for_path(byte[] fileName) {
}
}
/** @method flags=dynamic */
@@ -16828,7 +16947,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_file_new_for_commandline_arg(fileName);
-@@ -2163,8 +2163,8 @@ public static final int /*long*/ g_file_new_for_commandline_arg(byte[] fileName)
+@@ -2169,8 +2169,8 @@ public static final int /*long*/ g_file_new_for_commandline_arg(byte[] fileName)
}
}
/** @method flags=dynamic */
@@ -16839,7 +16958,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_file_new_for_uri(fileName);
-@@ -2173,8 +2173,8 @@ public static final int /*long*/ g_file_new_for_uri(byte[] fileName) {
+@@ -2179,8 +2179,8 @@ public static final int /*long*/ g_file_new_for_uri(byte[] fileName) {
}
}
/** @method flags=dynamic */
@@ -16850,7 +16969,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_file_query_info (file, attributes, flags, cancellable, error);
-@@ -2184,8 +2184,8 @@ public static final int /*long*/ g_file_query_info (int /*long*/ file,byte[] at
+@@ -2190,8 +2190,8 @@ public static final int /*long*/ g_file_query_info (int /*long*/ file,byte[] at
}
/** @method flags=dynamic */
@@ -16861,7 +16980,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_file_read(file, cancellable, error);
-@@ -2204,8 +2204,8 @@ public static final boolean /*long*/ g_file_test(byte[] file, int test) {
+@@ -2210,8 +2210,8 @@ public static final boolean /*long*/ g_file_test(byte[] file, int test) {
}
}
/** @method flags=dynamic */
@@ -16872,7 +16991,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_icon_to_string(icon);
-@@ -2214,8 +2214,8 @@ public static final int /*long*/ g_icon_to_string (int /*long*/ icon) {
+@@ -2220,8 +2220,8 @@ public static final int /*long*/ g_icon_to_string (int /*long*/ icon) {
}
}
/** @method flags=dynamic */
@@ -16883,7 +17002,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_icon_new_for_string(str, error);
-@@ -2230,8 +2230,8 @@ public static final int /*long*/ g_icon_new_for_string (byte[] str, int /*long*/
+@@ -2236,8 +2236,8 @@ public static final int /*long*/ g_icon_new_for_string (byte[] str, int /*long*/
* @param hook_data cast=(gpointer)
* @param data_destroy cast=(GDestroyNotify)
*/
@@ -16894,7 +17013,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_signal_add_emission_hook(signal_id, detail, hook_func, hook_data, data_destroy);
-@@ -2243,8 +2243,8 @@ public static final int /*long*/ g_signal_add_emission_hook(int signal_id, int d
+@@ -2249,8 +2249,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)
*/
@@ -16905,7 +17024,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_signal_remove_emission_hook (signal_id, hook_id);
-@@ -2257,8 +2257,8 @@ public static final void g_signal_remove_emission_hook(int signal_id, int /*long
+@@ -2263,8 +2263,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)
*/
@@ -16916,7 +17035,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_cclosure_new(callback_func, user_data, destroy_data);
-@@ -2267,8 +2267,8 @@ public static final int /*long*/ g_cclosure_new(int /*long*/ callback_func, int
+@@ -2273,8 +2273,8 @@ public static final int /*long*/ g_cclosure_new(int /*long*/ callback_func, int
}
}
/** @param closure cast=(GClosure *) */
@@ -16927,7 +17046,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_closure_ref(closure);
-@@ -2277,8 +2277,8 @@ public static final int /*long*/ g_closure_ref(int /*long*/ closure) {
+@@ -2283,8 +2283,8 @@ public static final int /*long*/ g_closure_ref(int /*long*/ closure) {
}
}
/** @param closure cast=(GClosure *) */
@@ -16938,7 +17057,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_closure_unref(closure);
-@@ -2287,8 +2287,8 @@ public static final void g_closure_unref(int /*long*/ closure) {
+@@ -2293,8 +2293,8 @@ public static final void g_closure_unref(int /*long*/ closure) {
}
}
/** @param context cast=(GMainContext *) */
@@ -16949,7 +17068,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_main_context_acquire(context);
-@@ -2300,8 +2300,8 @@ public static final boolean g_main_context_acquire(int /*long*/ context) {
+@@ -2306,8 +2306,8 @@ public static final boolean g_main_context_acquire(int /*long*/ context) {
* @param context cast=(GMainContext *)
* @param fds cast=(GPollFD *)
*/
@@ -16960,7 +17079,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_main_context_check(context, max_priority, fds, n_fds);
-@@ -2309,8 +2309,8 @@ public static final int g_main_context_check(int /*long*/ context, int max_prior
+@@ -2315,8 +2315,8 @@ public static final int g_main_context_check(int /*long*/ context, int max_prior
lock.unlock();
}
}
@@ -16971,7 +17090,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_main_context_default();
-@@ -2319,8 +2319,8 @@ public static final int /*long*/ g_main_context_default() {
+@@ -2325,8 +2325,8 @@ public static final int /*long*/ g_main_context_default() {
}
}
/** @param context cast=(GMainContext *) */
@@ -16982,7 +17101,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_main_context_iteration(context, may_block);
-@@ -2329,8 +2329,8 @@ public static final boolean g_main_context_iteration(int /*long*/ context, boole
+@@ -2335,8 +2335,8 @@ public static final boolean g_main_context_iteration(int /*long*/ context, boole
}
}
/** @param context cast=(GMainContext *) */
@@ -16993,7 +17112,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_main_context_pending(context);
-@@ -2339,8 +2339,8 @@ public static final boolean g_main_context_pending(int /*long*/ context) {
+@@ -2345,8 +2345,8 @@ public static final boolean g_main_context_pending(int /*long*/ context) {
}
}
/** @param context cast=(GMainContext *) */
@@ -17004,7 +17123,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_main_context_get_poll_func(context);
-@@ -2349,8 +2349,8 @@ public static final int /*long*/ g_main_context_get_poll_func(int /*long*/ conte
+@@ -2355,8 +2355,8 @@ public static final int /*long*/ g_main_context_get_poll_func(int /*long*/ conte
}
}
/** @param context cast=(GMainContext *) */
@@ -17015,7 +17134,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_main_context_prepare(context, priority);
-@@ -2362,8 +2362,8 @@ public static final boolean g_main_context_prepare(int /*long*/ context, int[] p
+@@ -2368,8 +2368,8 @@ public static final boolean g_main_context_prepare(int /*long*/ context, int[] p
* @param context cast=(GMainContext *)
* @param fds cast=(GPollFD *)
*/
@@ -17026,7 +17145,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_main_context_query(context, max_priority, timeout_, fds, n_fds);
-@@ -2372,8 +2372,8 @@ public static final int g_main_context_query(int /*long*/ context, int max_prior
+@@ -2378,8 +2378,8 @@ public static final int g_main_context_query(int /*long*/ context, int max_prior
}
}
/** @param context cast=(GMainContext *) */
@@ -17037,7 +17156,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_main_context_release(context);
-@@ -2382,7 +2382,7 @@ public static final void g_main_context_release(int /*long*/ context) {
+@@ -2388,7 +2388,7 @@ public static final void g_main_context_release(int /*long*/ context) {
}
}
/** @param context cast=(GMainContext *) */
@@ -17046,7 +17165,7 @@ index 5306e6e..15bf432 100644
/**
* @param opsysstring cast=(const gchar *)
* @param len cast=(gssize)
-@@ -2390,8 +2390,8 @@ public static final native void g_main_context_wakeup(int /*long*/ context);
+@@ -2396,8 +2396,8 @@ public static final native void g_main_context_wakeup(int /*long*/ context);
* @param bytes_written cast=(gsize *)
* @param error cast=(GError **)
*/
@@ -17057,7 +17176,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_filename_to_utf8(opsysstring, len, bytes_read, bytes_written, error);
-@@ -2404,8 +2404,8 @@ public static final int /*long*/ g_filename_to_utf8(int /*long*/ opsysstring, in
+@@ -2410,8 +2410,8 @@ public static final int /*long*/ g_filename_to_utf8(int /*long*/ opsysstring, in
* @param hostname cast=(const char *)
* @param error cast=(GError **)
*/
@@ -17068,7 +17187,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_filename_to_uri(filename, hostname, error);
-@@ -2420,8 +2420,8 @@ public static final int /*long*/ g_filename_to_uri(int /*long*/ filename, int /*
+@@ -2426,8 +2426,8 @@ public static final int /*long*/ g_filename_to_uri(int /*long*/ filename, int /*
* @param bytes_written cast=(gsize *)
* @param error cast=(GError **)
*/
@@ -17079,7 +17198,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_filename_from_utf8(opsysstring, len, bytes_read, bytes_written, error);
-@@ -2434,8 +2434,8 @@ public static final int /*long*/ g_filename_from_utf8(int /*long*/ opsysstring,
+@@ -2440,8 +2440,8 @@ public static final int /*long*/ g_filename_from_utf8(int /*long*/ opsysstring,
* @param hostname cast=(char **)
* @param error cast=(GError **)
*/
@@ -17090,7 +17209,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_filename_from_uri(uri, hostname, error);
-@@ -2444,8 +2444,8 @@ public static final int /*long*/ g_filename_from_uri(int /*long*/ uri, int /*lon
+@@ -2450,8 +2450,8 @@ public static final int /*long*/ g_filename_from_uri(int /*long*/ uri, int /*lon
}
}
/** @param mem cast=(gpointer) */
@@ -17101,7 +17220,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_free(mem);
-@@ -2457,8 +2457,8 @@ public static final void g_free(int /*long*/ mem) {
+@@ -2463,8 +2463,8 @@ public static final void g_free(int /*long*/ mem) {
* @param function cast=(GSourceFunc)
* @param data cast=(gpointer)
*/
@@ -17112,7 +17231,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_idle_add(function, data);
-@@ -2470,8 +2470,8 @@ public static final int g_idle_add(int /*long*/ function, int /*long*/ data) {
+@@ -2476,8 +2476,8 @@ public static final int g_idle_add(int /*long*/ function, int /*long*/ data) {
* @param list cast=(GList *)
* @param data cast=(gpointer)
*/
@@ -17123,7 +17242,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_list_append(list, data);
-@@ -2480,8 +2480,8 @@ public static final int /*long*/ g_list_append(int /*long*/ list, int /*long*/ d
+@@ -2486,8 +2486,8 @@ public static final int /*long*/ g_list_append(int /*long*/ list, int /*long*/ d
}
}
/** @param list cast=(GList *) */
@@ -17134,7 +17253,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_list_data(list);
-@@ -2490,8 +2490,8 @@ public static final int /*long*/ g_list_data(int /*long*/ list) {
+@@ -2496,8 +2496,8 @@ public static final int /*long*/ g_list_data(int /*long*/ list) {
}
}
/** @param list cast=(GList *) */
@@ -17145,7 +17264,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_list_free(list);
-@@ -2500,8 +2500,8 @@ public static final void g_list_free(int /*long*/ list) {
+@@ -2506,8 +2506,8 @@ public static final void g_list_free(int /*long*/ list) {
}
}
/** @param list cast=(GList *) */
@@ -17156,7 +17275,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_list_free_1(list);
-@@ -2512,8 +2512,8 @@ public static final void g_list_free_1(int /*long*/ list) {
+@@ -2518,8 +2518,8 @@ public static final void g_list_free_1(int /*long*/ list) {
/**
* @param list cast=(GList *)
*/
@@ -17167,7 +17286,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_list_last(list);
-@@ -2522,8 +2522,8 @@ public static final int /*long*/ g_list_last(int /*long*/ list) {
+@@ -2528,8 +2528,8 @@ public static final int /*long*/ g_list_last(int /*long*/ list) {
}
}
/** @param list cast=(GList *) */
@@ -17178,7 +17297,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_list_length(list);
-@@ -2535,8 +2535,8 @@ public static final int g_list_length(int /*long*/ list) {
+@@ -2541,8 +2541,8 @@ public static final int g_list_length(int /*long*/ list) {
* @param list cast=(GList *)
* @param llist cast=(GList *)
*/
@@ -17189,7 +17308,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_list_set_next(list, llist);
-@@ -2544,8 +2544,8 @@ public static final void g_list_set_next(int /*long*/ list, int /*long*/ llist)
+@@ -2550,8 +2550,8 @@ public static final void g_list_set_next(int /*long*/ list, int /*long*/ llist)
lock.unlock();
}
}
@@ -17200,7 +17319,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_list_next(list);
-@@ -2557,8 +2557,8 @@ public static final int /*long*/ g_list_next(int /*long*/ list) {
+@@ -2563,8 +2563,8 @@ public static final int /*long*/ g_list_next(int /*long*/ list) {
* @param list cast=(GList *)
* @param n cast=(guint)
*/
@@ -17211,7 +17330,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_list_nth(list, n);
-@@ -2570,8 +2570,8 @@ public static final int /*long*/ g_list_nth(int /*long*/ list, int n) {
+@@ -2576,8 +2576,8 @@ public static final int /*long*/ g_list_nth(int /*long*/ list, int n) {
* @param list cast=(GList *)
* @param n cast=(guint)
*/
@@ -17222,7 +17341,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_list_nth_data(list, n);
-@@ -2583,8 +2583,8 @@ public static final int /*long*/ g_list_nth_data(int /*long*/ list, int n) {
+@@ -2589,8 +2589,8 @@ public static final int /*long*/ g_list_nth_data(int /*long*/ list, int n) {
* @param list cast=(GList *)
* @param data cast=(gpointer)
*/
@@ -17233,7 +17352,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_list_prepend(list, data);
-@@ -2596,8 +2596,8 @@ public static final int /*long*/ g_list_prepend(int /*long*/ list, int /*long*/
+@@ -2602,8 +2602,8 @@ public static final int /*long*/ g_list_prepend(int /*long*/ list, int /*long*/
* @param list cast=(GList *)
* @param llist cast=(GList *)
*/
@@ -17244,7 +17363,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_list_set_previous(list, llist);
-@@ -2605,8 +2605,8 @@ public static final void g_list_set_previous(int /*long*/ list, int /*long*/ lli
+@@ -2611,8 +2611,8 @@ public static final void g_list_set_previous(int /*long*/ list, int /*long*/ lli
lock.unlock();
}
}
@@ -17255,7 +17374,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_list_previous(list);
-@@ -2618,8 +2618,8 @@ public static final int /*long*/ g_list_previous(int /*long*/ list) {
+@@ -2624,8 +2624,8 @@ public static final int /*long*/ g_list_previous(int /*long*/ list) {
* @param list cast=(GList *)
* @param link cast=(GList *)
*/
@@ -17266,7 +17385,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_list_remove_link(list, link);
-@@ -2628,8 +2628,8 @@ public static final int /*long*/ g_list_remove_link(int /*long*/ list, int /*lon
+@@ -2634,8 +2634,8 @@ public static final int /*long*/ g_list_remove_link(int /*long*/ list, int /*lon
}
}
/** @param list cast=(GList *) */
@@ -17277,7 +17396,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_list_reverse(list);
-@@ -2644,8 +2644,8 @@ public static final int /*long*/ g_list_reverse(int /*long*/ list) {
+@@ -2650,8 +2650,8 @@ public static final int /*long*/ g_list_reverse(int /*long*/ list) {
* @param bytes_written cast=(gsize *)
* @param error cast=(GError **)
*/
@@ -17288,7 +17407,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_locale_from_utf8(utf8string, len, bytes_read, bytes_written, error);
-@@ -2660,8 +2660,8 @@ public static final int /*long*/ g_locale_from_utf8(int /*long*/ utf8string, int
+@@ -2666,8 +2666,8 @@ public static final int /*long*/ g_locale_from_utf8(int /*long*/ utf8string, int
* @param bytes_written cast=(gsize *)
* @param error cast=(GError **)
*/
@@ -17299,7 +17418,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_locale_to_utf8(opsysstring, len, bytes_read, bytes_written, error);
-@@ -2675,8 +2675,8 @@ public static final int /*long*/ g_locale_to_utf8(int /*long*/ opsysstring, int
+@@ -2681,8 +2681,8 @@ public static final int /*long*/ g_locale_to_utf8(int /*long*/ opsysstring, int
* @param message cast=(gchar *)
* @param unused_data cast=(gpointer)
*/
@@ -17310,7 +17429,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_log_default_handler(log_domain, log_levels, message, unused_data);
-@@ -2703,8 +2703,8 @@ public static final void g_log_remove_handler(byte[] log_domain, int handler_id)
+@@ -2709,8 +2709,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)
*/
@@ -17321,7 +17440,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_log_set_handler(log_domain, log_levels, log_func, user_data);
-@@ -2713,8 +2713,8 @@ public static final int g_log_set_handler(byte[] log_domain, int log_levels, int
+@@ -2719,8 +2719,8 @@ public static final int g_log_set_handler(byte[] log_domain, int log_levels, int
}
}
/** @param size cast=(gulong) */
@@ -17332,7 +17451,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_malloc(size);
-@@ -2727,8 +2727,8 @@ public static final int /*long*/ g_malloc(int /*long*/ size) {
+@@ -2733,8 +2733,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
*/
@@ -17343,7 +17462,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_object_get(object, first_property_name, value, terminator);
-@@ -2741,8 +2741,8 @@ public static final void g_object_get(int /*long*/ object, byte[] first_property
+@@ -2747,8 +2747,8 @@ public static final void g_object_get(int /*long*/ object, byte[] first_property
* @param first_property_name cast=(const gchar *),flags=no_out
* @param terminator cast=(const gchar *),flags=sentinel
*/
@@ -17354,7 +17473,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_object_get(object, first_property_name, value, terminator);
-@@ -2754,8 +2754,8 @@ public static final void g_object_get(int /*long*/ object, byte[] first_property
+@@ -2760,8 +2760,8 @@ public static final void g_object_get(int /*long*/ object, byte[] first_property
* @param object cast=(GObject *)
* @param quark cast=(GQuark)
*/
@@ -17365,7 +17484,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_object_get_qdata(object, quark);
-@@ -2767,8 +2767,8 @@ public static final int /*long*/ g_object_get_qdata(int /*long*/ object, int qua
+@@ -2773,8 +2773,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 *)
*/
@@ -17376,7 +17495,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_object_new(type, first_property_name);
-@@ -2780,8 +2780,8 @@ public static final int /*long*/ g_object_new (int /*long*/ type, int /*long*/ f
+@@ -2786,8 +2786,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 *)
*/
@@ -17387,7 +17506,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_object_notify(object, property_name);
-@@ -2790,8 +2790,8 @@ public static final void g_object_notify (int /*long*/ object, byte[] property_n
+@@ -2796,8 +2796,8 @@ public static final void g_object_notify (int /*long*/ object, byte[] property_n
}
}
/** @param object cast=(gpointer) */
@@ -17398,7 +17517,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_object_ref(object);
-@@ -2804,8 +2804,8 @@ public static final int /*long*/ g_object_ref(int /*long*/ object) {
+@@ -2810,8 +2810,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
*/
@@ -17409,7 +17528,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2818,8 +2818,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
+@@ -2824,8 +2824,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
*/
@@ -17420,7 +17539,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2832,8 +2832,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
+@@ -2838,8 +2838,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
*/
@@ -17431,7 +17550,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2846,8 +2846,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
+@@ -2852,8 +2852,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
*/
@@ -17442,7 +17561,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2860,8 +2860,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
+@@ -2866,8 +2866,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
*/
@@ -17453,7 +17572,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2874,8 +2874,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
+@@ -2880,8 +2880,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
*/
@@ -17464,7 +17583,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2888,8 +2888,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
+@@ -2894,8 +2894,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
* @param quark cast=(GQuark)
* @param data cast=(gpointer)
*/
@@ -17475,7 +17594,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_object_set_qdata(object, quark, data);
-@@ -2898,8 +2898,8 @@ public static final void g_object_set_qdata(int /*long*/ object, int quark, int
+@@ -2904,8 +2904,8 @@ public static final void g_object_set_qdata(int /*long*/ object, int quark, int
}
}
/** @param object cast=(gpointer) */
@@ -17486,7 +17605,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_object_unref(object);
-@@ -2933,8 +2933,8 @@ public static final void g_set_prgname(byte[] prgname) {
+@@ -2939,8 +2939,8 @@ public static final void g_set_prgname(byte[] prgname) {
* @param proc cast=(GCallback)
* @param data cast=(gpointer)
*/
@@ -17497,7 +17616,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_signal_connect(instance, detailed_signal, proc, data);
-@@ -2948,8 +2948,8 @@ public static final int g_signal_connect(int /*long*/ instance, byte[] detailed_
+@@ -2954,8 +2954,8 @@ public static final int g_signal_connect(int /*long*/ instance, byte[] detailed_
* @param closure cast=(GClosure *)
* @param after cast=(gboolean)
*/
@@ -17508,7 +17627,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_signal_connect_closure(instance, detailed_signal, closure, after);
-@@ -2964,8 +2964,8 @@ public static final int g_signal_connect_closure(int /*long*/ instance, byte[] d
+@@ -2970,8 +2970,8 @@ public static final int g_signal_connect_closure(int /*long*/ instance, byte[] d
* @param closure cast=(GClosure *)
* @param after cast=(gboolean)
*/
@@ -17519,7 +17638,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_signal_connect_closure_by_id(instance, signal_id, detail, closure, after);
-@@ -2979,8 +2979,8 @@ public static final int g_signal_connect_closure_by_id(int /*long*/ instance, in
+@@ -2985,8 +2985,8 @@ public static final int g_signal_connect_closure_by_id(int /*long*/ instance, in
* @param proc cast=(GCallback)
* @param data cast=(gpointer)
*/
@@ -17530,7 +17649,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_signal_connect_after(instance, detailed_signal, proc, data);
-@@ -2992,8 +2992,8 @@ public static final int g_signal_connect_after(int /*long*/ instance, byte[] det
+@@ -2998,8 +2998,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
*/
@@ -17541,7 +17660,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal);
-@@ -3005,8 +3005,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
+@@ -3011,8 +3011,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
*/
@@ -17552,7 +17671,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data);
-@@ -3018,8 +3018,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
+@@ -3024,8 +3024,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
*/
@@ -17563,7 +17682,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data);
-@@ -3031,8 +3031,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
+@@ -3037,8 +3037,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
*/
@@ -17574,7 +17693,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data1, data2);
-@@ -3044,8 +3044,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
+@@ -3050,8 +3050,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
*/
@@ -17585,7 +17704,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data);
-@@ -3057,8 +3057,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
+@@ -3063,8 +3063,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
* @param instance cast=(gpointer)
* @param handler_id cast=(gulong)
*/
@@ -17596,7 +17715,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_signal_handler_disconnect(instance, handler_id);
-@@ -3073,8 +3073,8 @@ public static final void g_signal_handler_disconnect(int /*long*/ instance, int
+@@ -3079,8 +3079,8 @@ public static final void g_signal_handler_disconnect(int /*long*/ instance, int
* @param func cast=(gpointer)
* @param data cast=(gpointer)
*/
@@ -17607,7 +17726,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_signal_handler_find(instance, mask, signal_id, detail, closure, func, data);
-@@ -3091,8 +3091,8 @@ public static final int g_signal_handler_find(int /*long*/ instance, int mask, i
+@@ -3097,8 +3097,8 @@ public static final int g_signal_handler_find(int /*long*/ instance, int mask, i
* @param func cast=(gpointer)
* @param data cast=(gpointer)
*/
@@ -17618,7 +17737,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_signal_handlers_block_matched(instance, mask, signal_id, detail, closure, func, data);
-@@ -3109,8 +3109,8 @@ public static final int g_signal_handlers_block_matched(int /*long*/ instance, i
+@@ -3115,8 +3115,8 @@ public static final int g_signal_handlers_block_matched(int /*long*/ instance, i
* @param func cast=(gpointer)
* @param data cast=(gpointer)
*/
@@ -17629,7 +17748,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_signal_handlers_disconnect_matched(instance, mask, signal_id, detail, closure, func, data);
-@@ -3127,8 +3127,8 @@ public static final int g_signal_handlers_disconnect_matched(int /*long*/ instan
+@@ -3133,8 +3133,8 @@ public static final int g_signal_handlers_disconnect_matched(int /*long*/ instan
* @param func cast=(gpointer)
* @param data cast=(gpointer)
*/
@@ -17640,7 +17759,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_signal_handlers_unblock_matched(instance, mask, signal_id, detail, closure, func, data);
-@@ -3137,8 +3137,8 @@ public static final int g_signal_handlers_unblock_matched(int /*long*/ instance,
+@@ -3143,8 +3143,8 @@ public static final int g_signal_handlers_unblock_matched(int /*long*/ instance,
}
}
/** @param name cast=(const gchar *),flags=no_out */
@@ -17651,7 +17770,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_signal_lookup(name, itype);
-@@ -3150,8 +3150,8 @@ public static final int g_signal_lookup (byte[] name, int /*long*/ itype) {
+@@ -3156,8 +3156,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
*/
@@ -17662,7 +17781,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_signal_stop_emission_by_name(instance, detailed_signal);
-@@ -3160,8 +3160,8 @@ public static final void g_signal_stop_emission_by_name(int /*long*/ instance, b
+@@ -3166,8 +3166,8 @@ public static final void g_signal_stop_emission_by_name(int /*long*/ instance, b
}
}
/** @param tag cast=(guint) */
@@ -17673,7 +17792,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_source_remove(tag);
-@@ -3173,8 +3173,8 @@ public static final boolean /*long*/ g_source_remove (int /*long*/ tag) {
+@@ -3179,8 +3179,8 @@ public static final boolean /*long*/ g_source_remove (int /*long*/ tag) {
* @param list cast=(GSList *)
* @param data cast=(gpointer)
*/
@@ -17684,7 +17803,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_slist_append(list, data);
-@@ -3183,8 +3183,8 @@ public static final int /*long*/ g_slist_append(int /*long*/ list, int /*long*/
+@@ -3189,8 +3189,8 @@ public static final int /*long*/ g_slist_append(int /*long*/ list, int /*long*/
}
}
/** @param list cast=(GSList *) */
@@ -17695,7 +17814,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_slist_data(list);
-@@ -3193,8 +3193,8 @@ public static final int /*long*/ g_slist_data (int /*long*/ list) {
+@@ -3199,8 +3199,8 @@ public static final int /*long*/ g_slist_data (int /*long*/ list) {
}
}
/** @param list cast=(GSList *) */
@@ -17706,7 +17825,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_slist_free(list);
-@@ -3203,8 +3203,8 @@ public static final void g_slist_free (int /*long*/ list) {
+@@ -3209,8 +3209,8 @@ public static final void g_slist_free (int /*long*/ list) {
}
}
/** @param list cast=(GSList *) */
@@ -17717,7 +17836,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_slist_next(list);
-@@ -3213,8 +3213,8 @@ public static final int /*long*/ g_slist_next (int /*long*/ list) {
+@@ -3219,8 +3219,8 @@ public static final int /*long*/ g_slist_next (int /*long*/ list) {
}
}
/** @param list cast=(GSList *) */
@@ -17728,7 +17847,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_slist_length(list);
-@@ -3223,8 +3223,8 @@ public static final int g_slist_length (int /*long*/ list) {
+@@ -3229,8 +3229,8 @@ public static final int g_slist_length (int /*long*/ list) {
}
}
/** @param string_array cast=(gchar **) */
@@ -17739,7 +17858,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_strfreev(string_array);
-@@ -3236,8 +3236,8 @@ public static final void g_strfreev(int /*long*/ string_array) {
+@@ -3242,8 +3242,8 @@ public static final void g_strfreev(int /*long*/ string_array) {
* @method flags=getter
* @param string cast=(GString *)
*/
@@ -17750,7 +17869,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GString_len(string);
-@@ -3249,8 +3249,8 @@ public static final int GString_len(int /*long*/ string) {
+@@ -3255,8 +3255,8 @@ public static final int GString_len(int /*long*/ string) {
* @method flags=getter
* @param string cast=(GString *)
*/
@@ -17761,7 +17880,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _GString_str(string);
-@@ -3262,8 +3262,8 @@ public static final int /*long*/ GString_str(int /*long*/ string) {
+@@ -3268,8 +3268,8 @@ public static final int /*long*/ GString_str(int /*long*/ string) {
* @param str cast=(const gchar *)
* @param endptr cast=(gchar **)
*/
@@ -17772,7 +17891,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_strtod(str, endptr);
-@@ -3276,8 +3276,8 @@ public static final double g_strtod(int /*long*/ str, int /*long*/[] endptr) {
+@@ -3282,8 +3282,8 @@ public static final double g_strtod(int /*long*/ str, int /*long*/[] endptr) {
* @param interface_type cast=(GType)
* @param info cast=(const GInterfaceInfo *)
*/
@@ -17783,7 +17902,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_type_add_interface_static(instance_type, interface_type, info);
-@@ -3286,8 +3286,8 @@ public static final void g_type_add_interface_static (int /*long*/ instance_type
+@@ -3292,8 +3292,8 @@ public static final void g_type_add_interface_static (int /*long*/ instance_type
}
}
/** @param g_class cast=(GType) */
@@ -17794,7 +17913,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_type_class_peek(g_class);
-@@ -3296,8 +3296,8 @@ public static final int /*long*/ g_type_class_peek (int /*long*/ g_class) {
+@@ -3302,8 +3302,8 @@ public static final int /*long*/ g_type_class_peek (int /*long*/ g_class) {
}
}
/** @param g_class cast=(gpointer) */
@@ -17805,7 +17924,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_type_class_peek_parent(g_class);
-@@ -3306,8 +3306,8 @@ public static final int /*long*/ g_type_class_peek_parent (int /*long*/ g_class)
+@@ -3312,8 +3312,8 @@ public static final int /*long*/ g_type_class_peek_parent (int /*long*/ g_class)
}
}
/** @param g_class cast=(GType) */
@@ -17816,7 +17935,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_type_class_ref(g_class);
-@@ -3316,8 +3316,8 @@ public static final int /*long*/ g_type_class_ref (int /*long*/ g_class) {
+@@ -3322,8 +3322,8 @@ public static final int /*long*/ g_type_class_ref (int /*long*/ g_class) {
}
}
/** @param g_class cast=(gpointer) */
@@ -17827,7 +17946,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_type_class_unref(g_class);
-@@ -3326,8 +3326,8 @@ public static final void g_type_class_unref (int /*long*/ g_class) {
+@@ -3332,8 +3332,8 @@ public static final void g_type_class_unref (int /*long*/ g_class) {
}
}
/** @param name cast=(const gchar *) */
@@ -17838,7 +17957,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_type_from_name(name);
-@@ -3336,8 +3336,8 @@ public static final int /*long*/ g_type_from_name (byte[] name) {
+@@ -3342,8 +3342,8 @@ public static final int /*long*/ g_type_from_name (byte[] name) {
}
}
/** @param iface cast=(gpointer) */
@@ -17849,7 +17968,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_type_interface_peek_parent(iface);
-@@ -3349,8 +3349,8 @@ public static final int /*long*/ g_type_interface_peek_parent (int /*long*/ ifac
+@@ -3355,8 +3355,8 @@ public static final int /*long*/ g_type_interface_peek_parent (int /*long*/ ifac
* @param type cast=(GType)
* @param is_a_type cast=(GType)
*/
@@ -17860,7 +17979,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_type_is_a(type, is_a_type);
-@@ -3359,8 +3359,8 @@ public static final boolean g_type_is_a (int /*long*/ type, int /*long*/ is_a_ty
+@@ -3365,8 +3365,8 @@ public static final boolean g_type_is_a (int /*long*/ type, int /*long*/ is_a_ty
}
}
/** @param handle cast=(GType) */
@@ -17871,7 +17990,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_type_name(handle);
-@@ -3369,8 +3369,8 @@ public static final int /*long*/ g_type_name (int /*long*/ handle) {
+@@ -3375,8 +3375,8 @@ public static final int /*long*/ g_type_name (int /*long*/ handle) {
}
}
/** @param type cast=(GType) */
@@ -17882,7 +18001,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_type_parent(type);
-@@ -3382,8 +3382,8 @@ public static final int /*long*/ g_type_parent (int /*long*/ type) {
+@@ -3388,8 +3388,8 @@ public static final int /*long*/ g_type_parent (int /*long*/ type) {
* @param type cast=(GType)
* @param query cast=(GTypeQuery *)
*/
@@ -17893,7 +18012,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_type_query(type, query);
-@@ -3397,8 +3397,8 @@ public static final void g_type_query (int /*long*/ type, int /*long*/ query) {
+@@ -3403,8 +3403,8 @@ public static final void g_type_query (int /*long*/ type, int /*long*/ query) {
* @param info cast=(const GTypeInfo *)
* @param flags cast=(GTypeFlags)
*/
@@ -17904,7 +18023,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_type_register_static(parent_type, type_name, info, flags);
-@@ -3407,8 +3407,8 @@ public static final int /*long*/ g_type_register_static (int /*long*/ parent_typ
+@@ -3413,8 +3413,8 @@ public static final int /*long*/ g_type_register_static (int /*long*/ parent_typ
}
}
/** @param vtable cast=(GThreadFunctions *) */
@@ -17915,7 +18034,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_g_thread_init(vtable);
-@@ -3432,8 +3432,8 @@ public static final boolean g_thread_supported() {
+@@ -3438,8 +3438,8 @@ public static final boolean g_thread_supported() {
* @param items_written cast=(glong *),flags=critical
* @param error cast=(GError **),flags=critical
*/
@@ -17926,7 +18045,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_utf16_to_utf8(str, len, items_read, items_written, error);
-@@ -3442,8 +3442,8 @@ public static final int /*long*/ g_utf16_to_utf8(char[] str, int /*long*/ len, i
+@@ -3448,8 +3448,8 @@ public static final int /*long*/ g_utf16_to_utf8(char[] str, int /*long*/ len, i
}
}
/** @param str cast=(const gchar *) */
@@ -17937,7 +18056,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_utf8_offset_to_pointer(str, offset);
-@@ -3455,8 +3455,8 @@ public static final int /*long*/ g_utf8_offset_to_pointer(int /*long*/ str, int
+@@ -3461,8 +3461,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 *)
*/
@@ -17948,7 +18067,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_utf8_pointer_to_offset(str, pos);
-@@ -3465,8 +3465,8 @@ public static final int /*long*/ g_utf8_pointer_to_offset(int /*long*/ str, int
+@@ -3471,8 +3471,8 @@ public static final int /*long*/ g_utf8_pointer_to_offset(int /*long*/ str, int
}
}
/** @param str cast=(const gchar *) */
@@ -17959,7 +18078,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_utf16_offset_to_pointer(str, offset);
-@@ -3478,8 +3478,8 @@ public static final int /*long*/ g_utf16_offset_to_pointer(int /*long*/ str, int
+@@ -3484,8 +3484,8 @@ public static final int /*long*/ g_utf16_offset_to_pointer(int /*long*/ str, int
* @param str cast=(const gchar *)
* @param pos cast=(const gchar *)
*/
@@ -17970,7 +18089,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_utf16_pointer_to_offset(str, pos);
-@@ -3488,8 +3488,8 @@ public static final int /*long*/ g_utf16_pointer_to_offset(int /*long*/ str, int
+@@ -3494,8 +3494,8 @@ public static final int /*long*/ g_utf16_pointer_to_offset(int /*long*/ str, int
}
}
/** @param str cast=(const gchar *) */
@@ -17981,7 +18100,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_utf16_strlen(str, max);
-@@ -3498,8 +3498,8 @@ public static final int /*long*/ g_utf16_strlen(int /*long*/ str, int /*long*/ m
+@@ -3504,8 +3504,8 @@ public static final int /*long*/ g_utf16_strlen(int /*long*/ str, int /*long*/ m
}
}
/** @param str cast=(const gchar *) */
@@ -17992,7 +18111,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_utf8_offset_to_utf16_offset(str, offset);
-@@ -3508,8 +3508,8 @@ public static final int /*long*/ g_utf8_offset_to_utf16_offset(int /*long*/ str,
+@@ -3514,8 +3514,8 @@ public static final int /*long*/ g_utf8_offset_to_utf16_offset(int /*long*/ str,
}
}
/** @param str cast=(const gchar *) */
@@ -18003,7 +18122,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_utf16_offset_to_utf8_offset(str, offset);
-@@ -3518,8 +3518,8 @@ public static final int /*long*/ g_utf16_offset_to_utf8_offset(int /*long*/ str,
+@@ -3524,8 +3524,8 @@ public static final int /*long*/ g_utf16_offset_to_utf8_offset(int /*long*/ str,
}
}
/** @param str cast=(const gchar *) */
@@ -18014,7 +18133,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_utf8_strlen(str, max);
-@@ -3534,8 +3534,8 @@ public static final int /*long*/ g_utf8_strlen(int /*long*/ str, int /*long*/ ma
+@@ -3540,8 +3540,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
*/
@@ -18025,7 +18144,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_utf8_to_utf16(str, len, items_read, items_written, error);
-@@ -3550,8 +3550,8 @@ public static final int /*long*/ g_utf8_to_utf16(byte[] str, int /*long*/ len, i
+@@ -3556,8 +3556,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
*/
@@ -18036,7 +18155,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_utf8_to_utf16(str, len, items_read, items_written, error);
-@@ -3563,28 +3563,28 @@ public static final int /*long*/ g_utf8_to_utf16(int /*long*/ str, int /*long*/
+@@ -3569,28 +3569,28 @@ public static final int /*long*/ g_utf8_to_utf16(int /*long*/ str, int /*long*/
* @param value cast=(GValue *)
* @param type cast=(GType)
*/
@@ -18077,7 +18196,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_value_peek_pointer(value);
-@@ -3593,8 +3593,8 @@ public static final int /*long*/ g_value_peek_pointer (int /*long*/ value) {
+@@ -3599,8 +3599,8 @@ public static final int /*long*/ g_value_peek_pointer (int /*long*/ value) {
}
}
/** @param atom_name cast=(const gchar *),flags=no_out critical */
@@ -18088,7 +18207,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_atom_intern(atom_name, only_if_exists);
-@@ -3603,8 +3603,8 @@ public static final int /*long*/ gdk_atom_intern(byte[] atom_name, boolean only_
+@@ -3609,8 +3609,8 @@ public static final int /*long*/ gdk_atom_intern(byte[] atom_name, boolean only_
}
}
/** @param atom cast=(GdkAtom) */
@@ -18099,7 +18218,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_atom_name(atom);
-@@ -3627,8 +3627,8 @@ public static final void gdk_beep() {
+@@ -3633,8 +3633,8 @@ public static final void gdk_beep() {
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -18110,7 +18229,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_bitmap_create_from_data(window, data, width, height);
-@@ -3637,8 +3637,8 @@ public static final int /*long*/ gdk_bitmap_create_from_data(int /*long*/ window
+@@ -3643,8 +3643,8 @@ public static final int /*long*/ gdk_bitmap_create_from_data(int /*long*/ window
}
}
/** @method flags=dynamic */
@@ -18121,7 +18240,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_cairo_create(drawable);
-@@ -3647,8 +3647,8 @@ public static final int /*long*/ gdk_cairo_create(int /*long*/ drawable) {
+@@ -3653,8 +3653,8 @@ public static final int /*long*/ gdk_cairo_create(int /*long*/ drawable) {
}
}
/** @method flags=dynamic */
@@ -18132,7 +18251,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_cairo_region(cairo, region);
-@@ -3657,8 +3657,8 @@ public static final void gdk_cairo_region(int /*long*/ cairo, int /*long*/ regio
+@@ -3663,8 +3663,8 @@ public static final void gdk_cairo_region(int /*long*/ cairo, int /*long*/ regio
}
}
/** @method flags=dynamic */
@@ -18143,7 +18262,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_cairo_reset_clip(cairo, drawable);
-@@ -3667,8 +3667,8 @@ public static final void gdk_cairo_reset_clip(int /*long*/ cairo, int /*long*/ d
+@@ -3673,8 +3673,8 @@ public static final void gdk_cairo_reset_clip(int /*long*/ cairo, int /*long*/ d
}
}
/** @method flags=dynamic */
@@ -18154,7 +18273,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_cairo_set_source_color(cairo, color);
-@@ -3680,8 +3680,8 @@ public static final void gdk_cairo_set_source_color(int /*long*/ cairo, GdkColor
+@@ -3686,8 +3686,8 @@ public static final void gdk_cairo_set_source_color(int /*long*/ cairo, GdkColor
* @method flags=dynamic
* @param window cast=(GdkWindow *)
*/
@@ -18165,7 +18284,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_cairo_set_source_window(cairo, window, x, y);
-@@ -3691,8 +3691,8 @@ public static final void gdk_cairo_set_source_window(int /*long*/ cairo, int /*l
+@@ -3697,8 +3697,8 @@ public static final void gdk_cairo_set_source_window(int /*long*/ cairo, int /*l
}
}
/** @param color cast=(GdkColor *) */
@@ -18176,7 +18295,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_color_free(color);
-@@ -3717,8 +3717,8 @@ public static final boolean gdk_color_parse(byte[] spec, GdkColor color) {
+@@ -3723,8 +3723,8 @@ public static final boolean gdk_color_parse(byte[] spec, GdkColor color) {
* @param colormap cast=(GdkColormap *)
* @param color cast=(GdkColor *),flags=no_in
*/
@@ -18187,7 +18306,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_color_white(colormap, color);
-@@ -3732,8 +3732,8 @@ public static final boolean gdk_color_white(int /*long*/ colormap, GdkColor colo
+@@ -3738,8 +3738,8 @@ public static final boolean gdk_color_white(int /*long*/ colormap, GdkColor colo
* @param writeable cast=(gboolean)
* @param best_match cast=(gboolean)
*/
@@ -18198,7 +18317,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_colormap_alloc_color(colormap, color, writeable, best_match);
-@@ -3746,8 +3746,8 @@ public static final boolean gdk_colormap_alloc_color(int /*long*/ colormap, GdkC
+@@ -3752,8 +3752,8 @@ public static final boolean gdk_colormap_alloc_color(int /*long*/ colormap, GdkC
* @param colors cast=(GdkColor *),flags=no_out
* @param ncolors cast=(gint)
*/
@@ -18209,7 +18328,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_colormap_free_colors(colormap, colors, ncolors);
-@@ -3755,8 +3755,8 @@ public static final void gdk_colormap_free_colors(int /*long*/ colormap, GdkColo
+@@ -3761,8 +3761,8 @@ public static final void gdk_colormap_free_colors(int /*long*/ colormap, GdkColo
lock.unlock();
}
}
@@ -18220,7 +18339,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_colormap_get_system();
-@@ -3769,8 +3769,8 @@ public static final int /*long*/ gdk_colormap_get_system() {
+@@ -3775,8 +3775,8 @@ public static final int /*long*/ gdk_colormap_get_system() {
* @param pixel cast=(gulong)
* @param result cast=(GdkColor *)
*/
@@ -18231,18 +18350,18 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_colormap_query_color(colormap, pixel, result);
-@@ -3779,8 +3779,8 @@ public static final void gdk_colormap_query_color(int /*long*/ colormap, int /*l
+@@ -3785,8 +3785,8 @@ public static final void gdk_colormap_query_color(int /*long*/ colormap, int /*l
}
}
/** @param cursor cast=(GdkCursor *) */
--public static final native void _gdk_cursor_destroy(int /*long*/ cursor);
--public static final void gdk_cursor_destroy(int /*long*/ cursor) {
-+public static final native void _gdk_cursor_destroy(long /*int*/ cursor);
-+public static final void gdk_cursor_destroy(long /*int*/ cursor) {
+-public static final native void _gdk_cursor_unref(int /*long*/ cursor);
+-public static final void gdk_cursor_unref(int /*long*/ cursor) {
++public static final native void _gdk_cursor_unref(long /*int*/ cursor);
++public static final void gdk_cursor_unref(long /*int*/ cursor) {
lock.lock();
try {
- _gdk_cursor_destroy(cursor);
-@@ -3789,8 +3789,8 @@ public static final void gdk_cursor_destroy(int /*long*/ cursor) {
+ _gdk_cursor_unref(cursor);
+@@ -3795,8 +3795,8 @@ public static final void gdk_cursor_unref(int /*long*/ cursor) {
}
}
/** @param cursor_type cast=(GdkCursorType) */
@@ -18253,7 +18372,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_cursor_new(cursor_type);
-@@ -3806,8 +3806,8 @@ public static final int /*long*/ gdk_cursor_new(int /*long*/ cursor_type) {
+@@ -3812,8 +3812,8 @@ public static final int /*long*/ gdk_cursor_new(int /*long*/ cursor_type) {
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -18264,7 +18383,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_cursor_new_from_pixmap(source, mask, fg, bg, x, y);
-@@ -3816,8 +3816,8 @@ public static final int /*long*/ gdk_cursor_new_from_pixmap(int /*long*/ source,
+@@ -3822,8 +3822,8 @@ public static final int /*long*/ gdk_cursor_new_from_pixmap(int /*long*/ source,
}
}
/** @method flags=dynamic */
@@ -18275,7 +18394,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_cursor_new_from_pixbuf(display, pixbuf, x, y);
-@@ -3826,8 +3826,8 @@ public static final int /*long*/ gdk_cursor_new_from_pixbuf(int /*long*/ display
+@@ -3832,8 +3832,8 @@ public static final int /*long*/ gdk_cursor_new_from_pixbuf(int /*long*/ display
}
}
/** @method flags=dynamic */
@@ -18286,7 +18405,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_display_get_default();
-@@ -3836,8 +3836,8 @@ public static final int /*long*/ gdk_display_get_default() {
+@@ -3842,8 +3842,8 @@ public static final int /*long*/ gdk_display_get_default() {
}
}
/** @method flags=dynamic */
@@ -18297,7 +18416,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_display_supports_cursor_color(display);
-@@ -3850,8 +3850,8 @@ public static final boolean gdk_display_supports_cursor_color(int /*long*/ displ
+@@ -3856,8 +3856,8 @@ public static final boolean gdk_display_supports_cursor_color(int /*long*/ displ
* @param action cast=(GdkDragAction)
* @param time cast=(guint32)
*/
@@ -18308,7 +18427,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_drag_status(context, action, time);
-@@ -3870,8 +3870,8 @@ public static final void gdk_drag_status(int /*long*/ context, int action, int t
+@@ -3875,8 +3875,8 @@ public static final void gdk_drag_status(int /*long*/ context, int action, int t
* @param angle1 cast=(gint)
* @param angle2 cast=(gint)
*/
@@ -18319,7 +18438,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_draw_arc(drawable, gc, filled, x, y, width, height, angle1, angle2);
-@@ -3890,8 +3890,8 @@ public static final void gdk_draw_arc(int /*long*/ drawable, int /*long*/ gc, in
+@@ -3895,8 +3895,8 @@ public static final void gdk_draw_arc(int /*long*/ drawable, int /*long*/ gc, in
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -18330,7 +18449,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_draw_drawable(drawable, gc, src, xsrc, ysrc, xdest, ydest, width, height);
-@@ -3904,8 +3904,8 @@ public static final void gdk_draw_drawable(int /*long*/ drawable, int /*long*/ g
+@@ -3909,8 +3909,8 @@ public static final void gdk_draw_drawable(int /*long*/ drawable, int /*long*/ g
* @param gc cast=(GdkGC *)
* @param image cast=(GdkImage *)
*/
@@ -18341,7 +18460,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_draw_image(drawable, gc, image, xsrc, ysrc, xdest, ydest, width, height);
-@@ -3920,8 +3920,8 @@ public static final void gdk_draw_image(int /*long*/ drawable, int /*long*/ gc,
+@@ -3925,8 +3925,8 @@ public static final void gdk_draw_image(int /*long*/ drawable, int /*long*/ gc,
* @param y cast=(gint)
* @param layout cast=(PangoLayout *)
*/
@@ -18352,7 +18471,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_draw_layout(drawable, gc, x, y, layout);
-@@ -3938,8 +3938,8 @@ public static final void gdk_draw_layout(int /*long*/ drawable, int /*long*/ gc,
+@@ -3942,8 +3942,8 @@ public static final void gdk_draw_layout(int /*long*/ drawable, int /*long*/ gc,
* @param foreground flags=no_out
* @param background flags=no_out
*/
@@ -18363,7 +18482,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_draw_layout_with_colors(drawable, gc, x, y, layout, foreground, background);
-@@ -3955,8 +3955,8 @@ public static final void gdk_draw_layout_with_colors(int /*long*/ drawable, int
+@@ -3958,8 +3958,8 @@ public static final void gdk_draw_layout_with_colors(int /*long*/ drawable, int
* @param x2 cast=(gint)
* @param y2 cast=(gint)
*/
@@ -18374,7 +18493,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_draw_line(drawable, gc, x1, y1, x2, y2);
-@@ -3970,8 +3970,8 @@ public static final void gdk_draw_line(int /*long*/ drawable, int /*long*/ gc, i
+@@ -3972,8 +3972,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)
*/
@@ -18385,7 +18504,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_draw_lines(drawable, gc, points, npoints);
-@@ -3994,8 +3994,8 @@ public static final void gdk_draw_lines(int /*long*/ drawable, int /*long*/ gc,
+@@ -3996,8 +3996,8 @@ public static final void gdk_draw_lines(int /*long*/ drawable, int /*long*/ gc,
* @param x_dither cast=(gint)
* @param y_dither cast=(gint)
*/
@@ -18396,9 +18515,9 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_draw_pixbuf(drawable, gc, pixbuf, xsrc, ysrc, xdest, ydest, width, height, dither, x_dither, y_dither);
-@@ -4007,8 +4007,8 @@ public static final void gdk_draw_pixbuf(int /*long*/ drawable, int /*long*/ gc,
- * @param drawable cast=(GdkDrawable *)
- * @param gc cast=(GdkGC *)
+@@ -4008,8 +4008,8 @@ public static final void gdk_draw_pixbuf(int /*long*/ drawable, int /*long*/ gc,
+ /**
+ * @method flags=dynamic
*/
-public static final native void _gdk_draw_point(int /*long*/ drawable, int /*long*/ gc, int x, int y);
-public static final void gdk_draw_point(int /*long*/ drawable, int /*long*/ gc, int x, int y) {
@@ -18407,7 +18526,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_draw_point(drawable, gc, x, y);
-@@ -4023,8 +4023,8 @@ public static final void gdk_draw_point(int /*long*/ drawable, int /*long*/ gc,
+@@ -4024,8 +4024,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)
*/
@@ -18418,7 +18537,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_draw_polygon(drawable, gc, filled, points, npoints);
-@@ -4041,8 +4041,8 @@ public static final void gdk_draw_polygon(int /*long*/ drawable, int /*long*/ gc
+@@ -4042,8 +4042,8 @@ public static final void gdk_draw_polygon(int /*long*/ drawable, int /*long*/ gc
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -18429,7 +18548,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_draw_rectangle(drawable, gc, filled, x, y, width, height);
-@@ -4051,8 +4051,8 @@ public static final void gdk_draw_rectangle(int /*long*/ drawable, int /*long*/
+@@ -4052,8 +4052,8 @@ public static final void gdk_draw_rectangle(int /*long*/ drawable, int /*long*/
}
}
/** @param drawable cast=(GdkDrawable *) */
@@ -18440,7 +18559,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_drawable_get_depth(drawable);
-@@ -4068,8 +4068,8 @@ public static final int gdk_drawable_get_depth(int /*long*/ drawable) {
+@@ -4069,8 +4069,8 @@ public static final int gdk_drawable_get_depth(int /*long*/ drawable) {
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -18451,7 +18570,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_drawable_get_image(drawable, x, y, width, height);
-@@ -4082,8 +4082,8 @@ public static final int /*long*/ gdk_drawable_get_image(int /*long*/ drawable, i
+@@ -4083,8 +4083,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
*/
@@ -18462,7 +18581,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_drawable_get_size(drawable, width, height);
-@@ -4092,8 +4092,8 @@ public static final void gdk_drawable_get_size(int /*long*/ drawable, int[] widt
+@@ -4093,8 +4093,8 @@ public static final void gdk_drawable_get_size(int /*long*/ drawable, int[] widt
}
}
/** @param drawable cast=(GdkDrawable *) */
@@ -18473,7 +18592,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_drawable_get_visible_region(drawable);
-@@ -4102,8 +4102,8 @@ public static final int /*long*/ gdk_drawable_get_visible_region(int /*long*/ dr
+@@ -4103,8 +4103,8 @@ public static final int /*long*/ gdk_drawable_get_visible_region(int /*long*/ dr
}
}
/** @param event cast=(GdkEvent *) */
@@ -18484,7 +18603,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_event_copy(event);
-@@ -4112,8 +4112,8 @@ public static final int /*long*/ gdk_event_copy(int /*long*/ event) {
+@@ -4113,8 +4113,8 @@ public static final int /*long*/ gdk_event_copy(int /*long*/ event) {
}
}
/** @param event cast=(GdkEvent *) */
@@ -18495,7 +18614,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_event_free(event);
-@@ -4121,8 +4121,8 @@ public static final void gdk_event_free(int /*long*/ event) {
+@@ -4122,8 +4122,8 @@ public static final void gdk_event_free(int /*long*/ event) {
lock.unlock();
}
}
@@ -18506,7 +18625,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_event_get();
-@@ -4135,8 +4135,8 @@ public static final int /*long*/ gdk_event_get() {
+@@ -4136,8 +4136,8 @@ public static final int /*long*/ gdk_event_get() {
* @param px cast=(gdouble *)
* @param py cast=(gdouble *)
*/
@@ -18517,7 +18636,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_event_get_root_coords(event, px, py);
-@@ -4149,8 +4149,8 @@ public static final boolean gdk_event_get_root_coords(int /*long*/ event, double
+@@ -4150,8 +4150,8 @@ public static final boolean gdk_event_get_root_coords(int /*long*/ event, double
* @param px cast=(gdouble *)
* @param py cast=(gdouble *)
*/
@@ -18528,18 +18647,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_event_get_coords(event, px, py);
-@@ -4159,8 +4159,8 @@ public static final boolean gdk_event_get_coords(int /*long*/ event, double[] px
- }
- }
- /** @param window cast=(GdkWindow *) */
--public static final native int /*long*/ _gdk_event_get_graphics_expose(int /*long*/ window);
--public static final int /*long*/ gdk_event_get_graphics_expose(int /*long*/ window) {
-+public static final native long /*int*/ _gdk_event_get_graphics_expose(long /*int*/ window);
-+public static final long /*int*/ gdk_event_get_graphics_expose(long /*int*/ window) {
- lock.lock();
- try {
- return _gdk_event_get_graphics_expose(window);
-@@ -4172,8 +4172,8 @@ public static final int /*long*/ gdk_event_get_graphics_expose(int /*long*/ wind
+@@ -4163,8 +4163,8 @@ public static final boolean gdk_event_get_coords(int /*long*/ event, double[] px
* @param event cast=(GdkEvent *)
* @param pmod cast=(GdkModifierType *)
*/
@@ -18550,7 +18658,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_event_get_state(event, pmod);
-@@ -4182,8 +4182,8 @@ public static final boolean gdk_event_get_state(int /*long*/ event, int[] pmod)
+@@ -4173,8 +4173,8 @@ public static final boolean gdk_event_get_state(int /*long*/ event, int[] pmod)
}
}
/** @param event cast=(GdkEvent *) */
@@ -18561,7 +18669,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_event_get_time(event);
-@@ -4196,8 +4196,8 @@ public static final int gdk_event_get_time(int /*long*/ event) {
+@@ -4187,8 +4187,8 @@ public static final int gdk_event_get_time(int /*long*/ event) {
* @param data cast=(gpointer)
* @param notify cast=(GDestroyNotify)
*/
@@ -18572,7 +18680,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_event_handler_set(func, data, notify);
-@@ -4205,8 +4205,8 @@ public static final void gdk_event_handler_set(int /*long*/ func, int /*long*/ d
+@@ -4196,8 +4196,8 @@ public static final void gdk_event_handler_set(int /*long*/ func, int /*long*/ d
lock.unlock();
}
}
@@ -18583,7 +18691,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_event_new(type);
-@@ -4214,8 +4214,8 @@ public static final int /*long*/ gdk_event_new(int type) {
+@@ -4205,8 +4205,8 @@ public static final int /*long*/ gdk_event_new(int type) {
lock.unlock();
}
}
@@ -18594,7 +18702,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_event_peek();
-@@ -4224,8 +4224,8 @@ public static final int /*long*/ gdk_event_peek() {
+@@ -4215,8 +4215,8 @@ public static final int /*long*/ gdk_event_peek() {
}
}
/** @param event cast=(GdkEvent *) */
@@ -18605,7 +18713,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_event_put(event);
-@@ -4264,8 +4264,8 @@ public static final void gdk_flush() {
+@@ -4255,8 +4255,8 @@ public static final void gdk_flush() {
* @param gc cast=(GdkGC *)
* @param values cast=(GdkGCValues *),flags=no_in
*/
@@ -18616,7 +18724,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_gc_get_values(gc, values);
-@@ -4274,8 +4274,8 @@ public static final void gdk_gc_get_values(int /*long*/ gc, GdkGCValues values)
+@@ -4265,8 +4265,8 @@ public static final void gdk_gc_get_values(int /*long*/ gc, GdkGCValues values)
}
}
/** @param window cast=(GdkDrawable *) */
@@ -18627,8 +18735,8 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_gc_new(window);
-@@ -4287,8 +4287,8 @@ public static final int /*long*/ gdk_gc_new(int /*long*/ window) {
- * @param gc cast=(GdkGC *)
+@@ -4278,8 +4278,8 @@ public static final int /*long*/ gdk_gc_new(int /*long*/ window) {
+ * @method flags=dynamic
* @param color cast=(GdkColor *),flags=no_out
*/
-public static final native void _gdk_gc_set_background(int /*long*/ gc, GdkColor color);
@@ -18638,9 +18746,9 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_gc_set_background(gc, color);
-@@ -4300,8 +4300,8 @@ public static final void gdk_gc_set_background(int /*long*/ gc, GdkColor color)
- * @param gc cast=(GdkGC *)
- * @param mask cast=(GdkBitmap *)
+@@ -4290,8 +4290,8 @@ public static final void gdk_gc_set_background(int /*long*/ gc, GdkColor color)
+ /**
+ * @method flags=dynamic
*/
-public static final native void _gdk_gc_set_clip_mask(int /*long*/ gc, int /*long*/ mask);
-public static final void gdk_gc_set_clip_mask(int /*long*/ gc, int /*long*/ mask) {
@@ -18649,7 +18757,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_gc_set_clip_mask(gc, mask);
-@@ -4314,8 +4314,8 @@ public static final void gdk_gc_set_clip_mask(int /*long*/ gc, int /*long*/ mask
+@@ -4304,8 +4304,8 @@ public static final void gdk_gc_set_clip_mask(int /*long*/ gc, int /*long*/ mask
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -18660,18 +18768,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_gc_set_clip_origin(gc, x, y);
-@@ -4327,8 +4327,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
- */
--public static final native void _gdk_gc_set_clip_rectangle(int /*long*/ gc, GdkRectangle rectangle);
--public static final void gdk_gc_set_clip_rectangle(int /*long*/ gc, GdkRectangle rectangle) {
-+public static final native void _gdk_gc_set_clip_rectangle(long /*int*/ gc, GdkRectangle rectangle);
-+public static final void gdk_gc_set_clip_rectangle(long /*int*/ gc, GdkRectangle rectangle) {
- lock.lock();
- try {
- _gdk_gc_set_clip_rectangle(gc, rectangle);
-@@ -4340,8 +4340,8 @@ public static final void gdk_gc_set_clip_rectangle(int /*long*/ gc, GdkRectangle
+@@ -4317,8 +4317,8 @@ public static final void gdk_gc_set_clip_origin(int /*long*/ gc, int x, int y) {
* @param gc cast=(GdkGC *)
* @param region cast=(GdkRegion *)
*/
@@ -18682,7 +18779,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_gc_set_clip_region(gc, region);
-@@ -4355,8 +4355,8 @@ public static final void gdk_gc_set_clip_region(int /*long*/ gc, int /*long*/ re
+@@ -4332,8 +4332,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)
*/
@@ -18693,7 +18790,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_gc_set_dashes(gc, dash_offset, dash_list, n);
-@@ -4368,8 +4368,8 @@ public static final void gdk_gc_set_dashes(int /*long*/ gc, int dash_offset, byt
+@@ -4345,8 +4345,8 @@ public static final void gdk_gc_set_dashes(int /*long*/ gc, int dash_offset, byt
* @param gc cast=(GdkGC *)
* @param exposures cast=(gboolean)
*/
@@ -18704,7 +18801,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_gc_set_exposures(gc, exposures);
-@@ -4381,8 +4381,8 @@ public static final void gdk_gc_set_exposures(int /*long*/ gc, boolean exposures
+@@ -4358,8 +4358,8 @@ public static final void gdk_gc_set_exposures(int /*long*/ gc, boolean exposures
* @param gc cast=(GdkGC *)
* @param fill cast=(GdkFill)
*/
@@ -18715,7 +18812,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_gc_set_fill(gc, fill);
-@@ -4394,8 +4394,8 @@ public static final void gdk_gc_set_fill(int /*long*/ gc, int fill) {
+@@ -4371,8 +4371,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
*/
@@ -18726,7 +18823,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_gc_set_foreground(gc, color);
-@@ -4407,8 +4407,8 @@ public static final void gdk_gc_set_foreground(int /*long*/ gc, GdkColor color)
+@@ -4384,8 +4384,8 @@ public static final void gdk_gc_set_foreground(int /*long*/ gc, GdkColor color)
* @param gc cast=(GdkGC *)
* @param function cast=(GdkFunction)
*/
@@ -18737,9 +18834,9 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_gc_set_function(gc, function);
-@@ -4423,8 +4423,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)
+@@ -4396,8 +4396,8 @@ public static final void gdk_gc_set_function(int /*long*/ gc, int /*long*/ funct
+ /**
+ * @method flags=dynamic
*/
-public static final native void _gdk_gc_set_line_attributes(int /*long*/ gc, int line_width, int line_style, int cap_style, int join_style);
-public static final void gdk_gc_set_line_attributes(int /*long*/ gc, int line_width, int line_style, int cap_style, int join_style) {
@@ -18748,7 +18845,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_gc_set_line_attributes(gc, line_width, line_style, cap_style, join_style);
-@@ -4436,8 +4436,8 @@ public static final void gdk_gc_set_line_attributes(int /*long*/ gc, int line_wi
+@@ -4409,8 +4409,8 @@ public static final void gdk_gc_set_line_attributes(int /*long*/ gc, int line_wi
* @param gc cast=(GdkGC *)
* @param stipple cast=(GdkPixmap *)
*/
@@ -18759,7 +18856,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_gc_set_stipple(gc, stipple);
-@@ -4449,8 +4449,8 @@ public static final void gdk_gc_set_stipple(int /*long*/ gc, int /*long*/ stippl
+@@ -4422,8 +4422,8 @@ public static final void gdk_gc_set_stipple(int /*long*/ gc, int /*long*/ stippl
* @param gc cast=(GdkGC *)
* @param mode cast=(GdkSubwindowMode)
*/
@@ -18770,9 +18867,9 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_gc_set_subwindow(gc, mode);
-@@ -4462,8 +4462,8 @@ public static final void gdk_gc_set_subwindow(int /*long*/ gc, int /*long*/ mode
- * @param gc cast=(GdkGC *)
- * @param tile cast=(GdkPixmap *)
+@@ -4434,8 +4434,8 @@ public static final void gdk_gc_set_subwindow(int /*long*/ gc, int /*long*/ mode
+ /**
+ * @method flags=dynamic
*/
-public static final native void _gdk_gc_set_tile(int /*long*/ gc, int /*long*/ tile);
-public static final void gdk_gc_set_tile(int /*long*/ gc, int /*long*/ tile) {
@@ -18781,10 +18878,10 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_gc_set_tile(gc, tile);
-@@ -4472,8 +4472,8 @@ public static final void gdk_gc_set_tile(int /*long*/ gc, int /*long*/ tile) {
- }
- }
- /** @param gc cast=(GdkGC *) */
+@@ -4446,8 +4446,8 @@ public static final void gdk_gc_set_tile(int /*long*/ gc, int /*long*/ tile) {
+ /**
+ * @method flags=dynamic
+ */
-public static final native void _gdk_gc_set_ts_origin(int /*long*/ gc, int x, int y);
-public static final void gdk_gc_set_ts_origin(int /*long*/ gc, int x, int y) {
+public static final native void _gdk_gc_set_ts_origin(long /*int*/ gc, int x, int y);
@@ -18792,7 +18889,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_gc_set_ts_origin(gc, x, y);
-@@ -4486,8 +4486,8 @@ public static final void gdk_gc_set_ts_origin(int /*long*/ gc, int x, int y) {
+@@ -4460,8 +4460,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)
*/
@@ -18803,7 +18900,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_gc_set_values(gc, values, values_mask);
-@@ -4495,8 +4495,8 @@ public static final void gdk_gc_set_values(int /*long*/ gc, GdkGCValues values,
+@@ -4469,8 +4469,8 @@ public static final void gdk_gc_set_values(int /*long*/ gc, GdkGCValues values,
lock.unlock();
}
}
@@ -18814,7 +18911,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_get_default_root_window();
-@@ -4513,8 +4513,8 @@ public static final void gdk_keyboard_ungrab(int time) {
+@@ -4487,8 +4487,8 @@ public static final void gdk_keyboard_ungrab(int time) {
lock.unlock();
}
}
@@ -18825,7 +18922,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_keymap_get_default();
-@@ -4530,8 +4530,8 @@ public static final int /*long*/ gdk_keymap_get_default() {
+@@ -4504,8 +4504,8 @@ public static final int /*long*/ gdk_keymap_get_default() {
* @param level cast=(gint*)
* @param consumed_modifiers cast=(GdkModifierType *)
*/
@@ -18836,7 +18933,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_keymap_translate_keyboard_state(keymap, hardware_keycode, state, group, keyval, effective_group, level, consumed_modifiers);
-@@ -4557,8 +4557,8 @@ public static final int gdk_keyval_to_unicode(int keyval) {
+@@ -4531,8 +4531,8 @@ public static final int gdk_keyval_to_unicode(int keyval) {
lock.unlock();
}
}
@@ -18847,7 +18944,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_pango_attr_embossed_new(embossed);
-@@ -4566,8 +4566,8 @@ public static final int /*long*/ gdk_pango_attr_embossed_new(boolean embossed) {
+@@ -4540,8 +4540,8 @@ public static final int /*long*/ gdk_pango_attr_embossed_new(boolean embossed) {
lock.unlock();
}
}
@@ -18858,7 +18955,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_pango_context_get();
-@@ -4580,8 +4580,8 @@ public static final int /*long*/ gdk_pango_context_get() {
+@@ -4554,8 +4554,8 @@ public static final int /*long*/ gdk_pango_context_get() {
* @param context cast=(PangoContext *)
* @param colormap cast=(GdkColormap *)
*/
@@ -18869,7 +18966,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_pango_context_set_colormap(context, colormap);
-@@ -4590,8 +4590,8 @@ public static final void gdk_pango_context_set_colormap(int /*long*/ context, in
+@@ -4564,8 +4564,8 @@ public static final void gdk_pango_context_set_colormap(int /*long*/ context, in
}
}
/** @param layout cast=(PangoLayout *) */
@@ -18880,7 +18977,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_pango_layout_get_clip_region(layout, x_origin, y_origin, index_ranges, n_ranges);
-@@ -4603,8 +4603,8 @@ public static final int /*long*/ gdk_pango_layout_get_clip_region(int /*long*/ l
+@@ -4577,8 +4577,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 *)
*/
@@ -18891,7 +18988,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_pixbuf_copy_area(src_pixbuf, src_x, src_y, width, height, dest_pixbuf, dest_x, dest_y);
-@@ -4617,8 +4617,8 @@ public static final void gdk_pixbuf_copy_area(int /*long*/ src_pixbuf, int src_x
+@@ -4591,8 +4591,8 @@ public static final void gdk_pixbuf_copy_area(int /*long*/ src_pixbuf, int src_x
* @param src cast=(GdkDrawable *)
* @param cmap cast=(GdkColormap *)
*/
@@ -18902,7 +18999,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_pixbuf_get_from_drawable(dest, src, cmap, src_x, src_y, dest_x, dest_y, width, height);
-@@ -4627,8 +4627,8 @@ public static final int /*long*/ gdk_pixbuf_get_from_drawable(int /*long*/ dest,
+@@ -4601,8 +4601,8 @@ public static final int /*long*/ gdk_pixbuf_get_from_drawable(int /*long*/ dest,
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -18913,7 +19010,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_pixbuf_get_has_alpha(pixbuf);
-@@ -4637,8 +4637,8 @@ public static final boolean gdk_pixbuf_get_has_alpha(int /*long*/ pixbuf) {
+@@ -4611,8 +4611,8 @@ public static final boolean gdk_pixbuf_get_has_alpha(int /*long*/ pixbuf) {
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -18924,7 +19021,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_pixbuf_get_height(pixbuf);
-@@ -4647,8 +4647,8 @@ public static final int gdk_pixbuf_get_height(int /*long*/ pixbuf) {
+@@ -4621,8 +4621,8 @@ public static final int gdk_pixbuf_get_height(int /*long*/ pixbuf) {
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -18935,7 +19032,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_pixbuf_get_pixels(pixbuf);
-@@ -4657,8 +4657,8 @@ public static final int /*long*/ gdk_pixbuf_get_pixels(int /*long*/ pixbuf) {
+@@ -4631,8 +4631,8 @@ public static final int /*long*/ gdk_pixbuf_get_pixels(int /*long*/ pixbuf) {
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -18946,7 +19043,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_pixbuf_get_rowstride(pixbuf);
-@@ -4667,8 +4667,8 @@ public static final int gdk_pixbuf_get_rowstride(int /*long*/ pixbuf) {
+@@ -4641,8 +4641,8 @@ public static final int gdk_pixbuf_get_rowstride(int /*long*/ pixbuf) {
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -18957,7 +19054,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_pixbuf_get_width(pixbuf);
-@@ -4676,8 +4676,8 @@ public static final int gdk_pixbuf_get_width(int /*long*/ pixbuf) {
+@@ -4650,8 +4650,8 @@ public static final int gdk_pixbuf_get_width(int /*long*/ pixbuf) {
lock.unlock();
}
}
@@ -18968,7 +19065,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_pixbuf_loader_new();
-@@ -4689,8 +4689,8 @@ public static final int /*long*/ gdk_pixbuf_loader_new() {
+@@ -4663,8 +4663,8 @@ public static final int /*long*/ gdk_pixbuf_loader_new() {
* @param loader cast=(GdkPixbufLoader *)
* @param error cast=(GError **)
*/
@@ -18979,7 +19076,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_pixbuf_loader_close(loader, error);
-@@ -4699,8 +4699,8 @@ public static final boolean gdk_pixbuf_loader_close(int /*long*/ loader, int /*l
+@@ -4673,8 +4673,8 @@ public static final boolean gdk_pixbuf_loader_close(int /*long*/ loader, int /*l
}
}
/** @param loader cast=(GdkPixbufLoader *) */
@@ -18990,7 +19087,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_pixbuf_loader_get_pixbuf(loader);
-@@ -4714,8 +4714,8 @@ public static final int /*long*/ gdk_pixbuf_loader_get_pixbuf(int /*long*/ loade
+@@ -4688,8 +4688,8 @@ public static final int /*long*/ gdk_pixbuf_loader_get_pixbuf(int /*long*/ loade
* @param count cast=(gsize)
* @param error cast=(GError **)
*/
@@ -19001,7 +19098,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_pixbuf_loader_write(loader, buffer, count, error);
-@@ -4727,8 +4727,8 @@ public static final boolean gdk_pixbuf_loader_write(int /*long*/ loader, int /*l
+@@ -4701,8 +4701,8 @@ public static final boolean gdk_pixbuf_loader_write(int /*long*/ loader, int /*l
* @param colorspace cast=(GdkColorspace)
* @param has_alpha cast=(gboolean)
*/
@@ -19012,7 +19109,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_pixbuf_new(colorspace, has_alpha, bits_per_sample, width, height);
-@@ -4740,8 +4740,8 @@ public static final int /*long*/ gdk_pixbuf_new(int colorspace, boolean has_alph
+@@ -4714,8 +4714,8 @@ public static final int /*long*/ gdk_pixbuf_new(int colorspace, boolean has_alph
* @param filename cast=(const char *)
* @param error cast=(GError**)
*/
@@ -19023,7 +19120,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_pixbuf_new_from_file(filename, error);
-@@ -4755,8 +4755,8 @@ public static final int /*long*/ gdk_pixbuf_new_from_file(byte[] filename, int /
+@@ -4729,8 +4729,8 @@ public static final int /*long*/ gdk_pixbuf_new_from_file(byte[] filename, int /
* @param gc cast=(GdkGC *)
* @param dither cast=(GdkRgbDither)
*/
@@ -19034,7 +19131,7 @@ index 5306e6e..15bf432 100644
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);
-@@ -4769,8 +4769,8 @@ public static final void gdk_pixbuf_render_to_drawable(int /*long*/ pixbuf, int
+@@ -4743,8 +4743,8 @@ public static final void gdk_pixbuf_render_to_drawable(int /*long*/ pixbuf, int
* @param pixmap_return cast=(GdkDrawable **)
* @param mask_return cast=(GdkBitmap **)
*/
@@ -19045,7 +19142,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap_return, mask_return, alpha_threshold);
-@@ -4788,8 +4788,8 @@ public static final void gdk_pixbuf_render_pixmap_and_mask(int /*long*/ pixbuf,
+@@ -4762,8 +4762,8 @@ public static final void gdk_pixbuf_render_pixmap_and_mask(int /*long*/ pixbuf,
* @param option_values cast=(char **)
* @param error cast=(GError **)
*/
@@ -19056,7 +19153,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_pixbuf_save_to_bufferv(pixbuf, buffer, buffer_size, type, option_keys, option_values, error);
-@@ -4805,8 +4805,8 @@ public static final boolean gdk_pixbuf_save_to_bufferv(int /*long*/ pixbuf, int
+@@ -4779,8 +4779,8 @@ public static final boolean gdk_pixbuf_save_to_bufferv(int /*long*/ pixbuf, int
* @param scale_x cast=(double)
* @param scale_y cast=(double)
*/
@@ -19067,7 +19164,7 @@ index 5306e6e..15bf432 100644
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);
-@@ -4818,8 +4818,8 @@ public static final void gdk_pixbuf_scale(int /*long*/ src, int /*long*/ dest, i
+@@ -4792,8 +4792,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)
*/
@@ -19078,7 +19175,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_pixbuf_scale_simple(src, dest_width, dest_height, interp_type);
-@@ -4833,8 +4833,8 @@ public static final int /*long*/ gdk_pixbuf_scale_simple(int /*long*/ src, int d
+@@ -4807,8 +4807,8 @@ public static final int /*long*/ gdk_pixbuf_scale_simple(int /*long*/ src, int d
* @param height cast=(gint)
* @param depth cast=(gint)
*/
@@ -19089,7 +19186,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_pixmap_new(window, width, height, depth);
-@@ -4850,8 +4850,8 @@ public static final int /*long*/ gdk_pixmap_new(int /*long*/ window, int width,
+@@ -4824,8 +4824,8 @@ public static final int /*long*/ gdk_pixmap_new(int /*long*/ window, int width,
* @param cursor cast=(GdkCursor *)
* @param time cast=(guint32)
*/
@@ -19100,7 +19197,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_pointer_grab(window, owner_events, event_mask, confine_to, cursor, time);
-@@ -4887,8 +4887,8 @@ public static final void gdk_pointer_ungrab(int time) {
+@@ -4861,8 +4861,8 @@ public static final void gdk_pointer_ungrab(int time) {
* @param actual_length cast=(gint *)
* @param data cast=(guchar **)
*/
@@ -19111,7 +19208,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_property_get(window, property, type, offset, length, pdelete, actual_property_type, actual_format, actual_length, data);
-@@ -4897,8 +4897,8 @@ public static final boolean gdk_property_get(int /*long*/ window, int /*long*/ p
+@@ -4871,8 +4871,8 @@ public static final boolean gdk_property_get(int /*long*/ window, int /*long*/ p
}
}
/** @param region cast=(GdkRegion *) */
@@ -19122,7 +19219,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_region_destroy(region);
-@@ -4907,8 +4907,8 @@ public static final void gdk_region_destroy(int /*long*/ region) {
+@@ -4881,8 +4881,8 @@ public static final void gdk_region_destroy(int /*long*/ region) {
}
}
/** @param region cast=(GdkRegion *) */
@@ -19133,7 +19230,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_region_empty(region);
-@@ -4920,8 +4920,8 @@ public static final boolean gdk_region_empty(int /*long*/ region) {
+@@ -4894,8 +4894,8 @@ public static final boolean gdk_region_empty(int /*long*/ region) {
* @param region cast=(GdkRegion *)
* @param rectangle cast=(GdkRectangle *),flags=no_in
*/
@@ -19144,7 +19241,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_region_get_clipbox(region, rectangle);
-@@ -4934,8 +4934,8 @@ public static final void gdk_region_get_clipbox(int /*long*/ region, GdkRectangl
+@@ -4908,8 +4908,8 @@ public static final void gdk_region_get_clipbox(int /*long*/ region, GdkRectangl
* @param rectangles cast=(GdkRectangle **)
* @param n_rectangles cast=(gint *)
*/
@@ -19155,7 +19252,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_region_get_rectangles(region, rectangles, n_rectangles);
-@@ -4947,8 +4947,8 @@ public static final void gdk_region_get_rectangles(int /*long*/ region, int /*lo
+@@ -4921,8 +4921,8 @@ public static final void gdk_region_get_rectangles(int /*long*/ region, int /*lo
* @param source1 cast=(GdkRegion *)
* @param source2 cast=(GdkRegion *)
*/
@@ -19166,7 +19263,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_region_intersect(source1, source2);
-@@ -4956,8 +4956,8 @@ public static final void gdk_region_intersect(int /*long*/ source1, int /*long*/
+@@ -4930,8 +4930,8 @@ public static final void gdk_region_intersect(int /*long*/ source1, int /*long*/
lock.unlock();
}
}
@@ -19177,7 +19274,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_region_new();
-@@ -4970,8 +4970,8 @@ public static final int /*long*/ gdk_region_new() {
+@@ -4944,8 +4944,8 @@ public static final int /*long*/ gdk_region_new() {
* @param dx cast=(gint)
* @param dy cast=(gint)
*/
@@ -19188,7 +19285,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_region_offset(region, dx, dy);
-@@ -4984,8 +4984,8 @@ public static final void gdk_region_offset(int /*long*/ region, int dx, int dy)
+@@ -4958,8 +4958,8 @@ public static final void gdk_region_offset(int /*long*/ region, int dx, int dy)
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -19199,7 +19296,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_region_point_in(region, x, y);
-@@ -4997,8 +4997,8 @@ public static final boolean gdk_region_point_in(int /*long*/ region, int x, int
+@@ -4971,8 +4971,8 @@ public static final boolean gdk_region_point_in(int /*long*/ region, int x, int
* @param points cast=(GdkPoint *)
* @param fill_rule cast=(GdkFillRule)
*/
@@ -19210,7 +19307,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_region_polygon(points, npoints, fill_rule);
-@@ -5007,8 +5007,8 @@ public static final int /*long*/ gdk_region_polygon(int[] points, int npoints, i
+@@ -4981,8 +4981,8 @@ public static final int /*long*/ gdk_region_polygon(int[] points, int npoints, i
}
}
/** @param rectangle flags=no_out */
@@ -19221,7 +19318,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_region_rectangle(rectangle);
-@@ -5020,8 +5020,8 @@ public static final int /*long*/ gdk_region_rectangle(GdkRectangle rectangle) {
+@@ -4994,8 +4994,8 @@ public static final int /*long*/ gdk_region_rectangle(GdkRectangle rectangle) {
* @param region cast=(GdkRegion *)
* @param rect cast=(GdkRectangle *),flags=no_out
*/
@@ -19232,7 +19329,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_region_rect_in(region, rect);
-@@ -5033,8 +5033,8 @@ public static final int /*long*/ gdk_region_rect_in(int /*long*/ region, GdkRect
+@@ -5007,8 +5007,8 @@ public static final int /*long*/ gdk_region_rect_in(int /*long*/ region, GdkRect
* @param source1 cast=(GdkRegion *)
* @param source2 cast=(GdkRegion *)
*/
@@ -19243,7 +19340,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_region_subtract(source1, source2);
-@@ -5046,8 +5046,8 @@ public static final void gdk_region_subtract(int /*long*/ source1, int /*long*/
+@@ -5020,8 +5020,8 @@ public static final void gdk_region_subtract(int /*long*/ source1, int /*long*/
* @param source1 cast=(GdkRegion *)
* @param source2 cast=(GdkRegion *)
*/
@@ -19254,7 +19351,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_region_union(source1, source2);
-@@ -5059,8 +5059,8 @@ public static final void gdk_region_union(int /*long*/ source1, int /*long*/ sou
+@@ -5033,8 +5033,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
*/
@@ -19265,7 +19362,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_region_union_with_rect(region, rect);
-@@ -5069,8 +5069,8 @@ public static final void gdk_region_union_with_rect(int /*long*/ region, GdkRect
+@@ -5043,8 +5043,8 @@ public static final void gdk_region_union_with_rect(int /*long*/ region, GdkRect
}
}
/** @method flags=dynamic */
@@ -19276,7 +19373,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_screen_get_default();
-@@ -5084,8 +5084,8 @@ public static final int /*long*/ gdk_screen_get_default() {
+@@ -5058,8 +5058,8 @@ public static final int /*long*/ gdk_screen_get_default() {
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -19287,7 +19384,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_screen_get_monitor_at_point (screen, x, y);
-@@ -5098,8 +5098,8 @@ public static final int gdk_screen_get_monitor_at_point (int /*long*/ screen, in
+@@ -5072,8 +5072,8 @@ public static final int gdk_screen_get_monitor_at_point (int /*long*/ screen, in
* @param screen cast=(GdkScreen *)
* @param window cast=(GdkWindow *)
*/
@@ -19298,7 +19395,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_screen_get_monitor_at_window(screen, window);
-@@ -5112,8 +5112,8 @@ public static final int gdk_screen_get_monitor_at_window(int /*long*/ screen, in
+@@ -5086,8 +5086,8 @@ public static final int gdk_screen_get_monitor_at_window(int /*long*/ screen, in
* @param screen cast=(GdkScreen *)
* @param dest flags=no_in
*/
@@ -19309,7 +19406,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_screen_get_monitor_geometry(screen, monitor_num, dest);
-@@ -5125,8 +5125,8 @@ public static final void gdk_screen_get_monitor_geometry (int /*long*/ screen, i
+@@ -5099,8 +5099,8 @@ public static final void gdk_screen_get_monitor_geometry (int /*long*/ screen, i
* @method flags=dynamic
* @param screen cast=(GdkScreen *)
*/
@@ -19320,7 +19417,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_screen_get_n_monitors(screen);
-@@ -5138,8 +5138,8 @@ public static final int gdk_screen_get_n_monitors(int /*long*/ screen) {
+@@ -5112,8 +5112,8 @@ public static final int gdk_screen_get_n_monitors(int /*long*/ screen) {
* @method flags=dynamic
* @param screen cast=(GdkScreen *)
*/
@@ -19331,7 +19428,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_screen_get_number(screen);
-@@ -5191,8 +5191,8 @@ public static final void gdk_set_program_class(byte[] program_class) {
+@@ -5165,8 +5165,8 @@ public static final void gdk_set_program_class(byte[] program_class) {
* @param ctext cast=(guchar **)
* @param length cast=(gint *)
*/
@@ -19342,7 +19439,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_utf8_to_compound_text(str, encoding, format, ctext, length);
-@@ -5201,8 +5201,8 @@ public static final boolean gdk_utf8_to_compound_text(byte[] str, int /*long*/[]
+@@ -5175,8 +5175,8 @@ public static final boolean gdk_utf8_to_compound_text(byte[] str, int /*long*/[]
}
}
/** @param str cast=(const gchar *) */
@@ -19353,7 +19450,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_utf8_to_string_target(str);
-@@ -5216,8 +5216,8 @@ public static final int /*long*/ gdk_utf8_to_string_target(byte[] str) {
+@@ -5190,8 +5190,8 @@ public static final int /*long*/ gdk_utf8_to_string_target(byte[] str) {
* @param text cast=(guchar *)
* @param list cast=(gchar ***)
*/
@@ -19364,7 +19461,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_text_property_to_utf8_list_for_display(display, encoding, format, text, length, list);
-@@ -5231,7 +5231,7 @@ public static final native void gdk_threads_leave ();
+@@ -5205,7 +5205,7 @@ public static final native void gdk_threads_leave ();
/**
* @method flags=dynamic
*/
@@ -19373,7 +19470,7 @@ index 5306e6e..15bf432 100644
public static final native int _gdk_unicode_to_keyval(int wc);
public static final int gdk_unicode_to_keyval(int wc) {
-@@ -5242,8 +5242,8 @@ public static final int gdk_unicode_to_keyval(int wc) {
+@@ -5216,8 +5216,8 @@ public static final int gdk_unicode_to_keyval(int wc) {
lock.unlock();
}
}
@@ -19384,7 +19481,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_visual_get_system();
-@@ -5255,8 +5255,8 @@ public static final int /*long*/ gdk_visual_get_system() {
+@@ -5229,8 +5229,8 @@ public static final int /*long*/ gdk_visual_get_system() {
* @param win_x cast=(gint *)
* @param win_y cast=(gint *)
*/
@@ -19395,7 +19492,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_window_at_pointer(win_x, win_y);
-@@ -5268,8 +5268,8 @@ public static final int /*long*/ gdk_window_at_pointer(int[] win_x, int[] win_y)
+@@ -5242,8 +5242,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
*/
@@ -19406,7 +19503,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_begin_paint_rect(window, rectangle);
-@@ -5278,8 +5278,8 @@ public static final void gdk_window_begin_paint_rect(int /*long*/ window, GdkRec
+@@ -5252,8 +5252,8 @@ public static final void gdk_window_begin_paint_rect(int /*long*/ window, GdkRec
}
}
/** @param window cast=(GdkWindow *) */
@@ -19417,7 +19514,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_clear_area(window, x, y, width, height);
-@@ -5291,8 +5291,8 @@ public static final void gdk_window_clear_area(int /*long*/ window, int x, int y
+@@ -5265,8 +5265,8 @@ public static final void gdk_window_clear_area(int /*long*/ window, int x, int y
* @method flags=dynamic
* @param window cast=(GdkWindow *)
*/
@@ -19428,7 +19525,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_window_create_similar_surface(window, content, width, height);
-@@ -5301,8 +5301,8 @@ public static final int /*long*/ gdk_window_create_similar_surface(int /*long*/
+@@ -5275,8 +5275,8 @@ public static final int /*long*/ gdk_window_create_similar_surface(int /*long*/
}
}
/** @param window cast=(GdkWindow *) */
@@ -19439,7 +19536,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_destroy(window);
-@@ -5311,8 +5311,8 @@ public static final void gdk_window_destroy(int /*long*/ window) {
+@@ -5285,8 +5285,8 @@ public static final void gdk_window_destroy(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19450,7 +19547,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_end_paint(window);
-@@ -5321,8 +5321,8 @@ public static final void gdk_window_end_paint(int /*long*/ window) {
+@@ -5295,8 +5295,8 @@ public static final void gdk_window_end_paint(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19461,7 +19558,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_window_get_children(window);
-@@ -5331,8 +5331,8 @@ public static final int /*long*/ gdk_window_get_children(int /*long*/ window) {
+@@ -5305,8 +5305,8 @@ public static final int /*long*/ gdk_window_get_children(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19472,7 +19569,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_window_get_events(window);
-@@ -5341,8 +5341,8 @@ public static final int gdk_window_get_events(int /*long*/ window) {
+@@ -5315,8 +5315,8 @@ public static final int gdk_window_get_events(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19483,7 +19580,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_focus(window, timestamp);
-@@ -5351,8 +5351,8 @@ public static final void gdk_window_focus(int /*long*/ window, int timestamp) {
+@@ -5325,8 +5325,8 @@ public static final void gdk_window_focus(int /*long*/ window, int timestamp) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19494,7 +19591,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_freeze_updates(window);
-@@ -5364,8 +5364,8 @@ public static final void gdk_window_freeze_updates(int /*long*/ window) {
+@@ -5338,8 +5338,8 @@ public static final void gdk_window_freeze_updates(int /*long*/ window) {
* @param window cast=(GdkWindow *)
* @param rect cast=(GdkRectangle *),flags=no_in
*/
@@ -19505,7 +19602,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_get_frame_extents(window, rect);
-@@ -5379,8 +5379,8 @@ public static final void gdk_window_get_frame_extents(int /*long*/ window, GdkRe
+@@ -5353,8 +5353,8 @@ public static final void gdk_window_get_frame_extents(int /*long*/ window, GdkRe
* @param x_offset cast=(gint *)
* @param y_offset cast=(gint *)
*/
@@ -19516,7 +19613,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_get_internal_paint_info(window, real_drawable, x_offset, y_offset);
-@@ -5393,8 +5393,8 @@ public static final void gdk_window_get_internal_paint_info(int /*long*/ window,
+@@ -5367,8 +5367,8 @@ public static final void gdk_window_get_internal_paint_info(int /*long*/ window,
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
@@ -19527,7 +19624,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_window_get_origin(window, x, y);
-@@ -5403,8 +5403,8 @@ public static final int gdk_window_get_origin(int /*long*/ window, int[] x, int[
+@@ -5377,8 +5377,8 @@ public static final int gdk_window_get_origin(int /*long*/ window, int[] x, int[
}
}
/** @param window cast=(GdkWindow *) */
@@ -19538,7 +19635,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_window_get_parent(window);
-@@ -5418,8 +5418,8 @@ public static final int /*long*/ gdk_window_get_parent(int /*long*/ window) {
+@@ -5392,8 +5392,8 @@ public static final int /*long*/ gdk_window_get_parent(int /*long*/ window) {
* @param y cast=(gint *)
* @param mask cast=(GdkModifierType *)
*/
@@ -19549,7 +19646,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_window_get_pointer(window, x, y, mask);
-@@ -5432,8 +5432,8 @@ public static final int /*long*/ gdk_window_get_pointer(int /*long*/ window, int
+@@ -5406,8 +5406,8 @@ public static final int /*long*/ gdk_window_get_pointer(int /*long*/ window, int
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
@@ -19560,7 +19657,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_get_position(window, x, y);
-@@ -5445,8 +5445,8 @@ public static final void gdk_window_get_position(int /*long*/ window, int[] x, i
+@@ -5419,8 +5419,8 @@ public static final void gdk_window_get_position(int /*long*/ window, int[] x, i
* @param window cast=(GdkWindow *)
* @param data cast=(gpointer *)
*/
@@ -19571,7 +19668,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_get_user_data(window, data);
-@@ -5455,8 +5455,8 @@ public static final void gdk_window_get_user_data(int /*long*/ window, int /*lon
+@@ -5429,8 +5429,8 @@ public static final void gdk_window_get_user_data(int /*long*/ window, int /*lon
}
}
/** @param window cast=(GdkWindow *) */
@@ -19582,7 +19679,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_hide(window);
-@@ -5469,8 +5469,8 @@ public static final void gdk_window_hide(int /*long*/ window) {
+@@ -5443,8 +5443,8 @@ public static final void gdk_window_hide(int /*long*/ window) {
* @param rectangle cast=(GdkRectangle *),flags=no_out
* @param invalidate_children cast=(gboolean)
*/
@@ -19593,7 +19690,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_invalidate_rect(window, rectangle, invalidate_children);
-@@ -5483,8 +5483,8 @@ public static final void gdk_window_invalidate_rect(int /*long*/ window, GdkRect
+@@ -5457,8 +5457,8 @@ public static final void gdk_window_invalidate_rect(int /*long*/ window, GdkRect
* @param region cast=(GdkRegion *)
* @param invalidate_children cast=(gboolean)
*/
@@ -19604,7 +19701,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_invalidate_region(window, region, invalidate_children);
-@@ -5493,8 +5493,8 @@ public static final void gdk_window_invalidate_region(int /*long*/ window, int /
+@@ -5467,8 +5467,8 @@ public static final void gdk_window_invalidate_region(int /*long*/ window, int /
}
}
/** @param window cast=(GdkWindow *) */
@@ -19615,7 +19712,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_window_is_visible(window);
-@@ -5503,8 +5503,8 @@ public static final boolean gdk_window_is_visible(int /*long*/ window) {
+@@ -5477,8 +5477,8 @@ public static final boolean gdk_window_is_visible(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19626,7 +19723,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_window_is_viewable (window);
-@@ -5513,8 +5513,8 @@ public static final boolean gdk_window_is_viewable (int /*long*/ window) {
+@@ -5487,8 +5487,8 @@ public static final boolean gdk_window_is_viewable (int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19637,7 +19734,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_move(window, x, y);
-@@ -5523,8 +5523,8 @@ public static final void gdk_window_move(int /*long*/ window, int x, int y) {
+@@ -5497,8 +5497,8 @@ public static final void gdk_window_move(int /*long*/ window, int x, int y) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19648,7 +19745,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_move_resize(window, x, y, width, height);
-@@ -5536,8 +5536,8 @@ public static final void gdk_window_move_resize(int /*long*/ window, int x, int
+@@ -5510,8 +5510,8 @@ public static final void gdk_window_move_resize(int /*long*/ window, int x, int
* @param parent cast=(GdkWindow *)
* @param attributes flags=no_out
*/
@@ -19659,7 +19756,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gdk_window_new(parent, attributes, attributes_mask);
-@@ -5546,8 +5546,8 @@ public static final int /*long*/ gdk_window_new(int /*long*/ parent, GdkWindowAt
+@@ -5520,8 +5520,8 @@ public static final int /*long*/ gdk_window_new(int /*long*/ parent, GdkWindowAt
}
}
/** @param window cast=(GdkWindow *) */
@@ -19670,7 +19767,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_lower(window);
-@@ -5568,8 +5568,8 @@ public static final void gdk_window_process_all_updates() {
+@@ -5542,8 +5542,8 @@ public static final void gdk_window_process_all_updates() {
* @param window cast=(GdkWindow *)
* @param update_children cast=(gboolean)
*/
@@ -19681,7 +19778,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_process_updates(window, update_children);
-@@ -5578,8 +5578,8 @@ public static final void gdk_window_process_updates(int /*long*/ window, boolean
+@@ -5552,8 +5552,8 @@ public static final void gdk_window_process_updates(int /*long*/ window, boolean
}
}
/** @param window cast=(GdkWindow *) */
@@ -19692,7 +19789,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_raise(window);
-@@ -5588,8 +5588,8 @@ public static final void gdk_window_raise(int /*long*/ window) {
+@@ -5562,8 +5562,8 @@ public static final void gdk_window_raise(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19703,7 +19800,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_resize(window, width, height);
-@@ -5603,8 +5603,8 @@ public static final void gdk_window_resize(int /*long*/ window, int width, int h
+@@ -5577,8 +5577,8 @@ public static final void gdk_window_resize(int /*long*/ window, int width, int h
* @param sibling cast=(GdkWindow *)
* @param above cast=(gboolean)
*/
@@ -19714,7 +19811,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_restack(window, sibling, above);
-@@ -5613,8 +5613,8 @@ public static final void gdk_window_restack(int /*long*/ window, int /*long*/ si
+@@ -5587,8 +5587,8 @@ public static final void gdk_window_restack(int /*long*/ window, int /*long*/ si
}
}
/** @param window cast=(GdkWindow *) */
@@ -19725,7 +19822,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_scroll(window, dx, dy);
-@@ -5627,8 +5627,8 @@ public static final void gdk_window_scroll(int /*long*/ window, int dx, int dy)
+@@ -5601,8 +5601,8 @@ public static final void gdk_window_scroll(int /*long*/ window, int dx, int dy)
* @param window cast=(GdkWindow *)
* @param accept_focus cast=(gboolean)
*/
@@ -19736,7 +19833,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_set_accept_focus(window, accept_focus);
-@@ -5641,8 +5641,8 @@ public static final void gdk_window_set_accept_focus(int /*long*/ window, boolea
+@@ -5615,8 +5615,8 @@ public static final void gdk_window_set_accept_focus(int /*long*/ window, boolea
* @param pixmap cast=(GdkPixmap *)
* @param parent_relative cast=(gboolean)
*/
@@ -19747,7 +19844,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_set_back_pixmap(window, pixmap, parent_relative);
-@@ -5654,8 +5654,8 @@ public static final void gdk_window_set_back_pixmap(int /*long*/ window, int /*l
+@@ -5628,8 +5628,8 @@ public static final void gdk_window_set_back_pixmap(int /*long*/ window, int /*l
* @param window cast=(GdkWindow *)
* @param cursor cast=(GdkCursor *)
*/
@@ -19758,7 +19855,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_set_cursor(window, cursor);
-@@ -5677,8 +5677,8 @@ public static final void gdk_window_set_debug_updates(boolean setting) {
+@@ -5651,8 +5651,8 @@ public static final void gdk_window_set_debug_updates(boolean setting) {
* @param window cast=(GdkWindow *)
* @param decorations cast=(GdkWMDecoration)
*/
@@ -19769,7 +19866,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_set_decorations(window, decorations);
-@@ -5687,8 +5687,8 @@ public static final void gdk_window_set_decorations(int /*long*/ window, int dec
+@@ -5661,8 +5661,8 @@ public static final void gdk_window_set_decorations(int /*long*/ window, int dec
}
}
/** @param window cast=(GdkWindow *) */
@@ -19780,7 +19877,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_set_events(window, event_mask);
-@@ -5702,8 +5702,8 @@ public static final void gdk_window_set_events(int /*long*/ window, int event_ma
+@@ -5676,8 +5676,8 @@ public static final void gdk_window_set_events(int /*long*/ window, int event_ma
* @param pixmap cast=(GdkPixmap *)
* @param mask cast=(GdkBitmap *)
*/
@@ -19791,7 +19888,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_set_icon(window, icon_window, pixmap, mask);
-@@ -5715,8 +5715,8 @@ public static final void gdk_window_set_icon(int /*long*/ window, int /*long*/ i
+@@ -5689,8 +5689,8 @@ public static final void gdk_window_set_icon(int /*long*/ window, int /*long*/ i
* @param window cast=(GdkWindow *)
* @param pixbufs cast=(GList *)
*/
@@ -19802,7 +19899,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_set_icon_list(window, pixbufs);
-@@ -5729,8 +5729,8 @@ public static final void gdk_window_set_icon_list(int /*long*/ window, int /*lon
+@@ -5703,8 +5703,8 @@ public static final void gdk_window_set_icon_list(int /*long*/ window, int /*lon
* @param window cast=(GdkWindow *)
* @param setting cast=(gboolean)
*/
@@ -19813,7 +19910,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_set_keep_above(window, setting);
-@@ -5742,8 +5742,8 @@ public static final void gdk_window_set_keep_above(int /*long*/ window, boolean
+@@ -5716,8 +5716,8 @@ public static final void gdk_window_set_keep_above(int /*long*/ window, boolean
* @param window cast=(GdkWindow *)
* @param override_redirect cast=(gboolean)
*/
@@ -19824,7 +19921,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_set_override_redirect(window, override_redirect);
-@@ -5755,8 +5755,8 @@ public static final void gdk_window_set_override_redirect(int /*long*/ window, b
+@@ -5729,8 +5729,8 @@ public static final void gdk_window_set_override_redirect(int /*long*/ window, b
* @param window cast=(GdkWindow *)
* @param user_data cast=(gpointer)
*/
@@ -19835,7 +19932,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_set_user_data(window, user_data);
-@@ -5768,8 +5768,8 @@ public static final void gdk_window_set_user_data(int /*long*/ window, int /*lon
+@@ -5742,8 +5742,8 @@ public static final void gdk_window_set_user_data(int /*long*/ window, int /*lon
* @param window cast=(GdkWindow *)
* @param shape_region cast=(GdkRegion *)
*/
@@ -19846,7 +19943,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_shape_combine_region(window, shape_region, offset_x, offset_y);
-@@ -5778,8 +5778,8 @@ public static final void gdk_window_shape_combine_region (int /*long*/ window, i
+@@ -5752,8 +5752,8 @@ public static final void gdk_window_shape_combine_region (int /*long*/ window, i
}
}
/** @param window cast=(GdkWindow *) */
@@ -19857,7 +19954,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_show(window);
-@@ -5788,8 +5788,8 @@ public static final void gdk_window_show(int /*long*/ window) {
+@@ -5762,8 +5762,8 @@ public static final void gdk_window_show(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19868,7 +19965,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_show_unraised(window);
-@@ -5798,8 +5798,8 @@ public static final void gdk_window_show_unraised(int /*long*/ window) {
+@@ -5772,8 +5772,8 @@ public static final void gdk_window_show_unraised(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19879,7 +19976,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gdk_window_thaw_updates(window);
-@@ -5821,8 +5821,8 @@ public static final int gtk_accelerator_get_default_mod_mask() {
+@@ -5795,8 +5795,8 @@ public static final int gtk_accelerator_get_default_mod_mask() {
* @param accelerator_key cast=(guint *)
* @param accelerator_mods cast=(GdkModifierType *)
*/
@@ -19890,7 +19987,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_accelerator_parse(accelerator, accelerator_key, accelerator_mods);
-@@ -5830,8 +5830,8 @@ public static final void gtk_accelerator_parse(int /*long*/ accelerator, int []
+@@ -5804,8 +5804,8 @@ public static final void gtk_accelerator_parse(int /*long*/ accelerator, int []
lock.unlock();
}
}
@@ -19901,7 +19998,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_accel_group_new();
-@@ -5844,8 +5844,8 @@ public static final int /*long*/ gtk_accel_group_new() {
+@@ -5818,8 +5818,8 @@ public static final int /*long*/ gtk_accel_group_new() {
* @param accelKey cast=(guint)
* @param accelMods cast=(GdkModifierType)
*/
@@ -19912,7 +20009,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_accel_groups_activate(accelGroup, accelKey, accelMods);
-@@ -5857,8 +5857,8 @@ public static final boolean gtk_accel_groups_activate(int /*long*/ accelGroup, i
+@@ -5831,8 +5831,8 @@ public static final boolean gtk_accel_groups_activate(int /*long*/ accelGroup, i
* @param accel_label cast=(GtkAccelLabel *)
* @param accel_widget cast=(GtkWidget *)
*/
@@ -19923,7 +20020,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_accel_label_set_accel_widget(accel_label, accel_widget);
-@@ -5867,8 +5867,8 @@ public static final void gtk_accel_label_set_accel_widget(int /*long*/ accel_lab
+@@ -5841,8 +5841,8 @@ public static final void gtk_accel_label_set_accel_widget(int /*long*/ accel_lab
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -19934,7 +20031,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_adjustment_changed(adjustment);
-@@ -5883,8 +5883,8 @@ public static final void gtk_adjustment_changed(int /*long*/ adjustment) {
+@@ -5857,8 +5857,8 @@ public static final void gtk_adjustment_changed(int /*long*/ adjustment) {
* @param step_increment cast=(gdouble)
* @param page_increment cast=(gdouble)
*/
@@ -19945,7 +20042,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_adjustment_new(value, lower, upper, step_increment, page_increment, page_size);
-@@ -5896,8 +5896,8 @@ public static final int /*long*/ gtk_adjustment_new(double value, double lower,
+@@ -5870,8 +5870,8 @@ public static final int /*long*/ gtk_adjustment_new(double value, double lower,
* @param adjustment cast=(GtkAdjustment *)
* @param value cast=(gdouble)
*/
@@ -19956,7 +20053,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_adjustment_set_value(adjustment, value);
-@@ -5906,8 +5906,8 @@ public static final void gtk_adjustment_set_value(int /*long*/ adjustment, doubl
+@@ -5880,8 +5880,8 @@ public static final void gtk_adjustment_set_value(int /*long*/ adjustment, doubl
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -19967,7 +20064,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_adjustment_value_changed(adjustment);
-@@ -5919,8 +5919,8 @@ public static final void gtk_adjustment_value_changed(int /*long*/ adjustment) {
+@@ -5893,8 +5893,8 @@ public static final void gtk_adjustment_value_changed(int /*long*/ adjustment) {
* @param arrow_type cast=(GtkArrowType)
* @param shadow_type cast=(GtkShadowType)
*/
@@ -19978,7 +20075,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_arrow_new(arrow_type, shadow_type);
-@@ -5933,8 +5933,8 @@ public static final int /*long*/ gtk_arrow_new(int arrow_type, int shadow_type)
+@@ -5907,8 +5907,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)
*/
@@ -19989,7 +20086,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_arrow_set(arrow, arrow_type, shadow_type);
-@@ -5943,8 +5943,8 @@ public static final void gtk_arrow_set(int /*long*/ arrow, int arrow_type, int s
+@@ -5917,8 +5917,8 @@ public static final void gtk_arrow_set(int /*long*/ arrow, int arrow_type, int s
}
}
/** @param bin cast=(GtkBin *) */
@@ -20000,7 +20097,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_bin_get_child(bin);
-@@ -5953,8 +5953,8 @@ public static final int /*long*/ gtk_bin_get_child(int /*long*/ bin) {
+@@ -5927,8 +5927,8 @@ public static final int /*long*/ gtk_bin_get_child(int /*long*/ bin) {
}
}
/** @param border cast=(GtkBorder *) */
@@ -20011,7 +20108,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_border_free(border);
-@@ -5963,8 +5963,8 @@ public static final void gtk_border_free(int /*long*/ border) {
+@@ -5937,8 +5937,8 @@ public static final void gtk_border_free(int /*long*/ border) {
}
}
/** @param box cast=(GtkBox *) */
@@ -20022,7 +20119,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_box_set_spacing(box, spacing);
-@@ -5976,8 +5976,8 @@ public static final void gtk_box_set_spacing(int /*long*/ box, int spacing) {
+@@ -5950,8 +5950,8 @@ public static final void gtk_box_set_spacing(int /*long*/ box, int spacing) {
* @param box cast=(GtkBox *)
* @param child cast=(GtkWidget *)
*/
@@ -20033,7 +20130,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_box_set_child_packing(box, child, expand, fill, padding, pack_type);
-@@ -5986,8 +5986,8 @@ public static final void gtk_box_set_child_packing(int /*long*/ box, int /*long*
+@@ -5960,8 +5960,8 @@ public static final void gtk_box_set_child_packing(int /*long*/ box, int /*long*
}
}
/** @param button cast=(GtkButton *) */
@@ -20044,7 +20141,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_button_clicked(button);
-@@ -5996,8 +5996,8 @@ public static final void gtk_button_clicked(int /*long*/ button) {
+@@ -5970,8 +5970,8 @@ public static final void gtk_button_clicked(int /*long*/ button) {
}
}
/** @param button cast=(GtkButton *) */
@@ -20055,7 +20152,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_button_get_relief(button);
-@@ -6005,8 +6005,8 @@ public static final int gtk_button_get_relief(int /*long*/ button) {
+@@ -5979,8 +5979,8 @@ public static final int gtk_button_get_relief(int /*long*/ button) {
lock.unlock();
}
}
@@ -20066,7 +20163,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_button_new();
-@@ -6018,8 +6018,8 @@ public static final int /*long*/ gtk_button_new() {
+@@ -5992,8 +5992,8 @@ public static final int /*long*/ gtk_button_new() {
* @param button cast=(GtkButton *)
* @param newstyle cast=(GtkReliefStyle)
*/
@@ -20077,7 +20174,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_button_set_relief(button, newstyle);
-@@ -6028,8 +6028,8 @@ public static final void gtk_button_set_relief(int /*long*/ button, int newstyle
+@@ -6002,8 +6002,8 @@ public static final void gtk_button_set_relief(int /*long*/ button, int newstyle
}
}
/** @method flags=dynamic */
@@ -20088,7 +20185,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_calendar_new();
-@@ -6043,8 +6043,8 @@ public static final int /*long*/ gtk_calendar_new() {
+@@ -6017,8 +6017,8 @@ public static final int /*long*/ gtk_calendar_new() {
* @param month cast=(guint)
* @param year cast=(guint)
*/
@@ -20099,7 +20196,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_calendar_select_month(calendar, month, year);
-@@ -6057,8 +6057,8 @@ public static final boolean /*long*/ gtk_calendar_select_month(int /*long*/ cale
+@@ -6031,8 +6031,8 @@ public static final boolean /*long*/ gtk_calendar_select_month(int /*long*/ cale
* @param calendar cast=(GtkCalendar *)
* @param day cast=(guint)
*/
@@ -20110,7 +20207,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_calendar_select_day(calendar, day);
-@@ -6071,8 +6071,8 @@ public static final void gtk_calendar_select_day(int /*long*/ calendar, int day)
+@@ -6045,8 +6045,8 @@ public static final void gtk_calendar_select_day(int /*long*/ calendar, int day)
* @param calendar cast=(GtkCalendar *)
* @param day cast=(guint)
*/
@@ -20121,7 +20218,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_calendar_mark_day(calendar, day);
-@@ -6084,8 +6084,8 @@ public static final void gtk_calendar_mark_day(int /*long*/ calendar, int day) {
+@@ -6058,8 +6058,8 @@ public static final void gtk_calendar_mark_day(int /*long*/ calendar, int day) {
* @method flags=dynamic
* @param calendar cast=(GtkCalendar *)
*/
@@ -20132,7 +20229,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_calendar_clear_marks(calendar);
-@@ -6098,8 +6098,8 @@ public static final void gtk_calendar_clear_marks(int /*long*/ calendar) {
+@@ -6072,8 +6072,8 @@ public static final void gtk_calendar_clear_marks(int /*long*/ calendar) {
* @param calendar cast=(GtkCalendar *)
* @param flags cast=(GtkCalendarDisplayOptions)
*/
@@ -20143,7 +20240,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_calendar_set_display_options(calendar, flags);
-@@ -6114,8 +6114,8 @@ public static final void gtk_calendar_set_display_options(int /*long*/ calendar,
+@@ -6088,8 +6088,8 @@ public static final void gtk_calendar_set_display_options(int /*long*/ calendar,
* @param month cast=(guint *)
* @param day cast=(guint *)
*/
@@ -20154,7 +20251,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_calendar_get_date(calendar, year, month, day);
-@@ -6124,8 +6124,8 @@ public static final void gtk_calendar_get_date(int /*long*/ calendar, int[] year
+@@ -6098,8 +6098,8 @@ public static final void gtk_calendar_get_date(int /*long*/ calendar, int[] year
}
}
/** @method flags=dynamic */
@@ -20165,7 +20262,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_cell_layout_clear(cell_layout);
-@@ -6134,8 +6134,8 @@ public static final void gtk_cell_layout_clear(int /*long*/ cell_layout) {
+@@ -6108,8 +6108,8 @@ public static final void gtk_cell_layout_clear(int /*long*/ cell_layout) {
}
}
/** @method flags=dynamic */
@@ -20176,7 +20273,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_cell_layout_get_cells(cell_layout);
-@@ -6144,8 +6144,8 @@ public static final int /*long*/ gtk_cell_layout_get_cells(int /*long*/ cell_lay
+@@ -6118,8 +6118,8 @@ public static final int /*long*/ gtk_cell_layout_get_cells(int /*long*/ cell_lay
}
}
/** @method flags=no_gen */
@@ -20187,7 +20284,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_cell_layout_set_attributes(cell_layout, cell, attribute, column, sentinel);
-@@ -6154,8 +6154,8 @@ public static final void gtk_cell_layout_set_attributes(int /*long*/ cell_layout
+@@ -6128,8 +6128,8 @@ public static final void gtk_cell_layout_set_attributes(int /*long*/ cell_layout
}
}
/** @method flags=dynamic */
@@ -20198,7 +20295,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_cell_layout_pack_start(cell_layout, cell, expand);
-@@ -6172,8 +6172,8 @@ public static final void gtk_cell_layout_pack_start(int /*long*/ cell_layout, in
+@@ -6146,8 +6146,8 @@ public static final void gtk_cell_layout_pack_start(int /*long*/ cell_layout, in
* @param width cast=(gint *)
* @param height cast=(gint *)
*/
@@ -20209,7 +20306,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_cell_renderer_get_size(cell, widget, area, x_offset, y_offset, width, height);
-@@ -6181,8 +6181,8 @@ public static final void gtk_cell_renderer_get_size(int /*long*/ cell, int /*lon
+@@ -6155,8 +6155,8 @@ public static final void gtk_cell_renderer_get_size(int /*long*/ cell, int /*lon
lock.unlock();
}
}
@@ -20220,7 +20317,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_cell_renderer_pixbuf_new();
-@@ -6190,8 +6190,8 @@ public static final int /*long*/ gtk_cell_renderer_pixbuf_new() {
+@@ -6164,8 +6164,8 @@ public static final int /*long*/ gtk_cell_renderer_pixbuf_new() {
lock.unlock();
}
}
@@ -20231,7 +20328,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_cell_renderer_text_new();
-@@ -6199,8 +6199,8 @@ public static final int /*long*/ gtk_cell_renderer_text_new() {
+@@ -6173,8 +6173,8 @@ public static final int /*long*/ gtk_cell_renderer_text_new() {
lock.unlock();
}
}
@@ -20242,7 +20339,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_cell_renderer_toggle_new();
-@@ -6208,8 +6208,8 @@ public static final int /*long*/ gtk_cell_renderer_toggle_new() {
+@@ -6182,8 +6182,8 @@ public static final int /*long*/ gtk_cell_renderer_toggle_new() {
lock.unlock();
}
}
@@ -20253,7 +20350,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_check_button_new();
-@@ -6218,8 +6218,8 @@ public static final int /*long*/ gtk_check_button_new() {
+@@ -6192,8 +6192,8 @@ public static final int /*long*/ gtk_check_button_new() {
}
}
/** @param check_menu_item cast=(GtkCheckMenuItem *) */
@@ -20264,7 +20361,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_check_menu_item_get_active(check_menu_item);
-@@ -6228,8 +6228,8 @@ public static final boolean gtk_check_menu_item_get_active(int /*long*/ check_me
+@@ -6202,8 +6202,8 @@ public static final boolean gtk_check_menu_item_get_active(int /*long*/ check_me
}
}
/** @param label cast=(const gchar *) */
@@ -20275,7 +20372,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_check_menu_item_new_with_label(label);
-@@ -6241,8 +6241,8 @@ public static final int /*long*/ gtk_check_menu_item_new_with_label(byte[] label
+@@ -6215,8 +6215,8 @@ public static final int /*long*/ gtk_check_menu_item_new_with_label(byte[] label
* @param wid cast=(GtkCheckMenuItem *)
* @param active cast=(gboolean)
*/
@@ -20286,7 +20383,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_check_menu_item_set_active(wid, active);
-@@ -6250,8 +6250,8 @@ public static final void gtk_check_menu_item_set_active(int /*long*/ wid, boolea
+@@ -6224,8 +6224,8 @@ public static final void gtk_check_menu_item_set_active(int /*long*/ wid, boolea
lock.unlock();
}
}
@@ -20297,7 +20394,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_check_version(required_major, required_minor, required_micro);
-@@ -6260,8 +6260,8 @@ public static final int /*long*/ gtk_check_version(int required_major, int requi
+@@ -6234,8 +6234,8 @@ public static final int /*long*/ gtk_check_version(int required_major, int requi
}
}
/** @param clipboard cast=(GtkClipboard *) */
@@ -20308,7 +20405,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_clipboard_clear(clipboard);
-@@ -6270,8 +6270,8 @@ public static final void gtk_clipboard_clear(int /*long*/ clipboard) {
+@@ -6244,8 +6244,8 @@ public static final void gtk_clipboard_clear(int /*long*/ clipboard) {
}
}
/** @param selection cast=(GdkAtom) */
@@ -20319,7 +20416,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_clipboard_get(selection);
-@@ -6287,8 +6287,8 @@ public static final int /*long*/ gtk_clipboard_get(int /*long*/ selection) {
+@@ -6261,8 +6261,8 @@ public static final int /*long*/ gtk_clipboard_get(int /*long*/ selection) {
* @param clear_func cast=(GtkClipboardClearFunc)
* @param user_data cast=(GObject *)
*/
@@ -20330,7 +20427,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_clipboard_set_with_data(clipboard, target, n_targets, get_func, clear_func, user_data);
-@@ -6304,8 +6304,8 @@ public static final boolean gtk_clipboard_set_with_data(int /*long*/ clipboard,
+@@ -6278,8 +6278,8 @@ public static final boolean gtk_clipboard_set_with_data(int /*long*/ clipboard,
* @param clear_func cast=(GtkClipboardClearFunc)
* @param user_data cast=(GObject *)
*/
@@ -20341,7 +20438,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_clipboard_set_with_owner(clipboard, target, n_targets, get_func, clear_func, user_data);
-@@ -6319,8 +6319,8 @@ public static final boolean gtk_clipboard_set_with_owner(int /*long*/ clipboard,
+@@ -6293,8 +6293,8 @@ public static final boolean gtk_clipboard_set_with_owner(int /*long*/ clipboard,
* @param targets cast=(const GtkTargetEntry *)
* @param n_targets cast=(gint)
*/
@@ -20352,7 +20449,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_clipboard_set_can_store(clipboard, targets, n_targets);
-@@ -6332,8 +6332,8 @@ public static final void gtk_clipboard_set_can_store(int /*long*/ clipboard, int
+@@ -6306,8 +6306,8 @@ public static final void gtk_clipboard_set_can_store(int /*long*/ clipboard, int
* @method flags=dynamic
* @param clipboard cast=(GtkClipboard *)
*/
@@ -20363,7 +20460,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_clipboard_store(clipboard);
-@@ -6345,8 +6345,8 @@ public static final void gtk_clipboard_store(int /*long*/ clipboard) {
+@@ -6319,8 +6319,8 @@ public static final void gtk_clipboard_store(int /*long*/ clipboard) {
* @param clipboard cast=(GtkClipboard *)
* @param target cast=(GdkAtom)
*/
@@ -20374,7 +20471,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_clipboard_wait_for_contents(clipboard, target);
-@@ -6355,8 +6355,8 @@ public static final int /*long*/ gtk_clipboard_wait_for_contents(int /*long*/ cl
+@@ -6329,8 +6329,8 @@ public static final int /*long*/ gtk_clipboard_wait_for_contents(int /*long*/ cl
}
}
/** @param title cast=(const gchar *) */
@@ -20385,7 +20482,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_color_selection_dialog_new(title);
-@@ -6368,8 +6368,8 @@ public static final int /*long*/ gtk_color_selection_dialog_new(byte[] title) {
+@@ -6342,8 +6342,8 @@ public static final int /*long*/ gtk_color_selection_dialog_new(byte[] title) {
* @param colorsel cast=(GtkColorSelection *)
* @param color cast=(GdkColor *),flags=no_in
*/
@@ -20396,7 +20493,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_color_selection_get_current_color(colorsel, color);
-@@ -6382,8 +6382,8 @@ public static final void gtk_color_selection_get_current_color(int /*long*/ colo
+@@ -6356,8 +6356,8 @@ public static final void gtk_color_selection_get_current_color(int /*long*/ colo
* @param colors cast=(GdkColor **)
* @param n_colors cast=(gint *)
*/
@@ -20407,7 +20504,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_color_selection_palette_from_string(str, colors, n_colors);
-@@ -6395,8 +6395,8 @@ public static final void gtk_color_selection_palette_from_string(byte[] str, int
+@@ -6369,8 +6369,8 @@ public static final void gtk_color_selection_palette_from_string(byte[] str, int
* @param colors cast=(GdkColor *)
* @param n_colors cast=(gint)
*/
@@ -20418,7 +20515,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_color_selection_palette_to_string(colors, n_colors);
-@@ -6408,8 +6408,8 @@ public static final int /*long*/ gtk_color_selection_palette_to_string(int /*lon
+@@ -6382,8 +6382,8 @@ public static final int /*long*/ gtk_color_selection_palette_to_string(int /*lon
* @param colorsel cast=(GtkColorSelection *)
* @param color cast=(GdkColor *),flags=no_out
*/
@@ -20429,7 +20526,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_color_selection_set_current_color(colorsel, color);
-@@ -6418,8 +6418,8 @@ public static final void gtk_color_selection_set_current_color(int /*long*/ colo
+@@ -6392,8 +6392,8 @@ public static final void gtk_color_selection_set_current_color(int /*long*/ colo
}
}
/** @param colorsel cast=(GtkColorSelection *) */
@@ -20440,7 +20537,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_color_selection_set_has_palette(colorsel, has_palette);
-@@ -6428,8 +6428,8 @@ public static final void gtk_color_selection_set_has_palette(int /*long*/ colors
+@@ -6402,8 +6402,8 @@ public static final void gtk_color_selection_set_has_palette(int /*long*/ colors
}
}
/** @method flags=dynamic */
@@ -20451,7 +20548,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_combo_box_set_focus_on_click(combo, val);
-@@ -6438,8 +6438,8 @@ public static final void gtk_combo_box_set_focus_on_click(int /*long*/ combo, bo
+@@ -6412,8 +6412,8 @@ public static final void gtk_combo_box_set_focus_on_click(int /*long*/ combo, bo
}
}
/** @method flags=dynamic */
@@ -20462,7 +20559,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_combo_box_entry_new_text();
-@@ -6448,8 +6448,8 @@ public static final int /*long*/ gtk_combo_box_entry_new_text() {
+@@ -6422,8 +6422,8 @@ public static final int /*long*/ gtk_combo_box_entry_new_text() {
}
}
/** @method flags=dynamic */
@@ -20473,7 +20570,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_combo_box_new_text();
-@@ -6458,8 +6458,8 @@ public static final int /*long*/ gtk_combo_box_new_text() {
+@@ -6432,8 +6432,8 @@ public static final int /*long*/ gtk_combo_box_new_text() {
}
}
/** @method flags=dynamic */
@@ -20484,7 +20581,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_combo_box_insert_text(combo_box, position, text);
-@@ -6468,8 +6468,8 @@ public static final void gtk_combo_box_insert_text(int /*long*/ combo_box, int p
+@@ -6442,8 +6442,8 @@ public static final void gtk_combo_box_insert_text(int /*long*/ combo_box, int p
}
}
/** @method flags=dynamic */
@@ -20495,7 +20592,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_combo_box_remove_text(combo_box, position);
-@@ -6478,8 +6478,8 @@ public static final void gtk_combo_box_remove_text(int /*long*/ combo_box, int p
+@@ -6452,8 +6452,8 @@ public static final void gtk_combo_box_remove_text(int /*long*/ combo_box, int p
}
}
/** @method flags=dynamic */
@@ -20506,7 +20603,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_combo_box_get_active(combo_box);
-@@ -6488,8 +6488,8 @@ public static final int gtk_combo_box_get_active(int /*long*/ combo_box) {
+@@ -6462,8 +6462,8 @@ public static final int gtk_combo_box_get_active(int /*long*/ combo_box) {
}
}
/** @method flags=dynamic */
@@ -20517,7 +20614,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_combo_box_get_model(combo_box);
-@@ -6498,8 +6498,8 @@ public static final int /*long*/ gtk_combo_box_get_model(int /*long*/ combo_box)
+@@ -6472,8 +6472,8 @@ public static final int /*long*/ gtk_combo_box_get_model(int /*long*/ combo_box)
}
}
/** @method flags=dynamic */
@@ -20528,7 +20625,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_combo_box_set_active(combo_box, index);
-@@ -6508,8 +6508,8 @@ public static final void gtk_combo_box_set_active(int /*long*/ combo_box, int in
+@@ -6482,8 +6482,8 @@ public static final void gtk_combo_box_set_active(int /*long*/ combo_box, int in
}
}
/** @method flags=dynamic */
@@ -20539,7 +20636,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_combo_box_popup(combo_box);
-@@ -6518,8 +6518,8 @@ public static final void gtk_combo_box_popup(int /*long*/ combo_box) {
+@@ -6492,8 +6492,8 @@ public static final void gtk_combo_box_popup(int /*long*/ combo_box) {
}
}
/** @method flags=dynamic */
@@ -20550,7 +20647,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_combo_box_popdown(combo_box);
-@@ -6531,8 +6531,8 @@ public static final void gtk_combo_box_popdown(int /*long*/ combo_box) {
+@@ -6505,8 +6505,8 @@ public static final void gtk_combo_box_popdown(int /*long*/ combo_box) {
* @param container cast=(GtkContainer *)
* @param widget cast=(GtkWidget *)
*/
@@ -20561,7 +20658,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_container_add(container, widget);
-@@ -6545,8 +6545,8 @@ public static final void gtk_container_add(int /*long*/ container, int /*long*/
+@@ -6519,8 +6519,8 @@ public static final void gtk_container_add(int /*long*/ container, int /*long*/
* @param callback cast=(GtkCallback)
* @param callback_data cast=(gpointer)
*/
@@ -20572,7 +20669,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_container_forall(container, callback, callback_data);
-@@ -6555,8 +6555,8 @@ public static final void gtk_container_forall(int /*long*/ container, int /*long
+@@ -6529,8 +6529,8 @@ public static final void gtk_container_forall(int /*long*/ container, int /*long
}
}
/** @param container cast=(GtkContainer *) */
@@ -20583,7 +20680,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_container_get_border_width(container);
-@@ -6565,8 +6565,8 @@ public static final int gtk_container_get_border_width(int /*long*/ container) {
+@@ -6539,8 +6539,8 @@ public static final int gtk_container_get_border_width(int /*long*/ container) {
}
}
/** @param container cast=(GtkContainer *) */
@@ -20594,7 +20691,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_container_get_children(container);
-@@ -6578,8 +6578,8 @@ public static final int /*long*/ gtk_container_get_children(int /*long*/ contain
+@@ -6552,8 +6552,8 @@ public static final int /*long*/ gtk_container_get_children(int /*long*/ contain
* @param container cast=(GtkContainer *)
* @param widget cast=(GtkWidget *)
*/
@@ -20605,7 +20702,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_container_remove(container, widget);
-@@ -6588,8 +6588,8 @@ public static final void gtk_container_remove(int /*long*/ container, int /*long
+@@ -6562,8 +6562,8 @@ public static final void gtk_container_remove(int /*long*/ container, int /*long
}
}
/** @param container cast=(GtkContainer *) */
@@ -20616,7 +20713,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_container_resize_children(container);
-@@ -6601,8 +6601,8 @@ public static final void gtk_container_resize_children(int /*long*/ container) {
+@@ -6575,8 +6575,8 @@ public static final void gtk_container_resize_children(int /*long*/ container) {
* @param container cast=(GtkContainer *)
* @param border_width cast=(guint)
*/
@@ -20627,7 +20724,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_container_set_border_width(container, border_width);
-@@ -6615,8 +6615,8 @@ public static final void gtk_container_set_border_width(int /*long*/ container,
+@@ -6589,8 +6589,8 @@ public static final void gtk_container_set_border_width(int /*long*/ container,
* @param button_text cast=(const gchar *)
* @param response_id cast=(gint)
*/
@@ -20638,7 +20735,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_dialog_add_button(dialog, button_text, response_id);
-@@ -6625,8 +6625,8 @@ public static final int /*long*/ gtk_dialog_add_button(int /*long*/ dialog, byte
+@@ -6599,8 +6599,8 @@ public static final int /*long*/ gtk_dialog_add_button(int /*long*/ dialog, byte
}
}
/** @param dialog cast=(GtkDialog *) */
@@ -20649,7 +20746,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_dialog_run(dialog);
-@@ -6641,8 +6641,8 @@ public static final int gtk_dialog_run(int /*long*/ dialog) {
+@@ -6615,8 +6615,8 @@ public static final int gtk_dialog_run(int /*long*/ dialog) {
* @param button cast=(gint)
* @param event cast=(GdkEvent *)
*/
@@ -20660,7 +20757,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_drag_begin(widget, targets, actions, button, event);
-@@ -6657,8 +6657,8 @@ public static final int /*long*/ gtk_drag_begin(int /*long*/ widget, int /*long*
+@@ -6631,8 +6631,8 @@ public static final int /*long*/ gtk_drag_begin(int /*long*/ widget, int /*long*
* @param current_x cast=(gint)
* @param current_y cast=(gint)
*/
@@ -20671,7 +20768,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_drag_check_threshold(widget, start_x, start_y, current_x, current_y);
-@@ -6671,8 +6671,8 @@ public static final boolean gtk_drag_check_threshold(int /*long*/ widget, int st
+@@ -6645,8 +6645,8 @@ public static final boolean gtk_drag_check_threshold(int /*long*/ widget, int st
* @param context cast=(GdkDragContext *)
* @param target_list cast=(GtkTargetList *)
*/
@@ -20682,7 +20779,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_drag_dest_find_target(widget, context, target_list);
-@@ -6687,8 +6687,8 @@ public static final int /*long*/ gtk_drag_dest_find_target(int /*long*/ widget,
+@@ -6661,8 +6661,8 @@ public static final int /*long*/ gtk_drag_dest_find_target(int /*long*/ widget,
* @param n_targets cast=(gint)
* @param actions cast=(GdkDragAction)
*/
@@ -20693,7 +20790,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_drag_dest_set(widget, flags, targets, n_targets, actions);
-@@ -6697,8 +6697,8 @@ public static final void gtk_drag_dest_set(int /*long*/ widget, int flags, int /
+@@ -6671,8 +6671,8 @@ public static final void gtk_drag_dest_set(int /*long*/ widget, int flags, int /
}
}
/** @param widget cast=(GtkWidget *) */
@@ -20704,7 +20801,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_drag_dest_unset(widget);
-@@ -6712,8 +6712,8 @@ public static final void gtk_drag_dest_unset(int /*long*/ widget) {
+@@ -6686,8 +6686,8 @@ public static final void gtk_drag_dest_unset(int /*long*/ widget) {
* @param delete cast=(gboolean)
* @param time cast=(guint32)
*/
@@ -20715,7 +20812,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_drag_finish(context, success, delete, time);
-@@ -6727,8 +6727,8 @@ public static final void gtk_drag_finish(int /*long*/ context, boolean success,
+@@ -6701,8 +6701,8 @@ public static final void gtk_drag_finish(int /*long*/ context, boolean success,
* @param target cast=(GdkAtom)
* @param time cast=(guint32)
*/
@@ -20726,7 +20823,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_drag_get_data(widget, context, target, time);
-@@ -6740,8 +6740,8 @@ public static final void gtk_drag_get_data(int /*long*/ widget, int /*long*/ con
+@@ -6714,8 +6714,8 @@ public static final void gtk_drag_get_data(int /*long*/ widget, int /*long*/ con
* @param context cast=(GdkDragContext *)
* @param pixbuf cast=(GdkPixbuf *)
*/
@@ -20737,7 +20834,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_drag_set_icon_pixbuf(context, pixbuf, hot_x, hot_y);
-@@ -6749,8 +6749,8 @@ public static final void gtk_drag_set_icon_pixbuf(int /*long*/ context, int /*lo
+@@ -6723,8 +6723,8 @@ public static final void gtk_drag_set_icon_pixbuf(int /*long*/ context, int /*lo
lock.unlock();
}
}
@@ -20748,7 +20845,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_drawing_area_new();
-@@ -6759,8 +6759,8 @@ public static final int /*long*/ gtk_drawing_area_new() {
+@@ -6733,8 +6733,8 @@ public static final int /*long*/ gtk_drawing_area_new() {
}
}
/** @param editable cast=(GtkEditable *) */
@@ -20759,7 +20856,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_editable_copy_clipboard(editable);
-@@ -6769,8 +6769,8 @@ public static final void gtk_editable_copy_clipboard(int /*long*/ editable) {
+@@ -6743,8 +6743,8 @@ public static final void gtk_editable_copy_clipboard(int /*long*/ editable) {
}
}
/** @param editable cast=(GtkEditable *) */
@@ -20770,7 +20867,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_editable_cut_clipboard(editable);
-@@ -6779,8 +6779,8 @@ public static final void gtk_editable_cut_clipboard(int /*long*/ editable) {
+@@ -6753,8 +6753,8 @@ public static final void gtk_editable_cut_clipboard(int /*long*/ editable) {
}
}
/** @param editable cast=(GtkEditable *) */
@@ -20781,7 +20878,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_editable_delete_selection(editable);
-@@ -6793,8 +6793,8 @@ public static final void gtk_editable_delete_selection(int /*long*/ editable) {
+@@ -6767,8 +6767,8 @@ public static final void gtk_editable_delete_selection(int /*long*/ editable) {
* @param start_pos cast=(gint)
* @param end_pos cast=(gint)
*/
@@ -20792,7 +20889,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_editable_delete_text(editable, start_pos, end_pos);
-@@ -6807,8 +6807,8 @@ public static final void gtk_editable_delete_text(int /*long*/ editable, int sta
+@@ -6781,8 +6781,8 @@ public static final void gtk_editable_delete_text(int /*long*/ editable, int sta
* @param start_pos cast=(gint)
* @param end_pos cast=(gint)
*/
@@ -20803,7 +20900,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_editable_get_chars(editable, start_pos, end_pos);
-@@ -6817,8 +6817,8 @@ public static final int /*long*/ gtk_editable_get_chars(int /*long*/ editable, i
+@@ -6791,8 +6791,8 @@ public static final int /*long*/ gtk_editable_get_chars(int /*long*/ editable, i
}
}
/** @param editable cast=(GtkEditable *) */
@@ -20814,7 +20911,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_editable_get_editable(editable);
-@@ -6827,8 +6827,8 @@ public static final boolean gtk_editable_get_editable(int /*long*/ editable) {
+@@ -6801,8 +6801,8 @@ public static final boolean gtk_editable_get_editable(int /*long*/ editable) {
}
}
/** @param editable cast=(GtkEditable *) */
@@ -20825,7 +20922,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_editable_get_position(editable);
-@@ -6841,8 +6841,8 @@ public static final int gtk_editable_get_position(int /*long*/ editable) {
+@@ -6815,8 +6815,8 @@ public static final int gtk_editable_get_position(int /*long*/ editable) {
* @param start cast=(gint *)
* @param end cast=(gint *)
*/
@@ -20836,7 +20933,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_editable_get_selection_bounds(editable, start, end);
-@@ -6856,8 +6856,8 @@ public static final boolean gtk_editable_get_selection_bounds(int /*long*/ edita
+@@ -6830,8 +6830,8 @@ public static final boolean gtk_editable_get_selection_bounds(int /*long*/ edita
* @param new_text_length cast=(gint)
* @param position cast=(gint *)
*/
@@ -20847,7 +20944,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_editable_insert_text(editable, new_text, new_text_length, position);
-@@ -6866,8 +6866,8 @@ public static final void gtk_editable_insert_text(int /*long*/ editable, byte[]
+@@ -6840,8 +6840,8 @@ public static final void gtk_editable_insert_text(int /*long*/ editable, byte[]
}
}
/** @param editable cast=(GtkEditable *) */
@@ -20858,7 +20955,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_editable_paste_clipboard(editable);
-@@ -6880,8 +6880,8 @@ public static final void gtk_editable_paste_clipboard(int /*long*/ editable) {
+@@ -6854,8 +6854,8 @@ public static final void gtk_editable_paste_clipboard(int /*long*/ editable) {
* @param start cast=(gint)
* @param end cast=(gint)
*/
@@ -20869,7 +20966,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_editable_select_region(editable, start, end);
-@@ -6893,8 +6893,8 @@ public static final void gtk_editable_select_region(int /*long*/ editable, int s
+@@ -6867,8 +6867,8 @@ public static final void gtk_editable_select_region(int /*long*/ editable, int s
* @param entry cast=(GtkEditable *)
* @param editable cast=(gboolean)
*/
@@ -20880,7 +20977,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_editable_set_editable(entry, editable);
-@@ -6906,8 +6906,8 @@ public static final void gtk_editable_set_editable(int /*long*/ entry, boolean e
+@@ -6880,8 +6880,8 @@ public static final void gtk_editable_set_editable(int /*long*/ entry, boolean e
* @param editable cast=(GtkEditable *)
* @param position cast=(gint)
*/
@@ -20891,7 +20988,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_editable_set_position(editable, position);
-@@ -6916,8 +6916,8 @@ public static final void gtk_editable_set_position(int /*long*/ editable, int po
+@@ -6890,8 +6890,8 @@ public static final void gtk_editable_set_position(int /*long*/ editable, int po
}
}
/** @method flags=dynamic */
@@ -20902,7 +20999,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_entry_get_inner_border(entry);
-@@ -6926,8 +6926,8 @@ public static final int /*long*/ gtk_entry_get_inner_border (int /*long*/ entry)
+@@ -6900,8 +6900,8 @@ public static final int /*long*/ gtk_entry_get_inner_border (int /*long*/ entry)
}
}
/** @param entry cast=(GtkEntry *) */
@@ -20913,7 +21010,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_entry_get_invisible_char(entry);
-@@ -6936,8 +6936,8 @@ public static final char gtk_entry_get_invisible_char(int /*long*/ entry) {
+@@ -6910,8 +6910,8 @@ public static final char gtk_entry_get_invisible_char(int /*long*/ entry) {
}
}
/** @param entry cast=(GtkEntry *) */
@@ -20924,7 +21021,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_entry_get_layout(entry);
-@@ -6946,8 +6946,8 @@ public static final int /*long*/ gtk_entry_get_layout (int /*long*/ entry) {
+@@ -6920,8 +6920,8 @@ public static final int /*long*/ gtk_entry_get_layout (int /*long*/ entry) {
}
}
/** @param entry cast=(GtkEntry *) */
@@ -20935,7 +21032,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_entry_get_layout_offsets(entry, x, y);
-@@ -6956,8 +6956,8 @@ public static final void gtk_entry_get_layout_offsets (int /*long*/ entry, int[]
+@@ -6930,8 +6930,8 @@ public static final void gtk_entry_get_layout_offsets (int /*long*/ entry, int[]
}
}
/** @method flags=dynamic */
@@ -20946,7 +21043,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_entry_text_index_to_layout_index(entry, index);
-@@ -6966,8 +6966,8 @@ public static final int gtk_entry_text_index_to_layout_index (int /*long*/ entry
+@@ -6940,8 +6940,8 @@ public static final int gtk_entry_text_index_to_layout_index (int /*long*/ entry
}
}
/** @param entry cast=(GtkEntry *) */
@@ -20957,7 +21054,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_entry_get_max_length(entry);
-@@ -6976,8 +6976,8 @@ public static final int gtk_entry_get_max_length(int /*long*/ entry) {
+@@ -6950,8 +6950,8 @@ public static final int gtk_entry_get_max_length(int /*long*/ entry) {
}
}
/** @param entry cast=(GtkEntry *) */
@@ -20968,7 +21065,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_entry_get_text(entry);
-@@ -6986,8 +6986,8 @@ public static final int /*long*/ gtk_entry_get_text(int /*long*/ entry) {
+@@ -6960,8 +6960,8 @@ public static final int /*long*/ gtk_entry_get_text(int /*long*/ entry) {
}
}
/** @method flags=dynamic */
@@ -20979,7 +21076,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _FcConfigAppFontAddFile(config, file);
-@@ -6996,8 +6996,8 @@ public static final boolean FcConfigAppFontAddFile(int /*long*/ config, byte[] f
+@@ -6970,8 +6970,8 @@ public static final boolean FcConfigAppFontAddFile(int /*long*/ config, byte[] f
}
}
/** @param entry cast=(GtkEntry *) */
@@ -20990,7 +21087,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_entry_get_visibility(entry);
-@@ -7005,8 +7005,8 @@ public static final boolean gtk_entry_get_visibility(int /*long*/ entry) {
+@@ -6979,8 +6979,8 @@ public static final boolean gtk_entry_get_visibility(int /*long*/ entry) {
lock.unlock();
}
}
@@ -21001,7 +21098,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_entry_new();
-@@ -7018,8 +7018,8 @@ public static final int /*long*/ gtk_entry_new() {
+@@ -6992,8 +6992,8 @@ public static final int /*long*/ gtk_entry_new() {
* @param entry cast=(GtkEntry *)
* @param setting cast=(gboolean)
*/
@@ -21012,7 +21109,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_entry_set_activates_default(entry, setting);
-@@ -7032,8 +7032,8 @@ public static final void gtk_entry_set_activates_default(int /*long*/ entry, boo
+@@ -7006,8 +7006,8 @@ public static final void gtk_entry_set_activates_default(int /*long*/ entry, boo
* @param entry cast=(GtkEntry *)
* @param xalign cast=(gfloat)
*/
@@ -21023,7 +21120,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_entry_set_alignment(entry, xalign);
-@@ -7045,8 +7045,8 @@ public static final void gtk_entry_set_alignment(int /*long*/ entry, float xalig
+@@ -7019,8 +7019,8 @@ public static final void gtk_entry_set_alignment(int /*long*/ entry, float xalig
* @param entry cast=(GtkEntry *)
* @param setting cast=(gboolean)
*/
@@ -21034,7 +21131,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_entry_set_has_frame(entry, setting);
-@@ -7055,8 +7055,8 @@ public static final void gtk_entry_set_has_frame(int /*long*/ entry, boolean set
+@@ -7029,8 +7029,8 @@ public static final void gtk_entry_set_has_frame(int /*long*/ entry, boolean set
}
}
/** @method flags=dynamic */
@@ -21045,7 +21142,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_entry_set_icon_from_stock(entry, icon, stock);
-@@ -7065,8 +7065,8 @@ public static final void gtk_entry_set_icon_from_stock(int /*long*/ entry, int i
+@@ -7039,8 +7039,8 @@ public static final void gtk_entry_set_icon_from_stock(int /*long*/ entry, int i
}
}
/** @method flags=dynamic */
@@ -21056,7 +21153,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_entry_set_icon_sensitive(entry, icon_pos, sensitive);
-@@ -7078,8 +7078,8 @@ public static final void gtk_entry_set_icon_sensitive(int /*long*/ entry, int ic
+@@ -7052,8 +7052,8 @@ public static final void gtk_entry_set_icon_sensitive(int /*long*/ entry, int ic
* @param entry cast=(GtkEntry *)
* @param ch cast=(gint)
*/
@@ -21067,7 +21164,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_entry_set_invisible_char(entry, ch);
-@@ -7091,8 +7091,8 @@ public static final void gtk_entry_set_invisible_char(int /*long*/ entry, char c
+@@ -7065,8 +7065,8 @@ public static final void gtk_entry_set_invisible_char(int /*long*/ entry, char c
* @param entry cast=(GtkEntry *)
* @param max cast=(gint)
*/
@@ -21078,7 +21175,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_entry_set_max_length(entry, max);
-@@ -7104,8 +7104,8 @@ public static final void gtk_entry_set_max_length(int /*long*/ entry, int max) {
+@@ -7078,8 +7078,8 @@ public static final void gtk_entry_set_max_length(int /*long*/ entry, int max) {
* @param entry cast=(GtkEntry *)
* @param text cast=(const gchar *)
*/
@@ -21089,7 +21186,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_entry_set_text(entry, text);
-@@ -7117,8 +7117,8 @@ public static final void gtk_entry_set_text(int /*long*/ entry, byte[] text) {
+@@ -7091,8 +7091,8 @@ public static final void gtk_entry_set_text(int /*long*/ entry, byte[] text) {
* @param entry cast=(GtkEntry *)
* @param visible cast=(gboolean)
*/
@@ -21100,7 +21197,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_entry_set_visibility(entry, visible);
-@@ -7136,8 +7136,8 @@ public static final int gtk_events_pending() {
+@@ -7110,8 +7110,8 @@ public static final int gtk_events_pending() {
}
}
/** @method flags=dynamic */
@@ -21111,7 +21208,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_expander_get_expanded(expander);
-@@ -7146,8 +7146,8 @@ public static final boolean gtk_expander_get_expanded(int /*long*/ expander) {
+@@ -7120,8 +7120,8 @@ public static final boolean gtk_expander_get_expanded(int /*long*/ expander) {
}
}
/** @method flags=dynamic */
@@ -21122,7 +21219,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_expander_get_label_widget(expander);
-@@ -7159,8 +7159,8 @@ public static final int /*long*/ gtk_expander_get_label_widget(int /*long*/ expa
+@@ -7133,8 +7133,8 @@ public static final int /*long*/ gtk_expander_get_label_widget(int /*long*/ expa
* @method flags=dynamic
* @param label cast=(const gchar *)
*/
@@ -21133,7 +21230,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_expander_new(label);
-@@ -7169,8 +7169,8 @@ public static final int /*long*/ gtk_expander_new(byte[] label) {
+@@ -7143,8 +7143,8 @@ public static final int /*long*/ gtk_expander_new(byte[] label) {
}
}
/** @method flags=dynamic */
@@ -21144,7 +21241,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_expander_set_expanded(expander, expanded);
-@@ -7182,8 +7182,8 @@ public static final void gtk_expander_set_expanded(int /*long*/ expander, boolea
+@@ -7156,8 +7156,8 @@ public static final void gtk_expander_set_expanded(int /*long*/ expander, boolea
* @method flags=dynamic
* @param label cast=(const gchar *)
*/
@@ -21155,7 +21252,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_expander_set_label(expander, label);
-@@ -7192,8 +7192,8 @@ public static final void gtk_expander_set_label(int /*long*/ expander, byte[] la
+@@ -7166,8 +7166,8 @@ public static final void gtk_expander_set_label(int /*long*/ expander, byte[] la
}
}
/** @method flags=dynamic */
@@ -21166,7 +21263,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_expander_set_label_widget(expander, label_widget);
-@@ -7202,8 +7202,8 @@ public static final void gtk_expander_set_label_widget(int /*long*/ expander, i
+@@ -7176,8 +7176,8 @@ public static final void gtk_expander_set_label_widget(int /*long*/ expander, i
}
}
/** @method flags=dynamic */
@@ -21177,7 +21274,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_file_chooser_add_filter(chooser, filter);
-@@ -7212,8 +7212,8 @@ public static final void gtk_file_chooser_add_filter(int /*long*/ chooser, int /
+@@ -7186,8 +7186,8 @@ public static final void gtk_file_chooser_add_filter(int /*long*/ chooser, int /
}
}
/** @method flags=no_gen */
@@ -21188,7 +21285,7 @@ index 5306e6e..15bf432 100644
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);
-@@ -7222,8 +7222,8 @@ public static final int /*long*/ gtk_file_chooser_dialog_new(byte[] title, int /
+@@ -7196,8 +7196,8 @@ public static final int /*long*/ gtk_file_chooser_dialog_new(byte[] title, int /
}
}
/** @method flags=dynamic */
@@ -21199,7 +21296,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_file_chooser_get_current_folder(chooser);
-@@ -7232,8 +7232,8 @@ public static final int /*long*/ gtk_file_chooser_get_current_folder(int /*long*
+@@ -7206,8 +7206,8 @@ public static final int /*long*/ gtk_file_chooser_get_current_folder(int /*long*
}
}
/** @method flags=dynamic */
@@ -21210,7 +21307,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_file_chooser_get_filename(chooser);
-@@ -7242,8 +7242,8 @@ public static final int /*long*/ gtk_file_chooser_get_filename(int /*long*/ choo
+@@ -7216,8 +7216,8 @@ public static final int /*long*/ gtk_file_chooser_get_filename(int /*long*/ choo
}
}
/** @method flags=dynamic */
@@ -21221,7 +21318,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_file_chooser_get_filenames(chooser);
-@@ -7252,8 +7252,8 @@ public static final int /*long*/ gtk_file_chooser_get_filenames(int /*long*/ cho
+@@ -7226,8 +7226,8 @@ public static final int /*long*/ gtk_file_chooser_get_filenames(int /*long*/ cho
}
}
/** @method flags=dynamic */
@@ -21232,7 +21329,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_file_chooser_get_uri(chooser);
-@@ -7262,8 +7262,8 @@ public static final int /*long*/ gtk_file_chooser_get_uri(int /*long*/ chooser)
+@@ -7236,8 +7236,8 @@ public static final int /*long*/ gtk_file_chooser_get_uri(int /*long*/ chooser)
}
}
/** @method flags=dynamic */
@@ -21243,7 +21340,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_file_chooser_get_uris(chooser);
-@@ -7272,8 +7272,8 @@ public static final int /*long*/ gtk_file_chooser_get_uris(int /*long*/ chooser)
+@@ -7246,8 +7246,8 @@ public static final int /*long*/ gtk_file_chooser_get_uris(int /*long*/ chooser)
}
}
/** @method flags=dynamic */
@@ -21254,7 +21351,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_file_chooser_get_filter(chooser);
-@@ -7282,8 +7282,8 @@ public static final int /*long*/ gtk_file_chooser_get_filter(int /*long*/ choose
+@@ -7256,8 +7256,8 @@ public static final int /*long*/ gtk_file_chooser_get_filter(int /*long*/ choose
}
}
/** @method flags=dynamic */
@@ -21265,7 +21362,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_file_chooser_set_current_folder(chooser, filename);
-@@ -7292,8 +7292,8 @@ public static final void gtk_file_chooser_set_current_folder(int /*long*/ choose
+@@ -7266,8 +7266,8 @@ public static final void gtk_file_chooser_set_current_folder(int /*long*/ choose
}
}
/** @method flags=dynamic */
@@ -21276,7 +21373,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_file_chooser_set_current_folder_uri(chooser, uri);
-@@ -7302,8 +7302,8 @@ public static final void gtk_file_chooser_set_current_folder_uri(int /*long*/ ch
+@@ -7276,8 +7276,8 @@ public static final void gtk_file_chooser_set_current_folder_uri(int /*long*/ ch
}
}
/** @method flags=dynamic */
@@ -21287,7 +21384,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_file_chooser_set_current_name(chooser, name);
-@@ -7312,8 +7312,8 @@ public static final void gtk_file_chooser_set_current_name(int /*long*/ chooser,
+@@ -7286,8 +7286,8 @@ public static final void gtk_file_chooser_set_current_name(int /*long*/ chooser,
}
}
/** @method flags=dynamic */
@@ -21298,7 +21395,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_file_chooser_set_local_only(chooser, local_only);
-@@ -7322,8 +7322,8 @@ public static final void gtk_file_chooser_set_local_only(int /*long*/ chooser, b
+@@ -7296,8 +7296,8 @@ public static final void gtk_file_chooser_set_local_only(int /*long*/ chooser, b
}
}
/** @method flags=dynamic */
@@ -21309,7 +21406,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_file_chooser_set_do_overwrite_confirmation(chooser, do_overwrite_confirmation);
-@@ -7332,8 +7332,8 @@ public static final void gtk_file_chooser_set_do_overwrite_confirmation(int /*lo
+@@ -7306,8 +7306,8 @@ public static final void gtk_file_chooser_set_do_overwrite_confirmation(int /*lo
}
}
/** @method flags=dynamic */
@@ -21320,7 +21417,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_file_chooser_set_extra_widget(chooser, extra_widget);
-@@ -7342,8 +7342,8 @@ public static final void gtk_file_chooser_set_extra_widget(int /*long*/ chooser,
+@@ -7316,8 +7316,8 @@ public static final void gtk_file_chooser_set_extra_widget(int /*long*/ chooser,
}
}
/** @method flags=dynamic */
@@ -21331,7 +21428,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_file_chooser_set_filename(chooser, name);
-@@ -7352,8 +7352,8 @@ public static final void gtk_file_chooser_set_filename(int /*long*/ chooser, int
+@@ -7326,8 +7326,8 @@ public static final void gtk_file_chooser_set_filename(int /*long*/ chooser, int
}
}
/** @method flags=dynamic */
@@ -21342,7 +21439,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_file_chooser_set_filter(chooser, filter);
-@@ -7362,8 +7362,8 @@ public static final void gtk_file_chooser_set_filter(int /*long*/ chooser, int /
+@@ -7336,8 +7336,8 @@ public static final void gtk_file_chooser_set_filter(int /*long*/ chooser, int /
}
}
/** @method flags=dynamic */
@@ -21353,7 +21450,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_file_chooser_set_uri(chooser, uri);
-@@ -7372,8 +7372,8 @@ public static final void gtk_file_chooser_set_uri(int /*long*/ chooser, byte []
+@@ -7346,8 +7346,8 @@ public static final void gtk_file_chooser_set_uri(int /*long*/ chooser, byte []
}
}
/** @method flags=dynamic */
@@ -21364,7 +21461,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_file_chooser_set_select_multiple(chooser, select_multiple);
-@@ -7382,8 +7382,8 @@ public static final void gtk_file_chooser_set_select_multiple(int /*long*/ choos
+@@ -7356,8 +7356,8 @@ public static final void gtk_file_chooser_set_select_multiple(int /*long*/ choos
}
}
/** @method flags=dynamic */
@@ -21375,7 +21472,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_file_filter_add_pattern(filter, pattern);
-@@ -7392,8 +7392,8 @@ public static final void gtk_file_filter_add_pattern(int /*long*/ filter, byte[]
+@@ -7366,8 +7366,8 @@ public static final void gtk_file_filter_add_pattern(int /*long*/ filter, byte[]
}
}
/** @method flags=dynamic */
@@ -21386,7 +21483,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_file_filter_new();
-@@ -7402,8 +7402,8 @@ public static final int /*long*/ gtk_file_filter_new() {
+@@ -7376,8 +7376,8 @@ public static final int /*long*/ gtk_file_filter_new() {
}
}
/** @method flags=dynamic */
@@ -21397,7 +21494,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_file_filter_get_name(filter);
-@@ -7412,8 +7412,8 @@ public static final int /*long*/ gtk_file_filter_get_name(int /*long*/ filter) {
+@@ -7386,8 +7386,8 @@ public static final int /*long*/ gtk_file_filter_get_name(int /*long*/ filter) {
}
}
/** @method flags=dynamic */
@@ -21408,7 +21505,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_file_filter_set_name(filter, name);
-@@ -7427,8 +7427,8 @@ public static final void gtk_file_filter_set_name(int /*long*/ filter, byte[] na
+@@ -7401,8 +7401,8 @@ public static final void gtk_file_filter_set_name(int /*long*/ filter, byte[] na
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -21419,7 +21516,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_fixed_move(fixed, widget, x, y);
-@@ -7436,8 +7436,8 @@ public static final void gtk_fixed_move(int /*long*/ fixed, int /*long*/ widget,
+@@ -7410,8 +7410,8 @@ public static final void gtk_fixed_move(int /*long*/ fixed, int /*long*/ widget,
lock.unlock();
}
}
@@ -21430,7 +21527,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_fixed_new();
-@@ -7449,8 +7449,8 @@ public static final int /*long*/ gtk_fixed_new() {
+@@ -7423,8 +7423,8 @@ public static final int /*long*/ gtk_fixed_new() {
* @param fixed cast=(GtkFixed *)
* @param has_window cast=(gboolean)
*/
@@ -21441,7 +21538,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_fixed_set_has_window(fixed, has_window);
-@@ -7459,8 +7459,8 @@ public static final void gtk_fixed_set_has_window(int /*long*/ fixed, boolean ha
+@@ -7433,8 +7433,8 @@ public static final void gtk_fixed_set_has_window(int /*long*/ fixed, boolean ha
}
}
/** @param fsd cast=(GtkFontSelectionDialog *) */
@@ -21452,7 +21549,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_font_selection_dialog_get_font_name(fsd);
-@@ -7469,8 +7469,8 @@ public static final int /*long*/ gtk_font_selection_dialog_get_font_name(int /*l
+@@ -7443,8 +7443,8 @@ public static final int /*long*/ gtk_font_selection_dialog_get_font_name(int /*l
}
}
/** @param title cast=(const gchar *) */
@@ -21463,7 +21560,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_font_selection_dialog_new(title);
-@@ -7482,8 +7482,8 @@ public static final int /*long*/ gtk_font_selection_dialog_new(byte[] title) {
+@@ -7456,8 +7456,8 @@ public static final int /*long*/ gtk_font_selection_dialog_new(byte[] title) {
* @param fsd cast=(GtkFontSelectionDialog *)
* @param fontname cast=(const gchar *)
*/
@@ -21474,7 +21571,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_font_selection_dialog_set_font_name(fsd, fontname);
-@@ -7492,8 +7492,8 @@ public static final boolean gtk_font_selection_dialog_set_font_name(int /*long*/
+@@ -7466,8 +7466,8 @@ public static final boolean gtk_font_selection_dialog_set_font_name(int /*long*/
}
}
/** @param label cast=(const gchar *) */
@@ -21485,7 +21582,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_frame_new(label);
-@@ -7502,8 +7502,8 @@ public static final int /*long*/ gtk_frame_new(byte[] label) {
+@@ -7476,8 +7476,8 @@ public static final int /*long*/ gtk_frame_new(byte[] label) {
}
}
/** @param frame cast=(GtkFrame *) */
@@ -21496,7 +21593,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_frame_get_label_widget(frame);
-@@ -7515,8 +7515,8 @@ public static final int /*long*/ gtk_frame_get_label_widget(int /*long*/ frame)
+@@ -7489,8 +7489,8 @@ public static final int /*long*/ gtk_frame_get_label_widget(int /*long*/ frame)
* @param frame cast=(GtkFrame *)
* @param label cast=(const gchar *)
*/
@@ -21507,7 +21604,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_frame_set_label(frame, label);
-@@ -7528,8 +7528,8 @@ public static final void gtk_frame_set_label(int /*long*/ frame, byte[] label) {
+@@ -7502,8 +7502,8 @@ public static final void gtk_frame_set_label(int /*long*/ frame, byte[] label) {
* @param frame cast=(GtkFrame *)
* @param label_widget cast=(GtkWidget *)
*/
@@ -21518,7 +21615,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_frame_set_label_widget(frame, label_widget);
-@@ -7541,8 +7541,8 @@ public static final void gtk_frame_set_label_widget(int /*long*/ frame, int /*lo
+@@ -7515,8 +7515,8 @@ public static final void gtk_frame_set_label_widget(int /*long*/ frame, int /*lo
* @param frame cast=(GtkFrame *)
* @param type cast=(GtkShadowType)
*/
@@ -21529,7 +21626,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_frame_set_shadow_type(frame, type);
-@@ -7550,8 +7550,8 @@ public static final void gtk_frame_set_shadow_type(int /*long*/ frame, int type)
+@@ -7524,8 +7524,8 @@ public static final void gtk_frame_set_shadow_type(int /*long*/ frame, int type)
lock.unlock();
}
}
@@ -21540,7 +21637,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_get_current_event();
-@@ -7578,8 +7578,8 @@ public static final int gtk_get_current_event_time() {
+@@ -7552,8 +7552,8 @@ public static final int gtk_get_current_event_time() {
lock.unlock();
}
}
@@ -21551,7 +21648,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_get_default_language();
-@@ -7588,8 +7588,8 @@ public static final int /*long*/ gtk_get_default_language() {
+@@ -7562,8 +7562,8 @@ public static final int /*long*/ gtk_get_default_language() {
}
}
/** @param event cast=(GdkEvent *) */
@@ -21562,7 +21659,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_get_event_widget(event);
-@@ -7598,8 +7598,8 @@ public static final int /*long*/ gtk_get_event_widget(int /*long*/ event) {
+@@ -7572,8 +7572,8 @@ public static final int /*long*/ gtk_get_event_widget(int /*long*/ event) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -21573,7 +21670,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_grab_add(widget);
-@@ -7607,8 +7607,8 @@ public static final void gtk_grab_add(int /*long*/ widget) {
+@@ -7581,8 +7581,8 @@ public static final void gtk_grab_add(int /*long*/ widget) {
lock.unlock();
}
}
@@ -21584,7 +21681,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_grab_get_current();
-@@ -7617,8 +7617,8 @@ public static final int /*long*/ gtk_grab_get_current() {
+@@ -7591,8 +7591,8 @@ public static final int /*long*/ gtk_grab_get_current() {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -21595,7 +21692,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_grab_remove(widget);
-@@ -7630,8 +7630,8 @@ public static final void gtk_grab_remove(int /*long*/ widget) {
+@@ -7604,8 +7604,8 @@ public static final void gtk_grab_remove(int /*long*/ widget) {
* @param homogeneous cast=(gboolean)
* @param spacing cast=(gint)
*/
@@ -21606,7 +21703,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_hbox_new(homogeneous, spacing);
-@@ -7640,8 +7640,8 @@ public static final int /*long*/ gtk_hbox_new(boolean homogeneous, int spacing)
+@@ -7614,8 +7614,8 @@ public static final int /*long*/ gtk_hbox_new(boolean homogeneous, int spacing)
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -21617,7 +21714,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_hscale_new(adjustment);
-@@ -7650,8 +7650,8 @@ public static final int /*long*/ gtk_hscale_new(int /*long*/ adjustment) {
+@@ -7624,8 +7624,8 @@ public static final int /*long*/ gtk_hscale_new(int /*long*/ adjustment) {
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -21628,7 +21725,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_hscrollbar_new(adjustment);
-@@ -7659,8 +7659,8 @@ public static final int /*long*/ gtk_hscrollbar_new(int /*long*/ adjustment) {
+@@ -7633,8 +7633,8 @@ public static final int /*long*/ gtk_hscrollbar_new(int /*long*/ adjustment) {
lock.unlock();
}
}
@@ -21639,7 +21736,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_hseparator_new();
-@@ -7668,8 +7668,8 @@ public static final int /*long*/ gtk_hseparator_new() {
+@@ -7642,8 +7642,8 @@ public static final int /*long*/ gtk_hseparator_new() {
lock.unlock();
}
}
@@ -21650,7 +21747,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_status_icon_position_menu_func();
-@@ -7680,8 +7680,8 @@ public static final int /*long*/ gtk_status_icon_position_menu_func() {
+@@ -7654,8 +7654,8 @@ public static final int /*long*/ gtk_status_icon_position_menu_func() {
/**
* @method flags=dynamic
*/
@@ -21661,7 +21758,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_icon_info_free(icon_info);
-@@ -7690,8 +7690,8 @@ public static final void gtk_icon_info_free(int /*long*/ icon_info) {
+@@ -7664,8 +7664,8 @@ public static final void gtk_icon_info_free(int /*long*/ icon_info) {
}
}
/** @param stock_id cast=(const gchar *) */
@@ -21672,7 +21769,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_icon_factory_lookup_default(stock_id);
-@@ -7700,8 +7700,8 @@ public static final int /*long*/ gtk_icon_factory_lookup_default(byte[] stock_id
+@@ -7674,8 +7674,8 @@ public static final int /*long*/ gtk_icon_factory_lookup_default(byte[] stock_id
}
}
/** @param source cast=(GtkIconSource *) */
@@ -21683,7 +21780,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_icon_source_free(source);
-@@ -7709,8 +7709,8 @@ public static final void gtk_icon_source_free(int /*long*/ source) {
+@@ -7683,8 +7683,8 @@ public static final void gtk_icon_source_free(int /*long*/ source) {
lock.unlock();
}
}
@@ -21694,7 +21791,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_icon_source_new();
-@@ -7722,8 +7722,8 @@ public static final int /*long*/ gtk_icon_source_new() {
+@@ -7696,8 +7696,8 @@ public static final int /*long*/ gtk_icon_source_new() {
* @param source cast=(GtkIconSource *)
* @param pixbuf cast=(GdkPixbuf *)
*/
@@ -21705,7 +21802,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_icon_source_set_pixbuf(source, pixbuf);
-@@ -7740,8 +7740,8 @@ public static final void gtk_icon_source_set_pixbuf(int /*long*/ source, int /*l
+@@ -7714,8 +7714,8 @@ public static final void gtk_icon_source_set_pixbuf(int /*long*/ source, int /*l
* @param widget cast=(GtkWidget *)
* @param detail cast=(const char *)
*/
@@ -21716,7 +21813,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_icon_set_render_icon(icon_set, style, direction, state, size, widget, detail);
-@@ -7752,8 +7752,8 @@ public static final int /*long*/ gtk_icon_set_render_icon(int /*long*/ icon_set,
+@@ -7726,8 +7726,8 @@ public static final int /*long*/ gtk_icon_set_render_icon(int /*long*/ icon_set,
/**
* @method flags=dynamic
*/
@@ -21727,7 +21824,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_icon_theme_get_default ();
-@@ -7764,8 +7764,8 @@ public static final int /*long*/ gtk_icon_theme_get_default() {
+@@ -7738,8 +7738,8 @@ public static final int /*long*/ gtk_icon_theme_get_default() {
/**
* @method flags=dynamic
*/
@@ -21738,7 +21835,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_icon_theme_lookup_by_gicon (icon_theme, icon, size, flags);
-@@ -7776,8 +7776,8 @@ public static final int /*long*/ gtk_icon_theme_lookup_by_gicon(int /*long*/ ico
+@@ -7750,8 +7750,8 @@ public static final int /*long*/ gtk_icon_theme_lookup_by_gicon(int /*long*/ ico
/**
* @method flags=dynamic
*/
@@ -21749,7 +21846,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_icon_info_load_icon(icon_info, error);
-@@ -7789,8 +7789,8 @@ public static final int /*long*/ gtk_icon_info_load_icon(int /*long*/ icon_info,
+@@ -7763,8 +7763,8 @@ public static final int /*long*/ gtk_icon_info_load_icon(int /*long*/ icon_info,
* @param context cast=(GtkIMContext *)
* @param event cast=(GdkEventKey *)
*/
@@ -21760,7 +21857,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_im_context_filter_keypress(context, event);
-@@ -7799,8 +7799,8 @@ public static final boolean gtk_im_context_filter_keypress(int /*long*/ context,
+@@ -7773,8 +7773,8 @@ public static final boolean gtk_im_context_filter_keypress(int /*long*/ context,
}
}
/** @param context cast=(GtkIMContext *) */
@@ -21771,7 +21868,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_im_context_focus_in(context);
-@@ -7809,8 +7809,8 @@ public static final void gtk_im_context_focus_in(int /*long*/ context) {
+@@ -7783,8 +7783,8 @@ public static final void gtk_im_context_focus_in(int /*long*/ context) {
}
}
/** @param context cast=(GtkIMContext *) */
@@ -21782,7 +21879,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_im_context_focus_out(context);
-@@ -7824,8 +7824,8 @@ public static final void gtk_im_context_focus_out(int /*long*/ context) {
+@@ -7798,8 +7798,8 @@ public static final void gtk_im_context_focus_out(int /*long*/ context) {
* @param attrs cast=(PangoAttrList **)
* @param cursor_pos cast=(gint *)
*/
@@ -21793,7 +21890,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_im_context_get_preedit_string(context, str, attrs, cursor_pos);
-@@ -7833,8 +7833,8 @@ public static final void gtk_im_context_get_preedit_string(int /*long*/ context,
+@@ -7807,8 +7807,8 @@ public static final void gtk_im_context_get_preedit_string(int /*long*/ context,
lock.unlock();
}
}
@@ -21804,7 +21901,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_im_context_get_type();
-@@ -7843,8 +7843,8 @@ public static final int /*long*/ gtk_im_context_get_type() {
+@@ -7817,8 +7817,8 @@ public static final int /*long*/ gtk_im_context_get_type() {
}
}
/** @param context cast=(GtkIMContext *) */
@@ -21815,7 +21912,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_im_context_reset(context);
-@@ -7856,8 +7856,8 @@ public static final void gtk_im_context_reset(int /*long*/ context) {
+@@ -7830,8 +7830,8 @@ public static final void gtk_im_context_reset(int /*long*/ context) {
* @param context cast=(GtkIMContext *)
* @param window cast=(GdkWindow *)
*/
@@ -21826,7 +21923,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_im_context_set_client_window(context, window);
-@@ -7869,8 +7869,8 @@ public static final void gtk_im_context_set_client_window(int /*long*/ context,
+@@ -7843,8 +7843,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
*/
@@ -21837,7 +21934,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_im_context_set_cursor_location(context, area);
-@@ -7882,8 +7882,8 @@ public static final void gtk_im_context_set_cursor_location(int /*long*/ context
+@@ -7856,8 +7856,8 @@ public static final void gtk_im_context_set_cursor_location(int /*long*/ context
* @param context cast=(GtkIMMulticontext *)
* @param menushell cast=(GtkMenuShell *)
*/
@@ -21848,7 +21945,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_im_multicontext_append_menuitems(context, menushell);
-@@ -7891,8 +7891,8 @@ public static final void gtk_im_multicontext_append_menuitems (int /*long*/ cont
+@@ -7865,8 +7865,8 @@ public static final void gtk_im_multicontext_append_menuitems (int /*long*/ cont
lock.unlock();
}
}
@@ -21859,7 +21956,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_im_multicontext_new();
-@@ -7901,8 +7901,8 @@ public static final int /*long*/ gtk_im_multicontext_new() {
+@@ -7875,8 +7875,8 @@ public static final int /*long*/ gtk_im_multicontext_new() {
}
}
/** @param label cast=(const gchar *) */
@@ -21870,7 +21967,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_image_menu_item_new_with_label(label);
-@@ -7914,8 +7914,8 @@ public static final int /*long*/ gtk_image_menu_item_new_with_label(byte[] label
+@@ -7888,8 +7888,8 @@ public static final int /*long*/ gtk_image_menu_item_new_with_label(byte[] label
* @param menu_item cast=(GtkImageMenuItem *)
* @param image cast=(GtkWidget *)
*/
@@ -21881,7 +21978,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_image_menu_item_set_image(menu_item, image);
-@@ -7923,8 +7923,8 @@ public static final void gtk_image_menu_item_set_image(int /*long*/ menu_item, i
+@@ -7897,8 +7897,8 @@ public static final void gtk_image_menu_item_set_image(int /*long*/ menu_item, i
lock.unlock();
}
}
@@ -21892,7 +21989,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_image_new();
-@@ -7933,8 +7933,8 @@ public static final int /*long*/ gtk_image_new() {
+@@ -7907,8 +7907,8 @@ public static final int /*long*/ gtk_image_new() {
}
}
/** @param pixbuf cast=(GdkPixbuf *) */
@@ -21903,7 +22000,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_image_new_from_pixbuf(pixbuf);
-@@ -7946,8 +7946,8 @@ public static final int /*long*/ gtk_image_new_from_pixbuf(int /*long*/ pixbuf)
+@@ -7920,8 +7920,8 @@ public static final int /*long*/ gtk_image_new_from_pixbuf(int /*long*/ pixbuf)
* @param pixmap cast=(GdkPixmap *)
* @param mask cast=(GdkBitmap *)
*/
@@ -21914,7 +22011,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_image_new_from_pixmap(pixmap, mask);
-@@ -7959,8 +7959,8 @@ public static final int /*long*/ gtk_image_new_from_pixmap(int /*long*/ pixmap,
+@@ -7933,8 +7933,8 @@ public static final int /*long*/ gtk_image_new_from_pixmap(int /*long*/ pixmap,
* @param image cast=(GtkImage *)
* @param pixbuf cast=(GdkPixbuf *)
*/
@@ -21925,7 +22022,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_image_set_from_pixbuf(image, pixbuf);
-@@ -7973,8 +7973,8 @@ public static final void gtk_image_set_from_pixbuf(int /*long*/ image, int /*lon
+@@ -7947,8 +7947,8 @@ public static final void gtk_image_set_from_pixbuf(int /*long*/ image, int /*lon
* @param pixmap cast=(GdkBitmap *)
* @param mask cast=(GdkBitmap *)
*/
@@ -21936,7 +22033,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_image_set_from_pixmap(image, pixmap, mask);
-@@ -7986,8 +7986,8 @@ public static final void gtk_image_set_from_pixmap(int /*long*/ image, int /*lon
+@@ -7960,8 +7960,8 @@ public static final void gtk_image_set_from_pixmap(int /*long*/ image, int /*lon
* @param argc cast=(int *)
* @param argv cast=(char ***)
*/
@@ -21947,7 +22044,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_init_check(argc, argv);
-@@ -7996,8 +7996,8 @@ public static final boolean gtk_init_check(int /*long*/[] argc, int /*long*/[] a
+@@ -7970,8 +7970,8 @@ public static final boolean gtk_init_check(int /*long*/[] argc, int /*long*/[] a
}
}
/** @param label cast=(GtkLabel *) */
@@ -21958,7 +22055,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_label_get_layout(label);
-@@ -8006,8 +8006,8 @@ public static final int /*long*/ gtk_label_get_layout(int /*long*/ label) {
+@@ -7980,8 +7980,8 @@ public static final int /*long*/ gtk_label_get_layout(int /*long*/ label) {
}
}
/** @param label cast=(GtkLabel *) */
@@ -21969,7 +22066,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_label_get_mnemonic_keyval(label);
-@@ -8016,8 +8016,8 @@ public static final int gtk_label_get_mnemonic_keyval(int /*long*/ label) {
+@@ -7990,8 +7990,8 @@ public static final int gtk_label_get_mnemonic_keyval(int /*long*/ label) {
}
}
/** @param label cast=(const gchar *) */
@@ -21980,7 +22077,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_label_new(label);
-@@ -8026,8 +8026,8 @@ public static final int /*long*/ gtk_label_new(byte[] label) {
+@@ -8000,8 +8000,8 @@ public static final int /*long*/ gtk_label_new(byte[] label) {
}
}
/** @param str cast=(const gchar *) */
@@ -21991,7 +22088,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_label_new_with_mnemonic(str);
-@@ -8039,8 +8039,8 @@ public static final int /*long*/ gtk_label_new_with_mnemonic(byte[] str) {
+@@ -8013,8 +8013,8 @@ public static final int /*long*/ gtk_label_new_with_mnemonic(byte[] str) {
* @param label cast=(GtkLabel *)
* @param attrs cast=(PangoAttrList *)
*/
@@ -22002,7 +22099,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_label_set_attributes(label, attrs);
-@@ -8052,8 +8052,8 @@ public static final void gtk_label_set_attributes(int /*long*/ label, int /*long
+@@ -8026,8 +8026,8 @@ public static final void gtk_label_set_attributes(int /*long*/ label, int /*long
* @param label cast=(GtkLabel *)
* @param jtype cast=(GtkJustification)
*/
@@ -22013,7 +22110,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_label_set_justify(label, jtype);
-@@ -8065,8 +8065,8 @@ public static final void gtk_label_set_justify(int /*long*/ label, int jtype) {
+@@ -8039,8 +8039,8 @@ public static final void gtk_label_set_justify(int /*long*/ label, int jtype) {
* @param label cast=(GtkLabel *)
* @param wrap cast=(gboolean)
*/
@@ -22024,7 +22121,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_label_set_line_wrap(label, wrap);
-@@ -8075,8 +8075,8 @@ public static final void gtk_label_set_line_wrap(int /*long*/ label, boolean wra
+@@ -8049,8 +8049,8 @@ public static final void gtk_label_set_line_wrap(int /*long*/ label, boolean wra
}
}
/** @method flags=dynamic */
@@ -22035,7 +22132,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_label_set_line_wrap_mode(label, wrap_mode);
-@@ -8088,8 +8088,8 @@ public static final void gtk_label_set_line_wrap_mode(int /*long*/ label, int wr
+@@ -8062,8 +8062,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 *)
*/
@@ -22046,7 +22143,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_label_set_text(label, str);
-@@ -8101,8 +8101,8 @@ public static final void gtk_label_set_text(int /*long*/ label, int /*long*/ str
+@@ -8075,8 +8075,8 @@ public static final void gtk_label_set_text(int /*long*/ label, int /*long*/ str
* @param label cast=(GtkLabel *)
* @param str cast=(const gchar *)
*/
@@ -22057,7 +22154,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_label_set_text(label, str);
-@@ -8114,8 +8114,8 @@ public static final void gtk_label_set_text(int /*long*/ label, byte[] str) {
+@@ -8088,8 +8088,8 @@ public static final void gtk_label_set_text(int /*long*/ label, byte[] str) {
* @param label cast=(GtkLabel *)
* @param str cast=(const gchar *)
*/
@@ -22068,7 +22165,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_label_set_text_with_mnemonic(label, str);
-@@ -8127,8 +8127,8 @@ public static final void gtk_label_set_text_with_mnemonic(int /*long*/ label, by
+@@ -8101,8 +8101,8 @@ public static final void gtk_label_set_text_with_mnemonic(int /*long*/ label, by
* @param list_store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -22079,7 +22176,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_list_store_append(list_store, iter);
-@@ -8137,8 +8137,8 @@ public static final void gtk_list_store_append(int /*long*/ list_store, int /*lo
+@@ -8111,8 +8111,8 @@ public static final void gtk_list_store_append(int /*long*/ list_store, int /*lo
}
}
/** @param store cast=(GtkListStore *) */
@@ -22090,7 +22187,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_list_store_clear(store);
-@@ -8151,8 +8151,8 @@ public static final void gtk_list_store_clear(int /*long*/ store) {
+@@ -8125,8 +8125,8 @@ public static final void gtk_list_store_clear(int /*long*/ store) {
* @param iter cast=(GtkTreeIter *)
* @param position cast=(gint)
*/
@@ -22101,7 +22198,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_list_store_insert(list_store, iter, position);
-@@ -8164,8 +8164,8 @@ public static final void gtk_list_store_insert(int /*long*/ list_store, int /*lo
+@@ -8138,8 +8138,8 @@ public static final void gtk_list_store_insert(int /*long*/ list_store, int /*lo
* @param numColumns cast=(gint)
* @param types cast=(GType *)
*/
@@ -22112,7 +22209,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_list_store_newv(numColumns, types);
-@@ -8177,8 +8177,8 @@ public static final int /*long*/ gtk_list_store_newv(int numColumns, int /*long*
+@@ -8151,8 +8151,8 @@ public static final int /*long*/ gtk_list_store_newv(int numColumns, int /*long*
* @param list_store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -22123,7 +22220,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_list_store_remove(list_store, iter);
-@@ -8190,8 +8190,8 @@ public static final void gtk_list_store_remove(int /*long*/ list_store, int /*lo
+@@ -8164,8 +8164,8 @@ public static final void gtk_list_store_remove(int /*long*/ list_store, int /*lo
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -22134,7 +22231,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -8203,8 +8203,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
+@@ -8177,8 +8177,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -22145,7 +22242,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -8216,8 +8216,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
+@@ -8190,8 +8190,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -22156,7 +22253,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -8230,8 +8230,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
+@@ -8204,8 +8204,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
* @param iter cast=(GtkTreeIter *)
* @param value flags=no_out
*/
@@ -22167,7 +22264,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -8243,8 +8243,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
+@@ -8217,8 +8217,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -22178,7 +22275,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -8301,8 +8301,8 @@ public static final int gtk_main_iteration() {
+@@ -8275,8 +8275,8 @@ public static final int gtk_main_iteration() {
}
}
/** @param event cast=(GdkEvent *) */
@@ -22189,7 +22286,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_main_do_event(event);
-@@ -8310,8 +8310,8 @@ public static final void gtk_main_do_event(int /*long*/ event) {
+@@ -8284,8 +8284,8 @@ public static final void gtk_main_do_event(int /*long*/ event) {
lock.unlock();
}
}
@@ -22200,7 +22297,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_menu_bar_new();
-@@ -8320,8 +8320,8 @@ public static final int /*long*/ gtk_menu_bar_new() {
+@@ -8294,8 +8294,8 @@ public static final int /*long*/ gtk_menu_bar_new() {
}
}
/** @param menu cast=(GtkMenu *) */
@@ -22211,7 +22308,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_menu_get_attach_widget(menu);
-@@ -8333,8 +8333,8 @@ public static final int /*long*/ gtk_menu_get_attach_widget(int /*long*/ menu) {
+@@ -8307,8 +8307,8 @@ public static final int /*long*/ gtk_menu_get_attach_widget(int /*long*/ menu) {
* @method flags=dynamic
* @param menu_item cast=(GtkMenuItem *)
*/
@@ -22222,7 +22319,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_menu_item_remove_submenu(menu_item);
-@@ -8343,8 +8343,8 @@ public static final void gtk_menu_item_remove_submenu(int /*long*/ menu_item) {
+@@ -8317,8 +8317,8 @@ public static final void gtk_menu_item_remove_submenu(int /*long*/ menu_item) {
}
}
/** @param menu_item cast=(GtkMenuItem *) */
@@ -22233,7 +22330,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_menu_item_get_submenu(menu_item);
-@@ -8356,8 +8356,8 @@ public static final int /*long*/ gtk_menu_item_get_submenu(int /*long*/ menu_ite
+@@ -8330,8 +8330,8 @@ public static final int /*long*/ gtk_menu_item_get_submenu(int /*long*/ menu_ite
* @param menu_item cast=(GtkMenuItem *)
* @param submenu cast=(GtkWidget *)
*/
@@ -22244,7 +22341,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_menu_item_set_submenu(menu_item, submenu);
-@@ -8365,8 +8365,8 @@ public static final void gtk_menu_item_set_submenu(int /*long*/ menu_item, int /
+@@ -8339,8 +8339,8 @@ public static final void gtk_menu_item_set_submenu(int /*long*/ menu_item, int /
lock.unlock();
}
}
@@ -22255,7 +22352,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_menu_new();
-@@ -8375,8 +8375,8 @@ public static final int /*long*/ gtk_menu_new() {
+@@ -8349,8 +8349,8 @@ public static final int /*long*/ gtk_menu_new() {
}
}
/** @param menu cast=(GtkMenu *) */
@@ -22266,7 +22363,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_menu_popdown(menu);
-@@ -8393,8 +8393,8 @@ public static final void gtk_menu_popdown(int /*long*/ menu) {
+@@ -8367,8 +8367,8 @@ public static final void gtk_menu_popdown(int /*long*/ menu) {
* @param button cast=(guint)
* @param activate_time cast=(guint32)
*/
@@ -22277,7 +22374,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_menu_popup(menu, parent_menu_shell, parent_menu_item, func, data, button, activate_time);
-@@ -8403,8 +8403,8 @@ public static final void gtk_menu_popup(int /*long*/ menu, int /*long*/ parent_m
+@@ -8377,8 +8377,8 @@ public static final void gtk_menu_popup(int /*long*/ menu, int /*long*/ parent_m
}
}
/** @param menu_shell cast=(GtkMenuShell *) */
@@ -22288,7 +22385,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_menu_shell_deactivate(menu_shell);
-@@ -8417,8 +8417,8 @@ public static final void gtk_menu_shell_deactivate(int /*long*/ menu_shell) {
+@@ -8391,8 +8391,8 @@ public static final void gtk_menu_shell_deactivate(int /*long*/ menu_shell) {
* @param child cast=(GtkWidget *)
* @param position cast=(gint)
*/
@@ -22299,7 +22396,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_menu_shell_insert(menu_shell, child, position);
-@@ -8430,8 +8430,8 @@ public static final void gtk_menu_shell_insert(int /*long*/ menu_shell, int /*lo
+@@ -8404,8 +8404,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 *)
*/
@@ -22310,7 +22407,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_menu_shell_select_item(menu_shell, menu_item);
-@@ -8444,8 +8444,8 @@ public static final void gtk_menu_shell_select_item(int /*long*/ menu_shell, int
+@@ -8418,8 +8418,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)
*/
@@ -22321,7 +22418,18 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_menu_shell_set_take_focus(menu_shell, take_focus);
-@@ -8460,8 +8460,8 @@ public static final void gtk_menu_shell_set_take_focus(int /*long*/ menu_shell,
+@@ -8428,8 +8428,8 @@ public static final void gtk_menu_shell_set_take_focus(int /*long*/ menu_shell,
+ }
+ }
+ /** @method flags=dynamic */
+-public static final native int /*long*/ _gtk_menu_tool_button_new(int /*long*/ icon_widget, byte[] label);
+-public static final int /*long*/ gtk_menu_tool_button_new(int /*long*/ icon_widget, byte[] label) {
++public static final native long /*int*/ _gtk_menu_tool_button_new(long /*int*/ icon_widget, byte[] label);
++public static final long /*int*/ gtk_menu_tool_button_new(long /*int*/ icon_widget, byte[] label) {
+ lock.lock();
+ try {
+ return _gtk_menu_tool_button_new(icon_widget, label);
+@@ -8444,8 +8444,8 @@ public static final int /*long*/ gtk_menu_tool_button_new(int /*long*/ icon_widg
* @param buttons cast=(GtkButtonsType)
* @param message_format cast=(const gchar *)
*/
@@ -22332,7 +22440,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_message_dialog_new(parent, flags, type, buttons, message_format);
-@@ -8474,8 +8474,8 @@ public static final int /*long*/ gtk_message_dialog_new(int /*long*/ parent, int
+@@ -8458,8 +8458,8 @@ public static final int /*long*/ gtk_message_dialog_new(int /*long*/ parent, int
* @param xalign cast=(gfloat)
* @param yalign cast=(gfloat)
*/
@@ -22343,7 +22451,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_misc_set_alignment(misc, xalign, yalign);
-@@ -8484,8 +8484,8 @@ public static final void gtk_misc_set_alignment(int /*long*/ misc, float xalign,
+@@ -8468,8 +8468,8 @@ public static final void gtk_misc_set_alignment(int /*long*/ misc, float xalign,
}
}
/** @param notebook cast=(GtkNotebook *) */
@@ -22354,7 +22462,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_notebook_get_current_page(notebook);
-@@ -8494,8 +8494,8 @@ public static final int gtk_notebook_get_current_page(int /*long*/ notebook) {
+@@ -8478,8 +8478,8 @@ public static final int gtk_notebook_get_current_page(int /*long*/ notebook) {
}
}
/** @param notebook cast=(GtkNotebook *) */
@@ -22365,7 +22473,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_notebook_get_scrollable(notebook);
-@@ -8509,8 +8509,8 @@ public static final boolean gtk_notebook_get_scrollable(int /*long*/ notebook) {
+@@ -8493,8 +8493,8 @@ public static final boolean gtk_notebook_get_scrollable(int /*long*/ notebook) {
* @param tab_label cast=(GtkWidget *)
* @param position cast=(gint)
*/
@@ -22376,7 +22484,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_notebook_insert_page(notebook, child, tab_label, position);
-@@ -8518,8 +8518,8 @@ public static final void gtk_notebook_insert_page(int /*long*/ notebook, int /*l
+@@ -8502,8 +8502,8 @@ public static final void gtk_notebook_insert_page(int /*long*/ notebook, int /*l
lock.unlock();
}
}
@@ -22387,7 +22495,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_notebook_new();
-@@ -8528,8 +8528,8 @@ public static final int /*long*/ gtk_notebook_new() {
+@@ -8512,8 +8512,8 @@ public static final int /*long*/ gtk_notebook_new() {
}
}
/** @param notebook cast=(GtkNotebook *) */
@@ -22398,7 +22506,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_notebook_next_page(notebook);
-@@ -8538,8 +8538,8 @@ public static final void gtk_notebook_next_page(int /*long*/ notebook) {
+@@ -8522,8 +8522,8 @@ public static final void gtk_notebook_next_page(int /*long*/ notebook) {
}
}
/** @param notebook cast=(GtkNotebook *) */
@@ -22409,7 +22517,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_notebook_prev_page(notebook);
-@@ -8551,8 +8551,8 @@ public static final void gtk_notebook_prev_page(int /*long*/ notebook) {
+@@ -8535,8 +8535,8 @@ public static final void gtk_notebook_prev_page(int /*long*/ notebook) {
* @param notebook cast=(GtkNotebook *)
* @param page_num cast=(gint)
*/
@@ -22420,7 +22528,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_notebook_remove_page(notebook, page_num);
-@@ -8564,8 +8564,8 @@ public static final void gtk_notebook_remove_page(int /*long*/ notebook, int pag
+@@ -8548,8 +8548,8 @@ public static final void gtk_notebook_remove_page(int /*long*/ notebook, int pag
* @param notebook cast=(GtkNotebook *)
* @param page_num cast=(gint)
*/
@@ -22431,7 +22539,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_notebook_set_current_page(notebook, page_num);
-@@ -8577,8 +8577,8 @@ public static final void gtk_notebook_set_current_page(int /*long*/ notebook, in
+@@ -8561,8 +8561,8 @@ public static final void gtk_notebook_set_current_page(int /*long*/ notebook, in
* @param notebook cast=(GtkNotebook *)
* @param scrollable cast=(gboolean)
*/
@@ -22442,7 +22550,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_notebook_set_scrollable(notebook, scrollable);
-@@ -8590,8 +8590,8 @@ public static final void gtk_notebook_set_scrollable(int /*long*/ notebook, bool
+@@ -8574,8 +8574,8 @@ public static final void gtk_notebook_set_scrollable(int /*long*/ notebook, bool
* @param notebook cast=(GtkNotebook *)
* @param show_tabs cast=(gboolean)
*/
@@ -22453,7 +22561,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_notebook_set_show_tabs(notebook, show_tabs);
-@@ -8603,8 +8603,8 @@ public static final void gtk_notebook_set_show_tabs(int /*long*/ notebook, boole
+@@ -8587,8 +8587,8 @@ public static final void gtk_notebook_set_show_tabs(int /*long*/ notebook, boole
* @param notebook cast=(GtkNotebook *)
* @param pos cast=(GtkPositionType)
*/
@@ -22464,7 +22572,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_notebook_set_tab_pos(notebook, pos);
-@@ -8613,8 +8613,8 @@ public static final void gtk_notebook_set_tab_pos(int /*long*/ notebook, int pos
+@@ -8597,8 +8597,8 @@ public static final void gtk_notebook_set_tab_pos(int /*long*/ notebook, int pos
}
}
/** @param object cast=(GtkObject *) */
@@ -22475,7 +22583,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_object_sink(object);
-@@ -8623,8 +8623,8 @@ public static final void gtk_object_sink(int /*long*/ object) {
+@@ -8607,8 +8607,8 @@ public static final void gtk_object_sink(int /*long*/ object) {
}
}
/** @method flags=dynamic */
@@ -22486,7 +22594,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_orientable_set_orientation(orientable, orientation);
-@@ -8633,8 +8633,8 @@ public static final void gtk_orientable_set_orientation(int /*long*/ orientable,
+@@ -8617,8 +8617,8 @@ public static final void gtk_orientable_set_orientation(int /*long*/ orientable,
}
}
/** @method flags=dynamic */
@@ -22497,7 +22605,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_page_setup_new ();
-@@ -8643,8 +8643,8 @@ public static final int /*long*/ gtk_page_setup_new () {
+@@ -8627,8 +8627,8 @@ public static final int /*long*/ gtk_page_setup_new () {
}
}
/** @method flags=dynamic */
@@ -22508,7 +22616,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_page_setup_get_orientation(setup);
-@@ -8653,8 +8653,8 @@ public static final int gtk_page_setup_get_orientation(int /*long*/ setup) {
+@@ -8637,8 +8637,8 @@ public static final int gtk_page_setup_get_orientation(int /*long*/ setup) {
}
}
/** @method flags=dynamic */
@@ -22519,7 +22627,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_page_setup_set_orientation(setup, orientation);
-@@ -8663,8 +8663,8 @@ public static final void gtk_page_setup_set_orientation(int /*long*/ setup, int
+@@ -8647,8 +8647,8 @@ public static final void gtk_page_setup_set_orientation(int /*long*/ setup, int
}
}
/** @method flags=dynamic */
@@ -22530,7 +22638,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_page_setup_get_paper_size(setup);
-@@ -8673,8 +8673,8 @@ public static final int /*long*/ gtk_page_setup_get_paper_size(int /*long*/ setu
+@@ -8657,8 +8657,8 @@ public static final int /*long*/ gtk_page_setup_get_paper_size(int /*long*/ setu
}
}
/** @method flags=dynamic */
@@ -22541,7 +22649,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_page_setup_set_paper_size(setup, size);
-@@ -8683,8 +8683,8 @@ public static final void gtk_page_setup_set_paper_size(int /*long*/ setup, int /
+@@ -8667,8 +8667,8 @@ public static final void gtk_page_setup_set_paper_size(int /*long*/ setup, int /
}
}
/** @method flags=dynamic */
@@ -22552,7 +22660,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_page_setup_get_top_margin(setup, unit);
-@@ -8693,8 +8693,8 @@ public static final double gtk_page_setup_get_top_margin(int /*long*/ setup, int
+@@ -8677,8 +8677,8 @@ public static final double gtk_page_setup_get_top_margin(int /*long*/ setup, int
}
}
/** @method flags=dynamic */
@@ -22563,7 +22671,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_page_setup_set_top_margin(setup, margin, unit);
-@@ -8703,8 +8703,8 @@ public static final void gtk_page_setup_set_top_margin(int /*long*/ setup, doubl
+@@ -8687,8 +8687,8 @@ public static final void gtk_page_setup_set_top_margin(int /*long*/ setup, doubl
}
}
/** @method flags=dynamic */
@@ -22574,7 +22682,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_page_setup_get_bottom_margin(setup, unit);
-@@ -8713,8 +8713,8 @@ public static final double gtk_page_setup_get_bottom_margin(int /*long*/ setup,
+@@ -8697,8 +8697,8 @@ public static final double gtk_page_setup_get_bottom_margin(int /*long*/ setup,
}
}
/** @method flags=dynamic */
@@ -22585,7 +22693,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_page_setup_set_bottom_margin(setup, margin, unit);
-@@ -8723,8 +8723,8 @@ public static final void gtk_page_setup_set_bottom_margin(int /*long*/ setup, do
+@@ -8707,8 +8707,8 @@ public static final void gtk_page_setup_set_bottom_margin(int /*long*/ setup, do
}
}
/** @method flags=dynamic */
@@ -22596,7 +22704,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_page_setup_get_left_margin(setup, unit);
-@@ -8733,8 +8733,8 @@ public static final double gtk_page_setup_get_left_margin(int /*long*/ setup, in
+@@ -8717,8 +8717,8 @@ public static final double gtk_page_setup_get_left_margin(int /*long*/ setup, in
}
}
/** @method flags=dynamic */
@@ -22607,7 +22715,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_page_setup_set_left_margin(setup, margin, unit);
-@@ -8743,8 +8743,8 @@ public static final void gtk_page_setup_set_left_margin(int /*long*/ setup, doub
+@@ -8727,8 +8727,8 @@ public static final void gtk_page_setup_set_left_margin(int /*long*/ setup, doub
}
}
/** @method flags=dynamic */
@@ -22618,7 +22726,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_page_setup_get_right_margin(setup, unit);
-@@ -8753,8 +8753,8 @@ public static final double gtk_page_setup_get_right_margin(int /*long*/ setup, i
+@@ -8737,8 +8737,8 @@ public static final double gtk_page_setup_get_right_margin(int /*long*/ setup, i
}
}
/** @method flags=dynamic */
@@ -22629,7 +22737,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_page_setup_set_right_margin(setup, margin, unit);
-@@ -8763,8 +8763,8 @@ public static final void gtk_page_setup_set_right_margin(int /*long*/ setup, dou
+@@ -8747,8 +8747,8 @@ public static final void gtk_page_setup_set_right_margin(int /*long*/ setup, dou
}
}
/** @method flags=dynamic */
@@ -22640,7 +22748,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_page_setup_get_paper_width(setup, unit);
-@@ -8773,8 +8773,8 @@ public static final double gtk_page_setup_get_paper_width(int /*long*/ setup, in
+@@ -8757,8 +8757,8 @@ public static final double gtk_page_setup_get_paper_width(int /*long*/ setup, in
}
}
/** @method flags=dynamic */
@@ -22651,7 +22759,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_page_setup_get_paper_height(setup, unit);
-@@ -8783,8 +8783,8 @@ public static final double gtk_page_setup_get_paper_height(int /*long*/ setup, i
+@@ -8767,8 +8767,8 @@ public static final double gtk_page_setup_get_paper_height(int /*long*/ setup, i
}
}
/** @method flags=dynamic */
@@ -22662,7 +22770,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_page_setup_get_page_width(setup, unit);
-@@ -8793,8 +8793,8 @@ public static final double gtk_page_setup_get_page_width(int /*long*/ setup, int
+@@ -8777,8 +8777,8 @@ public static final double gtk_page_setup_get_page_width(int /*long*/ setup, int
}
}
/** @method flags=dynamic */
@@ -22673,7 +22781,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_page_setup_get_page_height(setup, unit);
-@@ -8809,8 +8809,8 @@ public static final double gtk_page_setup_get_page_height(int /*long*/ setup, in
+@@ -8793,8 +8793,8 @@ public static final double gtk_page_setup_get_page_height(int /*long*/ setup, in
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22684,7 +22792,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_paint_handle(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
-@@ -8824,8 +8824,8 @@ public static final void gtk_paint_handle(int /*long*/ style, int /*long*/ windo
+@@ -8808,8 +8808,8 @@ public static final void gtk_paint_handle(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22695,7 +22803,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_paint_flat_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8840,8 +8840,8 @@ public static final void gtk_paint_flat_box(int /*long*/ style, int /*long*/ win
+@@ -8824,8 +8824,8 @@ public static final void gtk_paint_flat_box(int /*long*/ style, int /*long*/ win
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22706,7 +22814,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_paint_focus(style, window, state_type, area, widget, detail, x, y, width, height);
-@@ -8855,8 +8855,8 @@ public static final void gtk_paint_focus(int /*long*/ style, int /*long*/ window
+@@ -8839,8 +8839,8 @@ public static final void gtk_paint_focus(int /*long*/ style, int /*long*/ window
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22717,7 +22825,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_paint_option(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8870,8 +8870,8 @@ public static final void gtk_paint_option(int /*long*/ style, int /*long*/ windo
+@@ -8854,8 +8854,8 @@ public static final void gtk_paint_option(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22728,7 +22836,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_paint_slider(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
-@@ -8885,8 +8885,8 @@ public static final void gtk_paint_slider(int /*long*/ style, int /*long*/ windo
+@@ -8869,8 +8869,8 @@ public static final void gtk_paint_slider(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22739,7 +22847,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_paint_tab(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8900,8 +8900,8 @@ public static final void gtk_paint_tab(int /*long*/ style, int /*long*/ window,
+@@ -8884,8 +8884,8 @@ public static final void gtk_paint_tab(int /*long*/ style, int /*long*/ window,
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22750,7 +22858,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_paint_arrow(style, window, state_type, shadow_type, area, widget, detail, arrow_type, fill, x, y, width, height);
-@@ -8916,8 +8916,8 @@ public static final void gtk_paint_arrow(int /*long*/ style, int /*long*/ window
+@@ -8900,8 +8900,8 @@ public static final void gtk_paint_arrow(int /*long*/ style, int /*long*/ window
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22761,7 +22869,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_paint_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8931,8 +8931,8 @@ public static final void gtk_paint_box(int /*long*/ style, int /*long*/ window,
+@@ -8915,8 +8915,8 @@ public static final void gtk_paint_box(int /*long*/ style, int /*long*/ window,
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
@@ -22772,7 +22880,7 @@ index 5306e6e..15bf432 100644
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);
-@@ -8946,8 +8946,8 @@ public static final void gtk_paint_box_gap(int /*long*/ style, int /*long*/ wind
+@@ -8930,8 +8930,8 @@ public static final void gtk_paint_box_gap(int /*long*/ style, int /*long*/ wind
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22783,7 +22891,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_paint_check(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8961,8 +8961,8 @@ public static final void gtk_paint_check(int /*long*/ style, int /*long*/ window
+@@ -8945,8 +8945,8 @@ public static final void gtk_paint_check(int /*long*/ style, int /*long*/ window
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22794,7 +22902,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_paint_expander(style, window, state_type, area, widget, detail, x, y, expander_style);
-@@ -8976,8 +8976,8 @@ public static final void gtk_paint_expander(int /*long*/ style, int /*long*/ win
+@@ -8960,8 +8960,8 @@ public static final void gtk_paint_expander(int /*long*/ style, int /*long*/ win
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
@@ -22805,7 +22913,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_paint_extension(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side);
-@@ -8991,8 +8991,8 @@ public static final void gtk_paint_extension(int /*long*/ style, int /*long*/ wi
+@@ -8975,8 +8975,8 @@ public static final void gtk_paint_extension(int /*long*/ style, int /*long*/ wi
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22816,7 +22924,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_paint_hline(style, window, state_type, area, widget, detail, x1, x2, y);
-@@ -9007,8 +9007,8 @@ public static final void gtk_paint_hline(int /*long*/ style, int /*long*/ window
+@@ -8991,8 +8991,8 @@ public static final void gtk_paint_hline(int /*long*/ style, int /*long*/ window
* @param detail cast=(const gchar *)
* @param layout cast=(PangoLayout *)
*/
@@ -22827,7 +22935,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_paint_layout(style, window, state_type, use_text, area, widget, detail, x, y, layout);
-@@ -9022,8 +9022,8 @@ public static final void gtk_paint_layout(int /*long*/ style, int /*long*/ windo
+@@ -9006,8 +9006,8 @@ public static final void gtk_paint_layout(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
@@ -22838,7 +22946,7 @@ index 5306e6e..15bf432 100644
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);
-@@ -9037,8 +9037,8 @@ public static final void gtk_paint_shadow_gap(int /*long*/ style, int /*long*/ w
+@@ -9021,8 +9021,8 @@ public static final void gtk_paint_shadow_gap(int /*long*/ style, int /*long*/ w
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
@@ -22849,7 +22957,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_paint_shadow(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -9052,8 +9052,8 @@ public static final void gtk_paint_shadow(int /*long*/ style, int /*long*/ windo
+@@ -9036,8 +9036,8 @@ public static final void gtk_paint_shadow(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22860,7 +22968,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_paint_vline(style, window, state_type, area, widget, detail, y1, y2, x);
-@@ -9062,8 +9062,8 @@ public static final void gtk_paint_vline(int /*long*/ style, int /*long*/ window
+@@ -9046,8 +9046,8 @@ public static final void gtk_paint_vline(int /*long*/ style, int /*long*/ window
}
}
/** @method flags=dynamic */
@@ -22871,7 +22979,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_paper_size_free(size);
-@@ -9072,8 +9072,8 @@ public static final void gtk_paper_size_free(int /*long*/ size) {
+@@ -9056,8 +9056,8 @@ public static final void gtk_paper_size_free(int /*long*/ size) {
}
}
/** @method flags=dynamic */
@@ -22882,7 +22990,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_paper_size_new(name);
-@@ -9082,8 +9082,8 @@ public static final int /*long*/ gtk_paper_size_new(byte [] name) {
+@@ -9066,8 +9066,8 @@ public static final int /*long*/ gtk_paper_size_new(byte [] name) {
}
}
/** @method flags=dynamic */
@@ -22893,7 +23001,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_paper_size_new_from_ppd(ppd_name, ppd_display_name, width, height);
-@@ -9092,8 +9092,8 @@ public static final int /*long*/ gtk_paper_size_new_from_ppd(byte [] ppd_name, b
+@@ -9076,8 +9076,8 @@ public static final int /*long*/ gtk_paper_size_new_from_ppd(byte [] ppd_name, b
}
}
/** @method flags=dynamic */
@@ -22904,7 +23012,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_paper_size_new_custom(name, display_name, width, height, unit);
-@@ -9102,8 +9102,8 @@ public static final int /*long*/ gtk_paper_size_new_custom(byte [] name, byte []
+@@ -9086,8 +9086,8 @@ public static final int /*long*/ gtk_paper_size_new_custom(byte [] name, byte []
}
}
/** @method flags=dynamic */
@@ -22915,7 +23023,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_paper_size_get_name(size);
-@@ -9112,8 +9112,8 @@ public static final int /*long*/ gtk_paper_size_get_name(int /*long*/ size) {
+@@ -9096,8 +9096,8 @@ public static final int /*long*/ gtk_paper_size_get_name(int /*long*/ size) {
}
}
/** @method flags=dynamic */
@@ -22926,7 +23034,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_paper_size_get_display_name(size);
-@@ -9122,8 +9122,8 @@ public static final int /*long*/ gtk_paper_size_get_display_name(int /*long*/ si
+@@ -9106,8 +9106,8 @@ public static final int /*long*/ gtk_paper_size_get_display_name(int /*long*/ si
}
}
/** @method flags=dynamic */
@@ -22937,7 +23045,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_paper_size_get_ppd_name(size);
-@@ -9132,8 +9132,8 @@ public static final int /*long*/ gtk_paper_size_get_ppd_name(int /*long*/ size)
+@@ -9116,8 +9116,8 @@ public static final int /*long*/ gtk_paper_size_get_ppd_name(int /*long*/ size)
}
}
/** @method flags=dynamic */
@@ -22948,7 +23056,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_paper_size_get_width(size, unit);
-@@ -9142,8 +9142,8 @@ public static final double gtk_paper_size_get_width(int /*long*/ size, int unit)
+@@ -9126,8 +9126,8 @@ public static final double gtk_paper_size_get_width(int /*long*/ size, int unit)
}
}
/** @method flags=dynamic */
@@ -22959,7 +23067,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_paper_size_get_height(size, unit);
-@@ -9152,8 +9152,8 @@ public static final double gtk_paper_size_get_height(int /*long*/ size, int unit
+@@ -9136,8 +9136,8 @@ public static final double gtk_paper_size_get_height(int /*long*/ size, int unit
}
}
/** @method flags=dynamic */
@@ -22970,7 +23078,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_paper_size_is_custom(size);
-@@ -9162,8 +9162,8 @@ public static final boolean gtk_paper_size_is_custom(int /*long*/ size) {
+@@ -9146,8 +9146,8 @@ public static final boolean gtk_paper_size_is_custom(int /*long*/ size) {
}
}
/** @param plug cast=(GtkPlug *) */
@@ -22981,7 +23089,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_plug_get_id(plug);
-@@ -9171,8 +9171,8 @@ public static final int /*long*/ gtk_plug_get_id(int /*long*/ plug) {
+@@ -9155,8 +9155,8 @@ public static final int /*long*/ gtk_plug_get_id(int /*long*/ plug) {
lock.unlock();
}
}
@@ -22992,7 +23100,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_plug_new(socket_id);
-@@ -9181,8 +9181,8 @@ public static final int /*long*/ gtk_plug_new(int /*long*/ socket_id) {
+@@ -9165,8 +9165,8 @@ public static final int /*long*/ gtk_plug_new(int /*long*/ socket_id) {
}
}
/** @method flags=dynamic */
@@ -23003,7 +23111,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_printer_get_backend(printer);
-@@ -9191,8 +9191,8 @@ public static final int /*long*/ gtk_printer_get_backend(int /*long*/ printer) {
+@@ -9175,8 +9175,8 @@ public static final int /*long*/ gtk_printer_get_backend(int /*long*/ printer) {
}
}
/** @method flags=dynamic */
@@ -23014,7 +23122,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_printer_get_name(printer);
-@@ -9201,8 +9201,8 @@ public static final int /*long*/ gtk_printer_get_name(int /*long*/ printer) {
+@@ -9185,8 +9185,8 @@ public static final int /*long*/ gtk_printer_get_name(int /*long*/ printer) {
}
}
/** @method flags=dynamic */
@@ -23025,7 +23133,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_printer_is_default(printer);
-@@ -9216,8 +9216,8 @@ public static final boolean gtk_printer_is_default(int /*long*/ printer) {
+@@ -9200,8 +9200,8 @@ public static final boolean gtk_printer_is_default(int /*long*/ printer) {
* @param destroy cast=(GDestroyNotify)
* @param wait cast=(gboolean)
*/
@@ -23036,7 +23144,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_enumerate_printers(func, data, destroy, wait);
-@@ -9229,8 +9229,8 @@ public static final void gtk_enumerate_printers(int /*long*/ func, int /*long*/d
+@@ -9213,8 +9213,8 @@ public static final void gtk_enumerate_printers(int /*long*/ func, int /*long*/d
* @method flags=dynamic
* @param title cast=(const gchar *)
*/
@@ -23047,7 +23155,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_job_new(title, printer, settings, page_setup);
-@@ -9239,8 +9239,8 @@ public static final int /*long*/ gtk_print_job_new(byte[] title, int /*long*/ pr
+@@ -9223,8 +9223,8 @@ public static final int /*long*/ gtk_print_job_new(byte[] title, int /*long*/ pr
}
}
/** @method flags=dynamic */
@@ -23058,7 +23166,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_job_get_settings(job);
-@@ -9249,8 +9249,8 @@ public static final int /*long*/ gtk_print_job_get_settings(int /*long*/ job) {
+@@ -9233,8 +9233,8 @@ public static final int /*long*/ gtk_print_job_get_settings(int /*long*/ job) {
}
}
/** @method flags=dynamic */
@@ -23069,7 +23177,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_job_get_printer(job);
-@@ -9259,8 +9259,8 @@ public static final int /*long*/ gtk_print_job_get_printer(int /*long*/ job) {
+@@ -9243,8 +9243,8 @@ public static final int /*long*/ gtk_print_job_get_printer(int /*long*/ job) {
}
}
/** @method flags=dynamic */
@@ -23080,7 +23188,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_job_get_title(job);
-@@ -9269,8 +9269,8 @@ public static final int /*long*/ gtk_print_job_get_title(int /*long*/ job) {
+@@ -9253,8 +9253,8 @@ public static final int /*long*/ gtk_print_job_get_title(int /*long*/ job) {
}
}
/** @method flags=dynamic */
@@ -23091,7 +23199,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_job_get_status(job);
-@@ -9283,8 +9283,8 @@ public static final int gtk_print_job_get_status(int /*long*/ job) {
+@@ -9267,8 +9267,8 @@ public static final int gtk_print_job_get_status(int /*long*/ job) {
* @param filename cast=(const gchar *)
* @param error cast=(GError **)
*/
@@ -23102,7 +23210,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_job_set_source_file(job, filename, error);
-@@ -9296,8 +9296,8 @@ public static final boolean gtk_print_job_set_source_file(int /*long*/ job, byte
+@@ -9280,8 +9280,8 @@ public static final boolean gtk_print_job_set_source_file(int /*long*/ job, byte
* @method flags=dynamic
* @param error cast=(GError **)
*/
@@ -23113,7 +23221,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_job_get_surface(job, error);
-@@ -9310,8 +9310,8 @@ public static final int /*long*/ gtk_print_job_get_surface(int /*long*/ job, int
+@@ -9294,8 +9294,8 @@ public static final int /*long*/ gtk_print_job_get_surface(int /*long*/ job, int
* @param user_data cast=(gpointer)
* @param dnotify cast=(GDestroyNotify)
*/
@@ -23124,7 +23232,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_print_job_send(job, callback, user_data, dnotify);
-@@ -9320,8 +9320,8 @@ public static final void gtk_print_job_send(int /*long*/ job, int /*long*/ callb
+@@ -9304,8 +9304,8 @@ public static final void gtk_print_job_send(int /*long*/ job, int /*long*/ callb
}
}
/** @method flags=dynamic */
@@ -23135,7 +23243,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_settings_new();
-@@ -9333,8 +9333,8 @@ public static final int /*long*/ gtk_print_settings_new() {
+@@ -9317,8 +9317,8 @@ public static final int /*long*/ gtk_print_settings_new() {
* @method flags=dynamic
* @param data cast=(gpointer)
*/
@@ -23146,7 +23254,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_print_settings_foreach(settings, func, data);
-@@ -9346,8 +9346,8 @@ public static final void gtk_print_settings_foreach(int /*long*/ settings, int /
+@@ -9330,8 +9330,8 @@ public static final void gtk_print_settings_foreach(int /*long*/ settings, int /
* @method flags=dynamic
* @param key cast=(const gchar *)
*/
@@ -23157,7 +23265,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_settings_get(settings, key);
-@@ -9360,8 +9360,8 @@ public static final int /*long*/ gtk_print_settings_get(int /*long*/ settings, b
+@@ -9344,8 +9344,8 @@ public static final int /*long*/ gtk_print_settings_get(int /*long*/ settings, b
* @param key cast=(const gchar *)
* @param value cast=(const gchar *)
*/
@@ -23168,7 +23276,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_print_settings_set(settings, key, value);
-@@ -9370,8 +9370,8 @@ public static final void gtk_print_settings_set(int /*long*/ settings, byte [] k
+@@ -9354,8 +9354,8 @@ public static final void gtk_print_settings_set(int /*long*/ settings, byte [] k
}
}
/** @method flags=dynamic */
@@ -23179,7 +23287,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_settings_get_printer(settings);
-@@ -9380,8 +9380,8 @@ public static final int /*long*/ gtk_print_settings_get_printer(int /*long*/ set
+@@ -9364,8 +9364,8 @@ public static final int /*long*/ gtk_print_settings_get_printer(int /*long*/ set
}
}
/** @method flags=dynamic */
@@ -23190,7 +23298,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_print_settings_set_printer(settings, printer);
-@@ -9390,8 +9390,8 @@ public static final void gtk_print_settings_set_printer(int /*long*/ settings, b
+@@ -9374,8 +9374,8 @@ public static final void gtk_print_settings_set_printer(int /*long*/ settings, b
}
}
/** @method flags=dynamic */
@@ -23201,7 +23309,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_settings_get_orientation(settings);
-@@ -9400,8 +9400,8 @@ public static final int gtk_print_settings_get_orientation(int /*long*/ settings
+@@ -9384,8 +9384,8 @@ public static final int gtk_print_settings_get_orientation(int /*long*/ settings
}
}
/** @method flags=dynamic */
@@ -23212,7 +23320,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_print_settings_set_orientation(settings, orientation);
-@@ -9410,8 +9410,8 @@ public static final void gtk_print_settings_set_orientation(int /*long*/ setting
+@@ -9394,8 +9394,8 @@ public static final void gtk_print_settings_set_orientation(int /*long*/ setting
}
}
/** @method flags=dynamic */
@@ -23223,7 +23331,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_settings_get_collate(settings);
-@@ -9423,8 +9423,8 @@ public static final boolean gtk_print_settings_get_collate(int /*long*/ settings
+@@ -9407,8 +9407,8 @@ public static final boolean gtk_print_settings_get_collate(int /*long*/ settings
* @method flags=dynamic
* @param collate cast=(gboolean)
*/
@@ -23234,7 +23342,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_print_settings_set_collate(settings, collate);
-@@ -9433,8 +9433,8 @@ public static final void gtk_print_settings_set_collate(int /*long*/ settings, b
+@@ -9417,8 +9417,8 @@ public static final void gtk_print_settings_set_collate(int /*long*/ settings, b
}
}
/** @method flags=dynamic */
@@ -23245,7 +23353,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_settings_get_duplex(settings);
-@@ -9443,8 +9443,8 @@ public static final int gtk_print_settings_get_duplex(int /*long*/ settings) {
+@@ -9427,8 +9427,8 @@ public static final int gtk_print_settings_get_duplex(int /*long*/ settings) {
}
}
/** @method flags=dynamic */
@@ -23256,7 +23364,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_print_settings_set_duplex(settings, duplex);
-@@ -9453,8 +9453,8 @@ public static final void gtk_print_settings_set_duplex(int /*long*/ settings, in
+@@ -9437,8 +9437,8 @@ public static final void gtk_print_settings_set_duplex(int /*long*/ settings, in
}
}
/** @method flags=dynamic */
@@ -23267,7 +23375,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_settings_get_n_copies(settings);
-@@ -9466,8 +9466,8 @@ public static final int gtk_print_settings_get_n_copies(int /*long*/ settings) {
+@@ -9450,8 +9450,8 @@ public static final int gtk_print_settings_get_n_copies(int /*long*/ settings) {
* @method flags=dynamic
* @param num_copies cast=(gint)
*/
@@ -23278,7 +23386,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_print_settings_set_n_copies(settings, num_copies);
-@@ -9476,8 +9476,8 @@ public static final void gtk_print_settings_set_n_copies(int /*long*/ settings,
+@@ -9460,8 +9460,8 @@ public static final void gtk_print_settings_set_n_copies(int /*long*/ settings,
}
}
/** @method flags=dynamic */
@@ -23289,7 +23397,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_settings_get_print_pages(settings);
-@@ -9486,8 +9486,8 @@ public static final int gtk_print_settings_get_print_pages(int /*long*/ settings
+@@ -9470,8 +9470,8 @@ public static final int gtk_print_settings_get_print_pages(int /*long*/ settings
}
}
/** @method flags=dynamic */
@@ -23300,7 +23408,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_print_settings_set_print_pages(settings, pages);
-@@ -9499,8 +9499,8 @@ public static final void gtk_print_settings_set_print_pages(int /*long*/ setting
+@@ -9483,8 +9483,8 @@ public static final void gtk_print_settings_set_print_pages(int /*long*/ setting
* @method flags=dynamic
* @param num_ranges cast=(gint *)
*/
@@ -23311,7 +23419,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_settings_get_page_ranges(settings, num_ranges);
-@@ -9512,8 +9512,8 @@ public static final int /*long*/ gtk_print_settings_get_page_ranges(int /*long*/
+@@ -9496,8 +9496,8 @@ public static final int /*long*/ gtk_print_settings_get_page_ranges(int /*long*/
* @method flags=dynamic
* @param num_ranges cast=(gint)
*/
@@ -23322,7 +23430,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_print_settings_set_page_ranges(settings, page_ranges, num_ranges);
-@@ -9522,8 +9522,8 @@ public static final void gtk_print_settings_set_page_ranges(int /*long*/ setting
+@@ -9506,8 +9506,8 @@ public static final void gtk_print_settings_set_page_ranges(int /*long*/ setting
}
}
/** @method flags=dynamic */
@@ -23333,7 +23441,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_settings_get_paper_width(settings, unit);
-@@ -9532,8 +9532,8 @@ public static final double gtk_print_settings_get_paper_width(int /*long*/ setti
+@@ -9516,8 +9516,8 @@ public static final double gtk_print_settings_get_paper_width(int /*long*/ setti
}
}
/** @method flags=dynamic */
@@ -23344,7 +23452,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_settings_get_paper_height(settings, unit);
-@@ -9542,8 +9542,8 @@ public static final double gtk_print_settings_get_paper_height(int /*long*/ sett
+@@ -9526,8 +9526,8 @@ public static final double gtk_print_settings_get_paper_height(int /*long*/ sett
}
}
/** @method flags=dynamic */
@@ -23355,7 +23463,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_settings_get_resolution(settings);
-@@ -9556,8 +9556,8 @@ public static final int gtk_print_settings_get_resolution(int /*long*/ settings)
+@@ -9540,8 +9540,8 @@ public static final int gtk_print_settings_get_resolution(int /*long*/ settings)
* @param title cast=(const gchar *)
* @param parent cast=(GtkWindow *)
*/
@@ -23366,7 +23474,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_unix_dialog_new(title, parent);
-@@ -9566,8 +9566,8 @@ public static final int /*long*/ gtk_print_unix_dialog_new(byte[] title, int /*l
+@@ -9550,8 +9550,8 @@ public static final int /*long*/ gtk_print_unix_dialog_new(byte[] title, int /*l
}
}
/** @method flags=dynamic */
@@ -23377,7 +23485,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_print_unix_dialog_set_embed_page_setup(dialog, embed);
-@@ -9576,8 +9576,8 @@ public static final void gtk_print_unix_dialog_set_embed_page_setup(int /*long*/
+@@ -9560,8 +9560,8 @@ public static final void gtk_print_unix_dialog_set_embed_page_setup(int /*long*/
}
}
/** @method flags=dynamic */
@@ -23388,7 +23496,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_print_unix_dialog_set_page_setup(dialog, page_setup);
-@@ -9586,8 +9586,8 @@ public static final void gtk_print_unix_dialog_set_page_setup(int /*long*/ dialo
+@@ -9570,8 +9570,8 @@ public static final void gtk_print_unix_dialog_set_page_setup(int /*long*/ dialo
}
}
/** @method flags=dynamic */
@@ -23399,7 +23507,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_unix_dialog_get_page_setup(dialog);
-@@ -9599,8 +9599,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_page_setup(int /*long
+@@ -9583,8 +9583,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_page_setup(int /*long
* @method flags=dynamic
* @param current_page cast=(gint)
*/
@@ -23410,7 +23518,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_print_unix_dialog_set_current_page(dialog, current_page);
-@@ -9609,8 +9609,8 @@ public static final void gtk_print_unix_dialog_set_current_page(int /*long*/ dia
+@@ -9593,8 +9593,8 @@ public static final void gtk_print_unix_dialog_set_current_page(int /*long*/ dia
}
}
/** @method flags=dynamic */
@@ -23421,7 +23529,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_unix_dialog_get_current_page(dialog);
-@@ -9619,8 +9619,8 @@ public static final int gtk_print_unix_dialog_get_current_page(int /*long*/ dial
+@@ -9603,8 +9603,8 @@ public static final int gtk_print_unix_dialog_get_current_page(int /*long*/ dial
}
}
/** @method flags=dynamic */
@@ -23432,7 +23540,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_print_unix_dialog_set_settings(dialog, settings);
-@@ -9629,8 +9629,8 @@ public static final void gtk_print_unix_dialog_set_settings(int /*long*/ dialog,
+@@ -9613,8 +9613,8 @@ public static final void gtk_print_unix_dialog_set_settings(int /*long*/ dialog,
}
}
/** @method flags=dynamic */
@@ -23443,7 +23551,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_unix_dialog_get_settings(dialog);
-@@ -9639,8 +9639,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_settings(int /*long*/
+@@ -9623,8 +9623,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_settings(int /*long*/
}
}
/** @method flags=dynamic */
@@ -23454,7 +23562,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_print_unix_dialog_get_selected_printer(dialog);
-@@ -9649,8 +9649,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_selected_printer(int
+@@ -9633,8 +9633,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_selected_printer(int
}
}
/** @method flags=dynamic */
@@ -23465,7 +23573,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_print_unix_dialog_set_manual_capabilities(dialog, capabilities);
-@@ -9658,8 +9658,8 @@ public static final void gtk_print_unix_dialog_set_manual_capabilities(int /*lon
+@@ -9642,8 +9642,8 @@ public static final void gtk_print_unix_dialog_set_manual_capabilities(int /*lon
lock.unlock();
}
}
@@ -23476,7 +23584,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_progress_bar_new();
-@@ -9668,8 +9668,8 @@ public static final int /*long*/ gtk_progress_bar_new() {
+@@ -9652,8 +9652,8 @@ public static final int /*long*/ gtk_progress_bar_new() {
}
}
/** @param pbar cast=(GtkProgressBar *) */
@@ -23487,7 +23595,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_progress_bar_pulse(pbar);
-@@ -9681,8 +9681,8 @@ public static final void gtk_progress_bar_pulse(int /*long*/ pbar) {
+@@ -9665,8 +9665,8 @@ public static final void gtk_progress_bar_pulse(int /*long*/ pbar) {
* @param pbar cast=(GtkProgressBar *)
* @param fraction cast=(gdouble)
*/
@@ -23498,7 +23606,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_progress_bar_set_fraction(pbar, fraction);
-@@ -9694,8 +9694,8 @@ public static final void gtk_progress_bar_set_fraction(int /*long*/ pbar, double
+@@ -9678,8 +9678,8 @@ public static final void gtk_progress_bar_set_fraction(int /*long*/ pbar, double
* @param pbar cast=(GtkProgressBar *)
* @param orientation cast=(GtkProgressBarOrientation)
*/
@@ -23509,7 +23617,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_progress_bar_set_orientation(pbar, orientation);
-@@ -9704,8 +9704,8 @@ public static final void gtk_progress_bar_set_orientation(int /*long*/ pbar, int
+@@ -9688,8 +9688,8 @@ public static final void gtk_progress_bar_set_orientation(int /*long*/ pbar, int
}
}
/** @param radio_button cast=(GtkRadioButton *) */
@@ -23520,7 +23628,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_radio_button_get_group(radio_button);
-@@ -9714,8 +9714,8 @@ public static final int /*long*/ gtk_radio_button_get_group(int /*long*/ radio_b
+@@ -9698,8 +9698,8 @@ public static final int /*long*/ gtk_radio_button_get_group(int /*long*/ radio_b
}
}
/** @param group cast=(GSList *) */
@@ -23531,7 +23639,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_radio_button_new(group);
-@@ -9724,8 +9724,8 @@ public static final int /*long*/ gtk_radio_button_new(int /*long*/ group) {
+@@ -9708,8 +9708,8 @@ public static final int /*long*/ gtk_radio_button_new(int /*long*/ group) {
}
}
/** @param radio_menu_item cast=(GtkRadioMenuItem *) */
@@ -23542,7 +23650,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_radio_menu_item_get_group(radio_menu_item);
-@@ -9734,8 +9734,8 @@ public static final int /*long*/ gtk_radio_menu_item_get_group(int /*long*/ radi
+@@ -9718,8 +9718,8 @@ public static final int /*long*/ gtk_radio_menu_item_get_group(int /*long*/ radi
}
}
/** @param group cast=(GSList *) */
@@ -23553,7 +23661,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_radio_menu_item_new(group);
-@@ -9747,8 +9747,8 @@ public static final int /*long*/ gtk_radio_menu_item_new(int /*long*/ group) {
+@@ -9731,8 +9731,8 @@ public static final int /*long*/ gtk_radio_menu_item_new(int /*long*/ group) {
* @param group cast=(GSList *)
* @param label cast=(const gchar *)
*/
@@ -23564,7 +23672,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_radio_menu_item_new_with_label(group, label);
-@@ -9757,8 +9757,8 @@ public static final int /*long*/ gtk_radio_menu_item_new_with_label(int /*long*/
+@@ -9741,8 +9741,8 @@ public static final int /*long*/ gtk_radio_menu_item_new_with_label(int /*long*/
}
}
/** @param range cast=(GtkRange *) */
@@ -23575,7 +23683,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_range_get_adjustment(range);
-@@ -9767,8 +9767,8 @@ public static final int /*long*/ gtk_range_get_adjustment(int /*long*/ range) {
+@@ -9751,8 +9751,8 @@ public static final int /*long*/ gtk_range_get_adjustment(int /*long*/ range) {
}
}
/** @param range cast=(GtkRange *) */
@@ -23586,7 +23694,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_range_set_increments(range, step, page);
-@@ -9777,8 +9777,8 @@ public static final void gtk_range_set_increments(int /*long*/ range, double ste
+@@ -9761,8 +9761,8 @@ public static final void gtk_range_set_increments(int /*long*/ range, double ste
}
}
/** @param range cast=(GtkRange *) */
@@ -23597,7 +23705,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_range_set_inverted(range, setting);
-@@ -9787,8 +9787,8 @@ public static final void gtk_range_set_inverted(int /*long*/ range, boolean sett
+@@ -9771,8 +9771,8 @@ public static final void gtk_range_set_inverted(int /*long*/ range, boolean sett
}
}
/** @param range cast=(GtkRange *) */
@@ -23608,7 +23716,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_range_set_range(range, min, max);
-@@ -9797,8 +9797,8 @@ public static final void gtk_range_set_range(int /*long*/ range, double min, dou
+@@ -9781,8 +9781,8 @@ public static final void gtk_range_set_range(int /*long*/ range, double min, dou
}
}
/** @param range cast=(GtkRange *) */
@@ -23619,7 +23727,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_range_set_value(range, value);
-@@ -9817,8 +9817,8 @@ public static final void gtk_rc_parse_string(byte[] rc_string) {
+@@ -9801,8 +9801,8 @@ public static final void gtk_rc_parse_string(byte[] rc_string) {
}
}
/** @param style cast=(GtkRcStyle *) */
@@ -23630,7 +23738,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_rc_style_get_bg_pixmap_name(style, index);
-@@ -9827,8 +9827,8 @@ public static final int /*long*/ gtk_rc_style_get_bg_pixmap_name(int /*long*/ st
+@@ -9811,8 +9811,8 @@ public static final int /*long*/ gtk_rc_style_get_bg_pixmap_name(int /*long*/ st
}
}
/** @param style cast=(GtkRcStyle *) */
@@ -23641,7 +23749,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_rc_style_get_color_flags(style, index);
-@@ -9840,8 +9840,8 @@ public static final int gtk_rc_style_get_color_flags(int /*long*/ style, int ind
+@@ -9824,8 +9824,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
*/
@@ -23652,7 +23760,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_rc_style_set_bg(style, index, color);
-@@ -9853,8 +9853,8 @@ public static final void gtk_rc_style_set_bg(int /*long*/ style, int index, GdkC
+@@ -9837,8 +9837,8 @@ public static final void gtk_rc_style_set_bg(int /*long*/ style, int index, GdkC
* @param style cast=(GtkRcStyle *)
* @param name cast=(char *)
*/
@@ -23663,7 +23771,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_rc_style_set_bg_pixmap_name(style, index, name);
-@@ -9863,8 +9863,8 @@ public static final void gtk_rc_style_set_bg_pixmap_name(int /*long*/ style, int
+@@ -9847,8 +9847,8 @@ public static final void gtk_rc_style_set_bg_pixmap_name(int /*long*/ style, int
}
}
/** @param style cast=(GtkRcStyle *) */
@@ -23674,7 +23782,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_rc_style_set_color_flags(style, index, flag);
-@@ -9876,8 +9876,8 @@ public static final void gtk_rc_style_set_color_flags(int /*long*/ style, int in
+@@ -9860,8 +9860,8 @@ public static final void gtk_rc_style_set_color_flags(int /*long*/ style, int in
* @param scale cast=(GtkScale *)
* @param digits cast=(gint)
*/
@@ -23685,7 +23793,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_scale_set_digits(scale, digits);
-@@ -9889,8 +9889,8 @@ public static final void gtk_scale_set_digits(int /*long*/ scale, int digits) {
+@@ -9873,8 +9873,8 @@ public static final void gtk_scale_set_digits(int /*long*/ scale, int digits) {
* @param scale cast=(GtkScale *)
* @param draw_value cast=(gboolean)
*/
@@ -23696,7 +23804,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_scale_set_draw_value(scale, draw_value);
-@@ -9902,8 +9902,8 @@ public static final void gtk_scale_set_draw_value(int /*long*/ scale, boolean dr
+@@ -9886,8 +9886,8 @@ public static final void gtk_scale_set_draw_value(int /*long*/ scale, boolean dr
* @param style cast=(GtkRcStyle *)
* @param color flags=no_out
*/
@@ -23707,7 +23815,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_rc_style_set_fg(style, index, color);
-@@ -9915,8 +9915,8 @@ public static final void gtk_rc_style_set_fg(int /*long*/ style, int index, GdkC
+@@ -9899,8 +9899,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
*/
@@ -23718,7 +23826,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_rc_style_set_text(style, index, color);
-@@ -9928,8 +9928,8 @@ public static final void gtk_rc_style_set_text(int /*long*/ style, int index, Gd
+@@ -9912,8 +9912,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 *)
*/
@@ -23729,7 +23837,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_scrolled_window_add_with_viewport(scrolled_window, child);
-@@ -9938,8 +9938,8 @@ public static final void gtk_scrolled_window_add_with_viewport(int /*long*/ scro
+@@ -9922,8 +9922,8 @@ public static final void gtk_scrolled_window_add_with_viewport(int /*long*/ scro
}
}
/** @param scrolled_window cast=(GtkScrolledWindow *) */
@@ -23740,7 +23848,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_scrolled_window_get_hadjustment(scrolled_window);
-@@ -9952,8 +9952,8 @@ public static final int /*long*/ gtk_scrolled_window_get_hadjustment(int /*long*
+@@ -9936,8 +9936,8 @@ public static final int /*long*/ gtk_scrolled_window_get_hadjustment(int /*long*
* @param hscrollbar_policy cast=(GtkPolicyType *)
* @param vscrollbar_policy cast=(GtkPolicyType *)
*/
@@ -23751,7 +23859,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_scrolled_window_get_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy);
-@@ -9962,8 +9962,8 @@ public static final void gtk_scrolled_window_get_policy(int /*long*/ scrolled_wi
+@@ -9946,8 +9946,8 @@ public static final void gtk_scrolled_window_get_policy(int /*long*/ scrolled_wi
}
}
/** @param scrolled_window cast=(GtkScrolledWindow *) */
@@ -23762,7 +23870,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_scrolled_window_get_shadow_type(scrolled_window);
-@@ -9972,8 +9972,8 @@ public static final int gtk_scrolled_window_get_shadow_type(int /*long*/ scrolle
+@@ -9956,8 +9956,8 @@ public static final int gtk_scrolled_window_get_shadow_type(int /*long*/ scrolle
}
}
/** @param scrolled_window cast=(GtkScrolledWindow *) */
@@ -23773,7 +23881,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_scrolled_window_get_vadjustment(scrolled_window);
-@@ -9985,8 +9985,8 @@ public static final int /*long*/ gtk_scrolled_window_get_vadjustment(int /*long*
+@@ -9969,8 +9969,8 @@ public static final int /*long*/ gtk_scrolled_window_get_vadjustment(int /*long*
* @param hadjustment cast=(GtkAdjustment *)
* @param vadjustment cast=(GtkAdjustment *)
*/
@@ -23784,7 +23892,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_scrolled_window_new(hadjustment, vadjustment);
-@@ -9998,8 +9998,8 @@ public static final int /*long*/ gtk_scrolled_window_new(int /*long*/ hadjustmen
+@@ -9982,8 +9982,8 @@ public static final int /*long*/ gtk_scrolled_window_new(int /*long*/ hadjustmen
* @param scrolled_window cast=(GtkScrolledWindow *)
* @param placement cast=(GtkCornerType)
*/
@@ -23795,7 +23903,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_scrolled_window_set_placement(scrolled_window, placement);
-@@ -10012,8 +10012,8 @@ public static final void gtk_scrolled_window_set_placement(int /*long*/ scrolled
+@@ -9996,8 +9996,8 @@ public static final void gtk_scrolled_window_set_placement(int /*long*/ scrolled
* @param hscrollbar_policy cast=(GtkPolicyType)
* @param vscrollbar_policy cast=(GtkPolicyType)
*/
@@ -23806,7 +23914,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_scrolled_window_set_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy);
-@@ -10025,8 +10025,8 @@ public static final void gtk_scrolled_window_set_policy(int /*long*/ scrolled_wi
+@@ -10009,8 +10009,8 @@ public static final void gtk_scrolled_window_set_policy(int /*long*/ scrolled_wi
* @param scrolled_window cast=(GtkScrolledWindow *)
* @param type cast=(GtkShadowType)
*/
@@ -23817,7 +23925,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_scrolled_window_set_shadow_type(scrolled_window, type);
-@@ -10034,8 +10034,8 @@ public static final void gtk_scrolled_window_set_shadow_type(int /*long*/ scroll
+@@ -10018,8 +10018,8 @@ public static final void gtk_scrolled_window_set_shadow_type(int /*long*/ scroll
lock.unlock();
}
}
@@ -23828,7 +23936,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_settings_get_default();
-@@ -10049,8 +10049,8 @@ public static final int /*long*/ gtk_settings_get_default() {
+@@ -10033,8 +10033,8 @@ public static final int /*long*/ gtk_settings_get_default() {
* @param v_string cast=(const gchar *)
* @param origin cast=(const gchar *)
*/
@@ -23839,7 +23947,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_settings_set_string_property(settings, name, v_string, origin);
-@@ -10059,8 +10059,8 @@ public static final void gtk_settings_set_string_property(int /*long*/ settings,
+@@ -10043,8 +10043,8 @@ public static final void gtk_settings_set_string_property(int /*long*/ settings,
}
}
/** @param selection_data cast=(GtkSelectionData *) */
@@ -23850,7 +23958,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_selection_data_free(selection_data);
-@@ -10075,8 +10075,8 @@ public static final void gtk_selection_data_free(int /*long*/ selection_data) {
+@@ -10059,8 +10059,8 @@ public static final void gtk_selection_data_free(int /*long*/ selection_data) {
* @param data cast=(const guchar *)
* @param length cast=(gint)
*/
@@ -23861,7 +23969,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_selection_data_set(selection_data, type, format, data, length);
-@@ -10084,8 +10084,8 @@ public static final void gtk_selection_data_set(int /*long*/ selection_data, int
+@@ -10068,8 +10068,8 @@ public static final void gtk_selection_data_set(int /*long*/ selection_data, int
lock.unlock();
}
}
@@ -23872,7 +23980,29 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_separator_menu_item_new();
-@@ -10094,8 +10094,8 @@ public static final int /*long*/ gtk_separator_menu_item_new() {
+@@ -10077,8 +10077,8 @@ public static final int /*long*/ gtk_separator_menu_item_new() {
+ lock.unlock();
+ }
+ }
+-public static final native int /*long*/ _gtk_separator_tool_item_new();
+-public static final int /*long*/ gtk_separator_tool_item_new() {
++public static final native long /*int*/ _gtk_separator_tool_item_new();
++public static final long /*int*/ gtk_separator_tool_item_new() {
+ lock.lock();
+ try {
+ return _gtk_separator_tool_item_new();
+@@ -10090,8 +10090,8 @@ public static final int /*long*/ gtk_separator_tool_item_new() {
+ * @param item cast=(GtkSeparatorToolItem *)
+ * @param draw cast=(gboolean)
+ */
+-public static final native void _gtk_separator_tool_item_set_draw(int /*long*/ item, boolean draw);
+-public static final void gtk_separator_tool_item_set_draw(int /*long*/ item, boolean draw) {
++public static final native void _gtk_separator_tool_item_set_draw(long /*int*/ item, boolean draw);
++public static final void gtk_separator_tool_item_set_draw(long /*int*/ item, boolean draw) {
+ lock.lock();
+ try {
+ _gtk_separator_tool_item_set_draw(item, draw);
+@@ -10100,8 +10100,8 @@ public static final void gtk_separator_tool_item_set_draw(int /*long*/ item, boo
}
}
/** @method flags=dynamic */
@@ -23883,7 +24013,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_set_locale();
-@@ -10104,8 +10104,8 @@ public static final int /*long*/ gtk_set_locale() {
+@@ -10110,8 +10110,8 @@ public static final int /*long*/ gtk_set_locale() {
}
}
/** @param socket cast=(GtkSocket *) */
@@ -23894,7 +24024,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_socket_get_id(socket);
-@@ -10113,8 +10113,8 @@ public static final int /*long*/ gtk_socket_get_id(int /*long*/ socket) {
+@@ -10119,8 +10119,8 @@ public static final int /*long*/ gtk_socket_get_id(int /*long*/ socket) {
lock.unlock();
}
}
@@ -23905,7 +24035,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_socket_new();
-@@ -10123,8 +10123,8 @@ public static final int /*long*/ gtk_socket_new() {
+@@ -10129,8 +10129,8 @@ public static final int /*long*/ gtk_socket_new() {
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -23916,7 +24046,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_spin_button_new(adjustment, climb_rate, digits);
-@@ -10136,8 +10136,8 @@ public static final int /*long*/ gtk_spin_button_new(int /*long*/ adjustment, do
+@@ -10142,8 +10142,8 @@ public static final int /*long*/ gtk_spin_button_new(int /*long*/ adjustment, do
* @param spin_button cast=(GtkSpinButton*)
* @param adjustment cast=(GtkAdjustment *)
**/
@@ -23927,7 +24057,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_spin_button_configure(spin_button, adjustment, climb_rate, digits);
-@@ -10146,8 +10146,8 @@ public static final void gtk_spin_button_configure(int /*long*/ spin_button, int
+@@ -10152,8 +10152,8 @@ public static final void gtk_spin_button_configure(int /*long*/ spin_button, int
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -23938,7 +24068,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_spin_button_get_adjustment(spin_button);
-@@ -10157,8 +10157,8 @@ public static final int /*long*/ gtk_spin_button_get_adjustment(int /*long*/ spi
+@@ -10163,8 +10163,8 @@ public static final int /*long*/ gtk_spin_button_get_adjustment(int /*long*/ spi
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -23949,7 +24079,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_spin_button_get_digits(spin_button);
-@@ -10167,8 +10167,8 @@ public static final int gtk_spin_button_get_digits(int /*long*/ spin_button) {
+@@ -10173,8 +10173,8 @@ public static final int gtk_spin_button_get_digits(int /*long*/ spin_button) {
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -23960,7 +24090,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_spin_button_set_digits(spin_button, digits);
-@@ -10177,8 +10177,8 @@ public static final void gtk_spin_button_set_digits(int /*long*/ spin_button, in
+@@ -10183,8 +10183,8 @@ public static final void gtk_spin_button_set_digits(int /*long*/ spin_button, in
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -23971,7 +24101,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_spin_button_set_increments(spin_button, step, page);
-@@ -10187,8 +10187,8 @@ public static final void gtk_spin_button_set_increments(int /*long*/ spin_button
+@@ -10193,8 +10193,8 @@ public static final void gtk_spin_button_set_increments(int /*long*/ spin_button
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -23982,7 +24112,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_spin_button_set_range(spin_button, max, min);
-@@ -10197,8 +10197,8 @@ public static final void gtk_spin_button_set_range(int /*long*/ spin_button, dou
+@@ -10203,8 +10203,8 @@ public static final void gtk_spin_button_set_range(int /*long*/ spin_button, dou
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -23993,7 +24123,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_spin_button_set_value(spin_button, value);
-@@ -10207,8 +10207,8 @@ public static final void gtk_spin_button_set_value(int /*long*/ spin_button, dou
+@@ -10213,8 +10213,8 @@ public static final void gtk_spin_button_set_value(int /*long*/ spin_button, dou
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -24004,7 +24134,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_spin_button_set_wrap(spin_button, wrap);
-@@ -10217,8 +10217,8 @@ public static final void gtk_spin_button_set_wrap(int /*long*/ spin_button, bool
+@@ -10223,8 +10223,8 @@ public static final void gtk_spin_button_set_wrap(int /*long*/ spin_button, bool
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -24015,7 +24145,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_spin_button_update(spin_button);
-@@ -10229,8 +10229,8 @@ public static final void gtk_spin_button_update(int /*long*/ spin_button) {
+@@ -10235,8 +10235,8 @@ public static final void gtk_spin_button_update(int /*long*/ spin_button) {
/**
* @method flags=dynamic
*/
@@ -24026,7 +24156,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_status_icon_get_geometry(handle, screen, area, orientation);
-@@ -10241,8 +10241,8 @@ public static final boolean gtk_status_icon_get_geometry(int /*long*/ handle, in
+@@ -10247,8 +10247,8 @@ public static final boolean gtk_status_icon_get_geometry(int /*long*/ handle, in
/**
* @method flags=dynamic
*/
@@ -24037,7 +24167,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_status_icon_get_visible(handle);
-@@ -10251,8 +10251,8 @@ public static final boolean gtk_status_icon_get_visible(int /*long*/ handle) {
+@@ -10257,8 +10257,8 @@ public static final boolean gtk_status_icon_get_visible(int /*long*/ handle) {
}
}
/** @method flags=dynamic */
@@ -24048,7 +24178,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_status_icon_new();
-@@ -10263,8 +10263,8 @@ public static final int /*long*/ gtk_status_icon_new() {
+@@ -10269,8 +10269,8 @@ public static final int /*long*/ gtk_status_icon_new() {
/**
* @method flags=dynamic
*/
@@ -24059,7 +24189,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_status_icon_set_from_pixbuf(handle, pixbuf);
-@@ -10275,8 +10275,8 @@ public static final void gtk_status_icon_set_from_pixbuf(int /*long*/ handle, in
+@@ -10281,8 +10281,8 @@ public static final void gtk_status_icon_set_from_pixbuf(int /*long*/ handle, in
/**
* @method flags=dynamic
*/
@@ -24070,7 +24200,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_status_icon_set_visible(handle, visible);
-@@ -10287,8 +10287,8 @@ public static final void gtk_status_icon_set_visible(int /*long*/ handle, boolea
+@@ -10293,8 +10293,8 @@ public static final void gtk_status_icon_set_visible(int /*long*/ handle, boolea
/**
* @method flags=dynamic
*/
@@ -24081,7 +24211,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_status_icon_set_tooltip(handle, tip_text);
-@@ -10300,8 +10300,8 @@ public static final void gtk_status_icon_set_tooltip(int /*long*/ handle, byte[]
+@@ -10306,8 +10306,8 @@ public static final void gtk_status_icon_set_tooltip(int /*long*/ handle, byte[]
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -24092,7 +24222,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_style_get_base(style, index, color);
-@@ -10313,8 +10313,8 @@ public static final void gtk_style_get_base(int /*long*/ style, int index, GdkCo
+@@ -10319,8 +10319,8 @@ public static final void gtk_style_get_base(int /*long*/ style, int index, GdkCo
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -24103,7 +24233,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_style_get_black(style, color);
-@@ -10326,8 +10326,8 @@ public static final void gtk_style_get_black(int /*long*/ style, GdkColor color)
+@@ -10332,8 +10332,8 @@ public static final void gtk_style_get_black(int /*long*/ style, GdkColor color)
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -24114,7 +24244,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_style_get_bg(style, index, color);
-@@ -10339,8 +10339,8 @@ public static final void gtk_style_get_bg(int /*long*/ style, int index, GdkColo
+@@ -10345,8 +10345,8 @@ public static final void gtk_style_get_bg(int /*long*/ style, int index, GdkColo
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -24125,7 +24255,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_style_get_dark(style, index, color);
-@@ -10352,8 +10352,8 @@ public static final void gtk_style_get_dark(int /*long*/ style, int index, GdkCo
+@@ -10358,8 +10358,8 @@ public static final void gtk_style_get_dark(int /*long*/ style, int index, GdkCo
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -24136,7 +24266,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_style_get_fg(style, index, color);
-@@ -10365,8 +10365,8 @@ public static final void gtk_style_get_fg(int /*long*/ style, int index, GdkColo
+@@ -10371,8 +10371,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
*/
@@ -24147,7 +24277,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_style_get_fg_gc(style, index, gc);
-@@ -10378,8 +10378,8 @@ public static final void gtk_style_get_fg_gc(int /*long*/ style, int index, int
+@@ -10384,8 +10384,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
*/
@@ -24158,7 +24288,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_style_get_bg_gc(style, index, gc);
-@@ -10391,8 +10391,8 @@ public static final void gtk_style_get_bg_gc(int /*long*/ style, int index, int
+@@ -10397,8 +10397,8 @@ public static final void gtk_style_get_bg_gc(int /*long*/ style, int index, int
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -24169,7 +24299,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_style_get_light_gc(style, index, gc);
-@@ -10404,8 +10404,8 @@ public static final void gtk_style_get_light_gc(int /*long*/ style, int index, i
+@@ -10410,8 +10410,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
*/
@@ -24180,7 +24310,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_style_get_dark_gc(style, index, gc);
-@@ -10417,8 +10417,8 @@ public static final void gtk_style_get_dark_gc(int /*long*/ style, int index, in
+@@ -10423,8 +10423,8 @@ public static final void gtk_style_get_dark_gc(int /*long*/ style, int index, in
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -24191,7 +24321,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_style_get_mid_gc(style, index, gc);
-@@ -10430,8 +10430,8 @@ public static final void gtk_style_get_mid_gc(int /*long*/ style, int index, int
+@@ -10436,8 +10436,8 @@ public static final void gtk_style_get_mid_gc(int /*long*/ style, int index, int
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -24202,7 +24332,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_style_get_text_gc(style, index, gc);
-@@ -10443,8 +10443,8 @@ public static final void gtk_style_get_text_gc(int /*long*/ style, int index, in
+@@ -10449,8 +10449,8 @@ public static final void gtk_style_get_text_gc(int /*long*/ style, int index, in
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -24213,7 +24343,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_style_get_text_aa_gc(style, index, gc);
-@@ -10456,8 +10456,8 @@ public static final void gtk_style_get_text_aa_gc(int /*long*/ style, int index,
+@@ -10462,8 +10462,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
*/
@@ -24224,7 +24354,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_style_get_black_gc(style, gc);
-@@ -10469,8 +10469,8 @@ public static final void gtk_style_get_black_gc(int /*long*/ style, int /*long*/
+@@ -10475,8 +10475,8 @@ public static final void gtk_style_get_black_gc(int /*long*/ style, int /*long*/
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -24235,7 +24365,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_style_get_white_gc(style, gc);
-@@ -10479,8 +10479,8 @@ public static final void gtk_style_get_white_gc(int /*long*/ style, int /*long*/
+@@ -10485,8 +10485,8 @@ public static final void gtk_style_get_white_gc(int /*long*/ style, int /*long*/
}
}
/** @param style cast=(GtkStyle *) */
@@ -24246,7 +24376,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_style_get_font_desc(style);
-@@ -10492,8 +10492,8 @@ public static final int /*long*/ gtk_style_get_font_desc(int /*long*/ style) {
+@@ -10498,8 +10498,8 @@ public static final int /*long*/ gtk_style_get_font_desc(int /*long*/ style) {
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -24257,7 +24387,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_style_get_light(style, index, color);
-@@ -10505,8 +10505,8 @@ public static final void gtk_style_get_light(int /*long*/ style, int index, GdkC
+@@ -10511,8 +10511,8 @@ public static final void gtk_style_get_light(int /*long*/ style, int index, GdkC
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -24268,7 +24398,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_style_get_text(style, index, color);
-@@ -10515,8 +10515,8 @@ public static final void gtk_style_get_text(int /*long*/ style, int index, GdkCo
+@@ -10521,8 +10521,8 @@ public static final void gtk_style_get_text(int /*long*/ style, int index, GdkCo
}
}
/** @param style cast=(GtkStyle *) */
@@ -24279,7 +24409,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_style_get_xthickness(style);
-@@ -10525,8 +10525,8 @@ public static final int gtk_style_get_xthickness(int /*long*/ style) {
+@@ -10531,8 +10531,8 @@ public static final int gtk_style_get_xthickness(int /*long*/ style) {
}
}
/** @param style cast=(GtkStyle *) */
@@ -24290,7 +24420,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_style_get_ythickness(style);
-@@ -10540,8 +10540,8 @@ public static final int gtk_style_get_ythickness(int /*long*/ style) {
+@@ -10546,8 +10546,8 @@ public static final int gtk_style_get_ythickness(int /*long*/ style) {
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -24301,7 +24431,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_style_render_icon(style, source, direction, state, size, widget, detail);
-@@ -10553,8 +10553,8 @@ public static final int /*long*/ gtk_style_render_icon(int /*long*/ style, int /
+@@ -10559,8 +10559,8 @@ public static final int /*long*/ gtk_style_render_icon(int /*long*/ style, int /
* @param targets cast=(const GtkTargetEntry *)
* @param ntargets cast=(guint)
*/
@@ -24312,7 +24442,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_target_list_new(targets, ntargets);
-@@ -10563,8 +10563,8 @@ public static final int /*long*/ gtk_target_list_new(int /*long*/ targets, int n
+@@ -10569,8 +10569,8 @@ public static final int /*long*/ gtk_target_list_new(int /*long*/ targets, int n
}
}
/** @param list cast=(GtkTargetList *) */
@@ -24323,7 +24453,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_target_list_unref(list);
-@@ -10576,8 +10576,8 @@ public static final void gtk_target_list_unref(int /*long*/ list) {
+@@ -10582,8 +10582,8 @@ public static final void gtk_target_list_unref(int /*long*/ list) {
* @param buffer cast=(GtkTextBuffer *)
* @param clipboard cast=(GtkClipboard *)
*/
@@ -24334,7 +24464,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_buffer_copy_clipboard(buffer, clipboard);
-@@ -10590,8 +10590,8 @@ public static final void gtk_text_buffer_copy_clipboard(int /*long*/ buffer, int
+@@ -10596,8 +10596,8 @@ public static final void gtk_text_buffer_copy_clipboard(int /*long*/ buffer, int
* @param clipboard cast=(GtkClipboard *)
* @param default_editable cast=(gboolean)
*/
@@ -24345,7 +24475,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_buffer_cut_clipboard(buffer, clipboard, default_editable);
-@@ -10604,8 +10604,8 @@ public static final void gtk_text_buffer_cut_clipboard(int /*long*/ buffer, int
+@@ -10610,8 +10610,8 @@ public static final void gtk_text_buffer_cut_clipboard(int /*long*/ buffer, int
* @param start cast=(GtkTextIter *)
* @param end cast=(GtkTextIter *)
*/
@@ -24356,7 +24486,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_buffer_delete(buffer, start, end);
-@@ -10618,8 +10618,8 @@ public static final void gtk_text_buffer_delete(int /*long*/ buffer, byte[] star
+@@ -10624,8 +10624,8 @@ public static final void gtk_text_buffer_delete(int /*long*/ buffer, byte[] star
* @param start cast=(GtkTextIter *)
* @param end cast=(GtkTextIter *)
*/
@@ -24367,7 +24497,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_buffer_get_bounds(buffer, start, end);
-@@ -10628,8 +10628,8 @@ public static final void gtk_text_buffer_get_bounds(int /*long*/ buffer, byte[]
+@@ -10634,8 +10634,8 @@ public static final void gtk_text_buffer_get_bounds(int /*long*/ buffer, byte[]
}
}
/** @param buffer cast=(GtkTextBuffer *) */
@@ -24378,7 +24508,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_text_buffer_get_char_count(buffer);
-@@ -10641,8 +10641,8 @@ public static final int gtk_text_buffer_get_char_count(int /*long*/ buffer) {
+@@ -10647,8 +10647,8 @@ public static final int gtk_text_buffer_get_char_count(int /*long*/ buffer) {
* @param buffer cast=(GtkTextBuffer *)
* @param iter cast=(GtkTextIter *)
*/
@@ -24389,7 +24519,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_buffer_get_end_iter(buffer, iter);
-@@ -10651,8 +10651,8 @@ public static final void gtk_text_buffer_get_end_iter(int /*long*/ buffer, byte[
+@@ -10657,8 +10657,8 @@ public static final void gtk_text_buffer_get_end_iter(int /*long*/ buffer, byte[
}
}
/** @param buffer cast=(GtkTextBuffer *) */
@@ -24400,7 +24530,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_text_buffer_get_insert(buffer);
-@@ -10665,8 +10665,8 @@ public static final int /*long*/ gtk_text_buffer_get_insert(int /*long*/ buffer)
+@@ -10671,8 +10671,8 @@ public static final int /*long*/ gtk_text_buffer_get_insert(int /*long*/ buffer)
* @param iter cast=(GtkTextIter *)
* @param line_number cast=(gint)
*/
@@ -24411,7 +24541,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_buffer_get_iter_at_line(buffer, iter, line_number);
-@@ -10679,8 +10679,8 @@ public static final void gtk_text_buffer_get_iter_at_line(int /*long*/ buffer, b
+@@ -10685,8 +10685,8 @@ public static final void gtk_text_buffer_get_iter_at_line(int /*long*/ buffer, b
* @param iter cast=(GtkTextIter *)
* @param mark cast=(GtkTextMark *)
*/
@@ -24422,7 +24552,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
-@@ -10693,8 +10693,8 @@ public static final void gtk_text_buffer_get_iter_at_mark(int /*long*/ buffer, b
+@@ -10699,8 +10699,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)
*/
@@ -24433,7 +24563,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_buffer_get_iter_at_offset(buffer, iter, char_offset);
-@@ -10703,8 +10703,8 @@ public static final void gtk_text_buffer_get_iter_at_offset(int /*long*/ buffer,
+@@ -10709,8 +10709,8 @@ public static final void gtk_text_buffer_get_iter_at_offset(int /*long*/ buffer,
}
}
/** @param buffer cast=(GtkTextBuffer *) */
@@ -24444,7 +24574,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_text_buffer_get_line_count(buffer);
-@@ -10713,8 +10713,8 @@ public static final int gtk_text_buffer_get_line_count(int /*long*/ buffer) {
+@@ -10719,8 +10719,8 @@ public static final int gtk_text_buffer_get_line_count(int /*long*/ buffer) {
}
}
/** @param buffer cast=(GtkTextBuffer *) */
@@ -24455,7 +24585,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_text_buffer_get_selection_bound(buffer);
-@@ -10727,8 +10727,8 @@ public static final int /*long*/ gtk_text_buffer_get_selection_bound(int /*long*
+@@ -10733,8 +10733,8 @@ public static final int /*long*/ gtk_text_buffer_get_selection_bound(int /*long*
* @param start cast=(GtkTextIter *)
* @param end cast=(GtkTextIter *)
*/
@@ -24466,7 +24596,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_text_buffer_get_selection_bounds(buffer, start, end);
-@@ -10742,8 +10742,8 @@ public static final boolean gtk_text_buffer_get_selection_bounds(int /*long*/ bu
+@@ -10748,8 +10748,8 @@ public static final boolean gtk_text_buffer_get_selection_bounds(int /*long*/ bu
* @param end cast=(GtkTextIter *)
* @param include_hidden_chars cast=(gboolean)
*/
@@ -24477,7 +24607,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_text_buffer_get_text(buffer, start, end, include_hidden_chars);
-@@ -10757,8 +10757,8 @@ public static final int /*long*/ gtk_text_buffer_get_text(int /*long*/ buffer, b
+@@ -10763,8 +10763,8 @@ public static final int /*long*/ gtk_text_buffer_get_text(int /*long*/ buffer, b
* @param text cast=(const gchar *)
* @param len cast=(gint)
*/
@@ -24488,7 +24618,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_buffer_insert(buffer, iter, text, len);
-@@ -10772,8 +10772,8 @@ public static final void gtk_text_buffer_insert(int /*long*/ buffer, byte[] iter
+@@ -10778,8 +10778,8 @@ public static final void gtk_text_buffer_insert(int /*long*/ buffer, byte[] iter
* @param text cast=(const gchar *)
* @param len cast=(gint)
*/
@@ -24499,7 +24629,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_buffer_insert(buffer, iter, text, len);
-@@ -10786,8 +10786,8 @@ public static final void gtk_text_buffer_insert(int /*long*/ buffer, int /*long*
+@@ -10792,8 +10792,8 @@ public static final void gtk_text_buffer_insert(int /*long*/ buffer, int /*long*
* @param mark cast=(GtkTextMark *)
* @param where cast=(const GtkTextIter *)
*/
@@ -24510,7 +24640,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_buffer_move_mark(buffer, mark, where);
-@@ -10801,8 +10801,8 @@ public static final void gtk_text_buffer_move_mark(int /*long*/ buffer, int /*lo
+@@ -10807,8 +10807,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)
*/
@@ -24521,7 +24651,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_buffer_paste_clipboard(buffer, clipboard, override_location, default_editable);
-@@ -10814,8 +10814,8 @@ public static final void gtk_text_buffer_paste_clipboard(int /*long*/ buffer, in
+@@ -10820,8 +10820,8 @@ public static final void gtk_text_buffer_paste_clipboard(int /*long*/ buffer, in
* @param buffer cast=(GtkTextBuffer *)
* @param where cast=(const GtkTextIter *)
*/
@@ -24532,7 +24662,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_buffer_place_cursor(buffer, where);
-@@ -10828,8 +10828,8 @@ public static final void gtk_text_buffer_place_cursor(int /*long*/ buffer, byte[
+@@ -10834,8 +10834,8 @@ public static final void gtk_text_buffer_place_cursor(int /*long*/ buffer, byte[
* @param text cast=(const gchar *)
* @param len cast=(gint)
*/
@@ -24543,7 +24673,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_buffer_set_text(buffer, text, len);
-@@ -10865,8 +10865,8 @@ public static final int gtk_text_iter_get_offset(byte[] iter) {
+@@ -10871,8 +10871,8 @@ public static final int gtk_text_iter_get_offset(byte[] iter) {
* @param window_x cast=(gint *)
* @param window_y cast=(gint *)
*/
@@ -24554,7 +24684,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_view_buffer_to_window_coords(text_view, win, buffer_x, buffer_y, window_x, window_y);
-@@ -10875,8 +10875,8 @@ public static final void gtk_text_view_buffer_to_window_coords(int /*long*/ text
+@@ -10881,8 +10881,8 @@ public static final void gtk_text_view_buffer_to_window_coords(int /*long*/ text
}
}
/** @param text_view cast=(GtkTextView *) */
@@ -24565,7 +24695,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_text_view_get_buffer(text_view);
-@@ -10885,8 +10885,8 @@ public static final int /*long*/ gtk_text_view_get_buffer(int /*long*/ text_view
+@@ -10891,8 +10891,8 @@ public static final int /*long*/ gtk_text_view_get_buffer(int /*long*/ text_view
}
}
/** @param text_view cast=(GtkTextView *) */
@@ -24576,7 +24706,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_text_view_get_editable(text_view);
-@@ -10900,8 +10900,8 @@ public static final boolean gtk_text_view_get_editable(int /*long*/ text_view) {
+@@ -10906,8 +10906,8 @@ public static final boolean gtk_text_view_get_editable(int /*long*/ text_view) {
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -24587,7 +24717,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_view_get_iter_at_location(text_view, iter, x, y);
-@@ -10914,8 +10914,8 @@ public static final void gtk_text_view_get_iter_at_location(int /*long*/ text_vi
+@@ -10920,8 +10920,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
*/
@@ -24598,7 +24728,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_view_get_iter_location(text_view, iter, location);
-@@ -10929,8 +10929,8 @@ public static final void gtk_text_view_get_iter_location(int /*long*/ text_view,
+@@ -10935,8 +10935,8 @@ public static final void gtk_text_view_get_iter_location(int /*long*/ text_view,
* @param y cast=(gint)
* @param line_top cast=(gint *)
*/
@@ -24609,7 +24739,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_view_get_line_at_y(text_view, target_iter, y, line_top);
-@@ -10942,8 +10942,8 @@ public static final void gtk_text_view_get_line_at_y(int /*long*/ text_view, byt
+@@ -10948,8 +10948,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
*/
@@ -24620,7 +24750,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_view_get_visible_rect(text_view, visible_rect);
-@@ -10955,8 +10955,8 @@ public static final void gtk_text_view_get_visible_rect(int /*long*/ text_view,
+@@ -10961,8 +10961,8 @@ public static final void gtk_text_view_get_visible_rect(int /*long*/ text_view,
* @param text_view cast=(GtkTextView *)
* @param win cast=(GtkTextWindowType)
*/
@@ -24631,7 +24761,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_text_view_get_window(text_view, win);
-@@ -10964,8 +10964,8 @@ public static final int /*long*/ gtk_text_view_get_window(int /*long*/ text_view
+@@ -10970,8 +10970,8 @@ public static final int /*long*/ gtk_text_view_get_window(int /*long*/ text_view
lock.unlock();
}
}
@@ -24642,7 +24772,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_text_view_new();
-@@ -10977,8 +10977,8 @@ public static final int /*long*/ gtk_text_view_new() {
+@@ -10983,8 +10983,8 @@ public static final int /*long*/ gtk_text_view_new() {
* @param text_view cast=(GtkTextView *)
* @param mark cast=(GtkTextMark *)
*/
@@ -24653,7 +24783,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_view_scroll_mark_onscreen(text_view, mark);
-@@ -10994,8 +10994,8 @@ public static final void gtk_text_view_scroll_mark_onscreen(int /*long*/ text_vi
+@@ -11000,8 +11000,8 @@ public static final void gtk_text_view_scroll_mark_onscreen(int /*long*/ text_vi
* @param xalign cast=(gdouble)
* @param yalign cast=(gdouble)
*/
@@ -24664,7 +24794,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_text_view_scroll_to_iter(text_view, iter, within_margin, use_align, xalign, yalign);
-@@ -11007,8 +11007,8 @@ public static final boolean gtk_text_view_scroll_to_iter(int /*long*/ text_view,
+@@ -11013,8 +11013,8 @@ public static final boolean gtk_text_view_scroll_to_iter(int /*long*/ text_view,
* @param text_view cast=(GtkTextView *)
* @param setting cast=(gboolean)
*/
@@ -24675,7 +24805,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_view_set_editable(text_view, setting);
-@@ -11017,8 +11017,8 @@ public static final void gtk_text_view_set_editable(int /*long*/ text_view, bool
+@@ -11023,8 +11023,8 @@ public static final void gtk_text_view_set_editable(int /*long*/ text_view, bool
}
}
/** @param text_view cast=(GtkTextView *) */
@@ -24686,7 +24816,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_view_set_justification(text_view, justification);
-@@ -11030,8 +11030,8 @@ public static final void gtk_text_view_set_justification(int /*long*/ text_view,
+@@ -11036,8 +11036,8 @@ public static final void gtk_text_view_set_justification(int /*long*/ text_view,
* @param text_view cast=(GtkTextView *)
* @param tabs cast=(PangoTabArray *)
*/
@@ -24697,7 +24827,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_view_set_tabs(text_view, tabs);
-@@ -11040,8 +11040,8 @@ public static final void gtk_text_view_set_tabs(int /*long*/ text_view, int /*lo
+@@ -11046,8 +11046,8 @@ public static final void gtk_text_view_set_tabs(int /*long*/ text_view, int /*lo
}
}
/** @param text_view cast=(GtkTextView *) */
@@ -24708,7 +24838,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_view_set_wrap_mode(text_view, wrap_mode);
-@@ -11057,8 +11057,8 @@ public static final void gtk_text_view_set_wrap_mode(int /*long*/ text_view, int
+@@ -11063,8 +11063,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 *)
*/
@@ -24719,7 +24849,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_text_view_window_to_buffer_coords(text_view, win, window_x, window_y, buffer_x, buffer_y);
-@@ -11071,8 +11071,8 @@ public static final void gtk_text_view_window_to_buffer_coords(int /*long*/ text
+@@ -11077,8 +11077,8 @@ public static final void gtk_text_view_window_to_buffer_coords(int /*long*/ text
* @param function cast=(GSourceFunc)
* @param data cast=(gpointer)
*/
@@ -24730,7 +24860,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _g_timeout_add(interval, function, data);
-@@ -11081,8 +11081,8 @@ public static final int g_timeout_add(int interval, int /*long*/ function, int /
+@@ -11087,8 +11087,8 @@ public static final int g_timeout_add(int interval, int /*long*/ function, int /
}
}
/** @param toggle_button cast=(GtkToggleButton *) */
@@ -24741,7 +24871,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_toggle_button_get_active(toggle_button);
-@@ -11090,8 +11090,8 @@ public static final boolean gtk_toggle_button_get_active(int /*long*/ toggle_but
+@@ -11096,8 +11096,8 @@ public static final boolean gtk_toggle_button_get_active(int /*long*/ toggle_but
lock.unlock();
}
}
@@ -24752,7 +24882,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_toggle_button_new();
-@@ -11100,8 +11100,8 @@ public static final int /*long*/ gtk_toggle_button_new() {
+@@ -11106,8 +11106,8 @@ public static final int /*long*/ gtk_toggle_button_new() {
}
}
/** @param toggle_button cast=(GtkToggleButton *) */
@@ -24763,7 +24893,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_toggle_button_get_inconsistent(toggle_button);
-@@ -11113,8 +11113,8 @@ public static final boolean gtk_toggle_button_get_inconsistent(int /*long*/ togg
+@@ -11119,8 +11119,8 @@ public static final boolean gtk_toggle_button_get_inconsistent(int /*long*/ togg
* @param toggle_button cast=(GtkToggleButton *)
* @param is_active cast=(gboolean)
*/
@@ -24774,7 +24904,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_toggle_button_set_active(toggle_button, is_active);
-@@ -11126,8 +11126,8 @@ public static final void gtk_toggle_button_set_active(int /*long*/ toggle_button
+@@ -11132,8 +11132,8 @@ public static final void gtk_toggle_button_set_active(int /*long*/ toggle_button
* @param toggle_button cast=(GtkToggleButton *)
* @param setting cast=(gboolean)
*/
@@ -24785,7 +24915,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_toggle_button_set_inconsistent(toggle_button, setting);
-@@ -11139,8 +11139,8 @@ public static final void gtk_toggle_button_set_inconsistent(int /*long*/ toggle_
+@@ -11145,8 +11145,8 @@ public static final void gtk_toggle_button_set_inconsistent(int /*long*/ toggle_
* @param toggle_button cast=(GtkToggleButton *)
* @param draw_indicator cast=(gboolean)
*/
@@ -24797,6 +24927,149 @@ index 5306e6e..15bf432 100644
try {
_gtk_toggle_button_set_mode(toggle_button, draw_indicator);
@@ -11155,8 +11155,8 @@ public static final void gtk_toggle_button_set_mode(int /*long*/ toggle_button,
+ }
+ }
+ /** @param button cast=(GtkToggleToolButton *) */
+-public static final native boolean _gtk_toggle_tool_button_get_active(int /*long*/ button);
+-public static final boolean gtk_toggle_tool_button_get_active(int /*long*/ button) {
++public static final native boolean _gtk_toggle_tool_button_get_active(long /*int*/ button);
++public static final boolean gtk_toggle_tool_button_get_active(long /*int*/ button) {
+ lock.lock();
+ try {
+ return _gtk_toggle_tool_button_get_active(button);
+@@ -11164,8 +11164,8 @@ public static final boolean gtk_toggle_tool_button_get_active(int /*long*/ butto
+ lock.unlock();
+ }
+ }
+-public static final native int /*long*/ _gtk_toggle_tool_button_new();
+-public static final int /*long*/ gtk_toggle_tool_button_new() {
++public static final native long /*int*/ _gtk_toggle_tool_button_new();
++public static final long /*int*/ gtk_toggle_tool_button_new() {
+ lock.lock();
+ try {
+ return _gtk_toggle_tool_button_new();
+@@ -11177,8 +11177,8 @@ public static final int /*long*/ gtk_toggle_tool_button_new() {
+ * @param item cast=(GtkToggleToolButton *)
+ * @param selected cast=(gboolean)
+ */
+-public static final native void _gtk_toggle_tool_button_set_active(int /*long*/ item, boolean selected);
+-public static final void gtk_toggle_tool_button_set_active(int /*long*/ item, boolean selected) {
++public static final native void _gtk_toggle_tool_button_set_active(long /*int*/ item, boolean selected);
++public static final void gtk_toggle_tool_button_set_active(long /*int*/ item, boolean selected) {
+ lock.lock();
+ try {
+ _gtk_toggle_tool_button_set_active(item, selected);
+@@ -11190,8 +11190,8 @@ public static final void gtk_toggle_tool_button_set_active(int /*long*/ item, bo
+ * @param icon_widget cast=(GtkWidget *)
+ * @param label cast=(const gchar *)
+ */
+-public static final native int /*long*/ _gtk_tool_button_new(int /*long*/ icon_widget, byte[] label);
+-public static final int /*long*/ gtk_tool_button_new(int /*long*/ icon_widget, byte[] label) {
++public static final native long /*int*/ _gtk_tool_button_new(long /*int*/ icon_widget, byte[] label);
++public static final long /*int*/ gtk_tool_button_new(long /*int*/ icon_widget, byte[] label) {
+ lock.lock();
+ try {
+ return _gtk_tool_button_new(icon_widget, label);
+@@ -11203,8 +11203,8 @@ public static final int /*long*/ gtk_tool_button_new(int /*long*/ icon_widget, b
+ * @param button cast=(GtkToolButton *)
+ * @param widget cast=(GtkWidget *)
+ */
+-public static final native void _gtk_tool_button_set_icon_widget(int /*long*/ button, int /*long*/ widget);
+-public static final void gtk_tool_button_set_icon_widget(int /*long*/ button, int /*long*/ widget) {
++public static final native void _gtk_tool_button_set_icon_widget(long /*int*/ button, long /*int*/ widget);
++public static final void gtk_tool_button_set_icon_widget(long /*int*/ button, long /*int*/ widget) {
+ lock.lock();
+ try {
+ _gtk_tool_button_set_icon_widget(button, widget);
+@@ -11216,8 +11216,8 @@ public static final void gtk_tool_button_set_icon_widget(int /*long*/ button, in
+ * @param button cast=(GtkToolButton *)
+ * @param label cast=(const gchar *)
+ */
+-public static final native void _gtk_tool_button_set_label(int /*long*/ button, byte[] label);
+-public static final void gtk_tool_button_set_label(int /*long*/ button, byte[] label) {
++public static final native void _gtk_tool_button_set_label(long /*int*/ button, byte[] label);
++public static final void gtk_tool_button_set_label(long /*int*/ button, byte[] label) {
+ lock.lock();
+ try {
+ _gtk_tool_button_set_label(button, label);
+@@ -11229,8 +11229,8 @@ public static final void gtk_tool_button_set_label(int /*long*/ button, byte[]
+ * @param button cast=(GtkToolButton *)
+ * @param widget cast=(GtkWidget *)
+ */
+-public static final native void _gtk_tool_button_set_label_widget(int /*long*/ button, int /*long*/ widget);
+-public static final void gtk_tool_button_set_label_widget(int /*long*/ button, int /*long*/ widget) {
++public static final native void _gtk_tool_button_set_label_widget(long /*int*/ button, long /*int*/ widget);
++public static final void gtk_tool_button_set_label_widget(long /*int*/ button, long /*int*/ widget) {
+ lock.lock();
+ try {
+ _gtk_tool_button_set_label_widget(button, widget);
+@@ -11242,8 +11242,8 @@ public static final void gtk_tool_button_set_label_widget(int /*long*/ button,
+ * @param item cast=(GtkToolButton *)
+ * @param underline cast=(gboolean)
+ */
+-public static final native void _gtk_tool_button_set_use_underline(int /*long*/ item, boolean underline);
+-public static final void gtk_tool_button_set_use_underline(int /*long*/ item, boolean underline) {
++public static final native void _gtk_tool_button_set_use_underline(long /*int*/ item, boolean underline);
++public static final void gtk_tool_button_set_use_underline(long /*int*/ item, boolean underline) {
+ lock.lock();
+ try {
+ _gtk_tool_button_set_use_underline(item, underline);
+@@ -11255,8 +11255,8 @@ public static final void gtk_tool_button_set_use_underline(int /*long*/ item, bo
+ * @param item cast=(GtkToolItem *)
+ * @param menu_id cast=(const gchar *)
+ */
+-public static final native int /*long*/ _gtk_tool_item_get_proxy_menu_item(int /*long*/ item, byte[] menu_id);
+-public static final int /*long*/ gtk_tool_item_get_proxy_menu_item(int /*long*/ item, byte[] menu_id) {
++public static final native long /*int*/ _gtk_tool_item_get_proxy_menu_item(long /*int*/ item, byte[] menu_id);
++public static final long /*int*/ gtk_tool_item_get_proxy_menu_item(long /*int*/ item, byte[] menu_id) {
+ lock.lock();
+ try {
+ return _gtk_tool_item_get_proxy_menu_item(item, menu_id);
+@@ -11265,8 +11265,8 @@ public static final int /*long*/ gtk_tool_item_get_proxy_menu_item(int /*long*/
+ }
+ }
+ /** @param item cast=(GtkToolItem *) */
+-public static final native int /*long*/ _gtk_tool_item_retrieve_proxy_menu_item(int /*long*/ item);
+-public static final int /*long*/ gtk_tool_item_retrieve_proxy_menu_item(int /*long*/ item) {
++public static final native long /*int*/ _gtk_tool_item_retrieve_proxy_menu_item(long /*int*/ item);
++public static final long /*int*/ gtk_tool_item_retrieve_proxy_menu_item(long /*int*/ item) {
+ lock.lock();
+ try {
+ return _gtk_tool_item_retrieve_proxy_menu_item(item);
+@@ -11278,8 +11278,8 @@ public static final int /*long*/ gtk_tool_item_retrieve_proxy_menu_item(int /*lo
+ * @param item cast=(GtkToolItem *)
+ * @param important cast=(gboolean)
+ */
+-public static final native void _gtk_tool_item_set_is_important(int /*long*/ item, boolean important);
+-public static final void gtk_tool_item_set_is_important(int /*long*/ item, boolean important) {
++public static final native void _gtk_tool_item_set_is_important(long /*int*/ item, boolean important);
++public static final void gtk_tool_item_set_is_important(long /*int*/ item, boolean important) {
+ lock.lock();
+ try {
+ _gtk_tool_item_set_is_important(item, important);
+@@ -11292,8 +11292,8 @@ public static final void gtk_tool_item_set_is_important(int /*long*/ item, boole
+ * @param menu_id cast=(const gchar *)
+ * @param widget cast=(GtkWidget *)
+ */
+-public static final native void _gtk_tool_item_set_proxy_menu_item(int /*long*/ item, byte[] menu_id, int /*long*/ widget);
+-public static final void gtk_tool_item_set_proxy_menu_item(int /*long*/ item, byte[] menu_id, int /*long*/ widget) {
++public static final native void _gtk_tool_item_set_proxy_menu_item(long /*int*/ item, byte[] menu_id, long /*int*/ widget);
++public static final void gtk_tool_item_set_proxy_menu_item(long /*int*/ item, byte[] menu_id, long /*int*/ widget) {
+ lock.lock();
+ try {
+ _gtk_tool_item_set_proxy_menu_item(item, menu_id, widget);
+@@ -11305,8 +11305,8 @@ public static final void gtk_tool_item_set_proxy_menu_item(int /*long*/ item, by
+ * @param toolbar cast=(GtkToolbar *)
+ * @param item cast=(GtkToolItem *)
+ */
+-public static final native void _gtk_toolbar_insert(int /*long*/ toolbar, int /*long*/ item, int pos);
+-public static final void gtk_toolbar_insert(int /*long*/ toolbar, int /*long*/ item, int pos) {
++public static final native void _gtk_toolbar_insert(long /*int*/ toolbar, long /*int*/ item, int pos);
++public static final void gtk_toolbar_insert(long /*int*/ toolbar, long /*int*/ item, int pos) {
+ lock.lock();
+ try {
+ _gtk_toolbar_insert(toolbar, item, pos);
+@@ -11321,8 +11321,8 @@ public static final void gtk_toolbar_insert(int /*long*/ toolbar, int /*long*/ i
* @param tooltip_private_text cast=(const char *)
* @param position cast=(gint)
*/
@@ -24807,7 +25080,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_toolbar_insert_widget(toolbar, widget, tooltip_text, tooltip_private_text, position);
-@@ -11164,8 +11164,8 @@ public static final void gtk_toolbar_insert_widget(int /*long*/ toolbar, int /*l
+@@ -11330,8 +11330,8 @@ public static final void gtk_toolbar_insert_widget(int /*long*/ toolbar, int /*l
lock.unlock();
}
}
@@ -24818,7 +25091,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_toolbar_new();
-@@ -11178,8 +11178,8 @@ public static final int /*long*/ gtk_toolbar_new() {
+@@ -11344,8 +11344,8 @@ public static final int /*long*/ gtk_toolbar_new() {
* @param toolbar cast=(GtkToolbar *)
* @param orientation cast=(GtkOrientation)
*/
@@ -24829,7 +25102,29 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_toolbar_set_orientation(toolbar, orientation);
-@@ -11188,8 +11188,8 @@ public static final void gtk_toolbar_set_orientation(int /*long*/ toolbar, int o
+@@ -11357,8 +11357,8 @@ public static final void gtk_toolbar_set_orientation(int /*long*/ toolbar, int o
+ * @param toolbar cast=(GtkToolbar *)
+ * @param show_arrow cast=(gboolean)
+ */
+-public static final native void _gtk_toolbar_set_show_arrow(int /*long*/ toolbar, boolean show_arrow);
+-public static final void gtk_toolbar_set_show_arrow(int /*long*/ toolbar, boolean show_arrow) {
++public static final native void _gtk_toolbar_set_show_arrow(long /*int*/ toolbar, boolean show_arrow);
++public static final void gtk_toolbar_set_show_arrow(long /*int*/ toolbar, boolean show_arrow) {
+ lock.lock();
+ try {
+ _gtk_toolbar_set_show_arrow(toolbar, show_arrow);
+@@ -11369,8 +11369,8 @@ public static final void gtk_toolbar_set_show_arrow(int /*long*/ toolbar, boolea
+ /** @param toolbar cast=(GtkToolbar *)
+ * @param style cast=(GtkToolbarStyle)
+ */
+-public static final native void _gtk_toolbar_set_style(int /*long*/ toolbar, int style);
+-public static final void gtk_toolbar_set_style(int /*long*/ toolbar, int style) {
++public static final native void _gtk_toolbar_set_style(long /*int*/ toolbar, int style);
++public static final void gtk_toolbar_set_style(long /*int*/ toolbar, int style) {
+ lock.lock();
+ try {
+ _gtk_toolbar_set_style(toolbar, style);
+@@ -11379,8 +11379,8 @@ public static final void gtk_toolbar_set_style(int /*long*/ toolbar, int style)
}
}
/** @method flags=dynamic */
@@ -24840,7 +25135,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tooltips_data_get(widget);
-@@ -11198,8 +11198,8 @@ public static final int /*long*/ gtk_tooltips_data_get(int /*long*/ widget) {
+@@ -11389,8 +11389,8 @@ public static final int /*long*/ gtk_tooltips_data_get(int /*long*/ widget) {
}
}
/** @method flags=dynamic */
@@ -24851,7 +25146,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tooltips_disable(tooltips);
-@@ -11208,8 +11208,8 @@ public static final void gtk_tooltips_disable(int /*long*/ tooltips) {
+@@ -11399,8 +11399,8 @@ public static final void gtk_tooltips_disable(int /*long*/ tooltips) {
}
}
/** @method flags=dynamic */
@@ -24862,7 +25157,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tooltips_enable(tooltips);
-@@ -11217,8 +11217,8 @@ public static final void gtk_tooltips_enable(int /*long*/ tooltips) {
+@@ -11408,8 +11408,8 @@ public static final void gtk_tooltips_enable(int /*long*/ tooltips) {
lock.unlock();
}
}
@@ -24873,7 +25168,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tooltips_new();
-@@ -11227,8 +11227,8 @@ public static final int /*long*/ gtk_tooltips_new() {
+@@ -11418,8 +11418,8 @@ public static final int /*long*/ gtk_tooltips_new() {
}
}
/** @method flags=dynamic */
@@ -24884,7 +25179,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tooltips_force_window(tooltips);
-@@ -11239,8 +11239,8 @@ public static final void gtk_tooltips_force_window(int /*long*/ tooltips) {
+@@ -11430,8 +11430,8 @@ public static final void gtk_tooltips_force_window(int /*long*/ tooltips) {
/**
* @method flags=dynamic
*/
@@ -24895,7 +25190,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tooltips_set_tip(tooltips, widget, tip_text, tip_private);
-@@ -11252,8 +11252,8 @@ public static final void gtk_tooltips_set_tip(int /*long*/ tooltips, int /*long*
+@@ -11443,8 +11443,8 @@ public static final void gtk_tooltips_set_tip(int /*long*/ tooltips, int /*long*
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -24906,7 +25201,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_model_get(tree_model, iter, column, value, terminator);
-@@ -11265,8 +11265,8 @@ public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*
+@@ -11456,8 +11456,8 @@ public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -24917,7 +25212,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_model_get(tree_model, iter, column, value, terminator);
-@@ -11279,8 +11279,8 @@ public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*
+@@ -11470,8 +11470,8 @@ public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*
* @param iter cast=(GtkTreeIter *)
* @param path cast=(GtkTreePath *)
*/
@@ -24928,7 +25223,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_model_get_iter(tree_model, iter, path);
-@@ -11292,8 +11292,8 @@ public static final boolean gtk_tree_model_get_iter(int /*long*/ tree_model, int
+@@ -11483,8 +11483,8 @@ public static final boolean gtk_tree_model_get_iter(int /*long*/ tree_model, int
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -24939,7 +25234,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_model_get_iter_first(tree_model, iter);
-@@ -11302,8 +11302,8 @@ public static final boolean gtk_tree_model_get_iter_first(int /*long*/ tree_mode
+@@ -11493,8 +11493,8 @@ public static final boolean gtk_tree_model_get_iter_first(int /*long*/ tree_mode
}
}
/** @param tree_model cast=(GtkTreeModel *) */
@@ -24950,7 +25245,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_model_get_n_columns(tree_model);
-@@ -11315,8 +11315,8 @@ public static final int gtk_tree_model_get_n_columns(int /*long*/ tree_model) {
+@@ -11506,8 +11506,8 @@ public static final int gtk_tree_model_get_n_columns(int /*long*/ tree_model) {
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -24961,7 +25256,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_model_get_path(tree_model, iter);
-@@ -11324,8 +11324,8 @@ public static final int /*long*/ gtk_tree_model_get_path(int /*long*/ tree_model
+@@ -11515,8 +11515,8 @@ public static final int /*long*/ gtk_tree_model_get_path(int /*long*/ tree_model
lock.unlock();
}
}
@@ -24972,7 +25267,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_model_get_type();
-@@ -11338,8 +11338,8 @@ public static final int /*long*/ gtk_tree_model_get_type() {
+@@ -11529,8 +11529,8 @@ public static final int /*long*/ gtk_tree_model_get_type() {
* @param iter cast=(GtkTreeIter *)
* @param parent cast=(GtkTreeIter *)
*/
@@ -24983,7 +25278,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_model_iter_children(model, iter, parent);
-@@ -11351,8 +11351,8 @@ public static final boolean gtk_tree_model_iter_children(int /*long*/ model, int
+@@ -11542,8 +11542,8 @@ public static final boolean gtk_tree_model_iter_children(int /*long*/ model, int
* @param model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -24994,7 +25289,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_model_iter_n_children(model, iter);
-@@ -11364,8 +11364,8 @@ public static final int gtk_tree_model_iter_n_children(int /*long*/ model, int /
+@@ -11555,8 +11555,8 @@ public static final int gtk_tree_model_iter_n_children(int /*long*/ model, int /
* @param model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25005,7 +25300,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_model_iter_next(model, iter);
-@@ -11378,8 +11378,8 @@ public static final boolean gtk_tree_model_iter_next(int /*long*/ model, int /*l
+@@ -11569,8 +11569,8 @@ public static final boolean gtk_tree_model_iter_next(int /*long*/ model, int /*l
* @param iter cast=(GtkTreeIter *)
* @param parent cast=(GtkTreeIter *)
*/
@@ -25016,7 +25311,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_model_iter_nth_child(tree_model, iter, parent, n);
-@@ -11388,8 +11388,8 @@ public static final boolean gtk_tree_model_iter_nth_child(int /*long*/ tree_mode
+@@ -11579,8 +11579,8 @@ public static final boolean gtk_tree_model_iter_nth_child(int /*long*/ tree_mode
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25027,7 +25322,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_path_append_index(path, index);
-@@ -11401,8 +11401,8 @@ public static final void gtk_tree_path_append_index(int /*long*/ path, int index
+@@ -11592,8 +11592,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 *)
*/
@@ -25038,7 +25333,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_path_compare(a, b);
-@@ -11411,8 +11411,8 @@ public static final int /*long*/ gtk_tree_path_compare(int /*long*/ a, int /*lon
+@@ -11602,8 +11602,8 @@ public static final int /*long*/ gtk_tree_path_compare(int /*long*/ a, int /*lon
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25049,7 +25344,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_path_down(path);
-@@ -11421,8 +11421,8 @@ public static final void gtk_tree_path_down(int /*long*/ path) {
+@@ -11612,8 +11612,8 @@ public static final void gtk_tree_path_down(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25060,7 +25355,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_path_free(path);
-@@ -11431,8 +11431,8 @@ public static final void gtk_tree_path_free(int /*long*/ path) {
+@@ -11622,8 +11622,8 @@ public static final void gtk_tree_path_free(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25071,7 +25366,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_path_get_depth(path);
-@@ -11441,8 +11441,8 @@ public static final int gtk_tree_path_get_depth(int /*long*/ path) {
+@@ -11632,8 +11632,8 @@ public static final int gtk_tree_path_get_depth(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25082,7 +25377,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_path_get_indices(path);
-@@ -11450,8 +11450,8 @@ public static final int /*long*/ gtk_tree_path_get_indices(int /*long*/ path) {
+@@ -11641,8 +11641,8 @@ public static final int /*long*/ gtk_tree_path_get_indices(int /*long*/ path) {
lock.unlock();
}
}
@@ -25093,7 +25388,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_path_new();
-@@ -11459,8 +11459,8 @@ public static final int /*long*/ gtk_tree_path_new() {
+@@ -11650,8 +11650,8 @@ public static final int /*long*/ gtk_tree_path_new() {
lock.unlock();
}
}
@@ -25104,7 +25399,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_path_new_first();
-@@ -11469,8 +11469,8 @@ public static final int /*long*/ gtk_tree_path_new_first() {
+@@ -11660,8 +11660,8 @@ public static final int /*long*/ gtk_tree_path_new_first() {
}
}
/** @param path cast=(const gchar *) */
@@ -25115,7 +25410,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_path_new_from_string(path);
-@@ -11479,8 +11479,8 @@ public static final int /*long*/ gtk_tree_path_new_from_string(byte[] path) {
+@@ -11670,8 +11670,8 @@ public static final int /*long*/ gtk_tree_path_new_from_string(byte[] path) {
}
}
/** @param path cast=(const gchar *) */
@@ -25126,7 +25421,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_path_new_from_string(path);
-@@ -11489,8 +11489,8 @@ public static final int /*long*/ gtk_tree_path_new_from_string(int /*long*/ path
+@@ -11680,8 +11680,8 @@ public static final int /*long*/ gtk_tree_path_new_from_string(int /*long*/ path
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25137,7 +25432,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_path_next(path);
-@@ -11499,8 +11499,8 @@ public static final void gtk_tree_path_next(int /*long*/ path) {
+@@ -11690,8 +11690,8 @@ public static final void gtk_tree_path_next(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25148,7 +25443,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_path_prev(path);
-@@ -11509,8 +11509,8 @@ public static final boolean gtk_tree_path_prev(int /*long*/ path) {
+@@ -11700,8 +11700,8 @@ public static final boolean gtk_tree_path_prev(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25159,7 +25454,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_path_up(path);
-@@ -11522,8 +11522,8 @@ public static final boolean gtk_tree_path_up(int /*long*/ path) {
+@@ -11713,8 +11713,8 @@ public static final boolean gtk_tree_path_up(int /*long*/ path) {
* @method flags=dynamic
* @param selection cast=(GtkTreeSelection *)
*/
@@ -25170,7 +25465,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_selection_count_selected_rows(selection);
-@@ -11536,8 +11536,8 @@ public static final int gtk_tree_selection_count_selected_rows(int /*long*/ sele
+@@ -11727,8 +11727,8 @@ public static final int gtk_tree_selection_count_selected_rows(int /*long*/ sele
* @param model cast=(GtkTreeModel **)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25181,7 +25476,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_selection_get_selected(selection, model, iter);
-@@ -11550,8 +11550,8 @@ public static final boolean gtk_tree_selection_get_selected(int /*long*/ selecti
+@@ -11741,8 +11741,8 @@ public static final boolean gtk_tree_selection_get_selected(int /*long*/ selecti
* @param selection cast=(GtkTreeSelection *)
* @param model cast=(GtkTreeModel **)
*/
@@ -25192,7 +25487,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_selection_get_selected_rows(selection, model);
-@@ -11563,8 +11563,8 @@ public static final int /*long*/ gtk_tree_selection_get_selected_rows(int /*long
+@@ -11754,8 +11754,8 @@ public static final int /*long*/ gtk_tree_selection_get_selected_rows(int /*long
* @param selection cast=(GtkTreeSelection *)
* @param path cast=(GtkTreePath *)
*/
@@ -25203,7 +25498,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_selection_path_is_selected(selection, path);
-@@ -11573,8 +11573,8 @@ public static final boolean gtk_tree_selection_path_is_selected(int /*long*/ sel
+@@ -11764,8 +11764,8 @@ public static final boolean gtk_tree_selection_path_is_selected(int /*long*/ sel
}
}
/** @param selection cast=(GtkTreeSelection *) */
@@ -25214,7 +25509,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_selection_select_all(selection);
-@@ -11586,8 +11586,8 @@ public static final void gtk_tree_selection_select_all(int /*long*/ selection) {
+@@ -11777,8 +11777,8 @@ public static final void gtk_tree_selection_select_all(int /*long*/ selection) {
* @param selection cast=(GtkTreeSelection *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25225,7 +25520,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_selection_select_iter(selection, iter);
-@@ -11600,8 +11600,8 @@ public static final void gtk_tree_selection_select_iter(int /*long*/ selection,
+@@ -11791,8 +11791,8 @@ public static final void gtk_tree_selection_select_iter(int /*long*/ selection,
* @param func cast=(GtkTreeSelectionForeachFunc)
* @param data cast=(gpointer)
*/
@@ -25236,7 +25531,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_selection_selected_foreach(selection, func, data);
-@@ -11613,8 +11613,8 @@ public static final void gtk_tree_selection_selected_foreach(int /*long*/ select
+@@ -11804,8 +11804,8 @@ public static final void gtk_tree_selection_selected_foreach(int /*long*/ select
* @param selection cast=(GtkTreeSelection *)
* @param mode cast=(GtkSelectionMode)
*/
@@ -25247,7 +25542,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_selection_set_mode(selection, mode);
-@@ -11623,8 +11623,8 @@ public static final void gtk_tree_selection_set_mode(int /*long*/ selection, int
+@@ -11814,8 +11814,8 @@ public static final void gtk_tree_selection_set_mode(int /*long*/ selection, int
}
}
/** @param selection cast=(GtkTreeSelection *) */
@@ -25258,7 +25553,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_selection_unselect_all(selection);
-@@ -11636,8 +11636,8 @@ public static final void gtk_tree_selection_unselect_all(int /*long*/ selection)
+@@ -11827,8 +11827,8 @@ public static final void gtk_tree_selection_unselect_all(int /*long*/ selection)
* @param selection cast=(GtkTreeSelection *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25269,7 +25564,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_selection_unselect_iter(selection, iter);
-@@ -11650,8 +11650,8 @@ public static final void gtk_tree_selection_unselect_iter(int /*long*/ selection
+@@ -11841,8 +11841,8 @@ public static final void gtk_tree_selection_unselect_iter(int /*long*/ selection
* @param iter cast=(GtkTreeIter *)
* @param parent cast=(GtkTreeIter *)
*/
@@ -25280,7 +25575,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_store_append(store, iter, parent);
-@@ -11660,8 +11660,8 @@ public static final void gtk_tree_store_append(int /*long*/ store, int /*long*/
+@@ -11851,8 +11851,8 @@ public static final void gtk_tree_store_append(int /*long*/ store, int /*long*/
}
}
/** @param store cast=(GtkTreeStore *) */
@@ -25291,7 +25586,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_store_clear(store);
-@@ -11675,8 +11675,8 @@ public static final void gtk_tree_store_clear(int /*long*/ store) {
+@@ -11866,8 +11866,8 @@ public static final void gtk_tree_store_clear(int /*long*/ store) {
* @param parent cast=(GtkTreeIter *)
* @param position cast=(gint)
*/
@@ -25302,7 +25597,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_store_insert(store, iter, parent, position);
-@@ -11685,8 +11685,8 @@ public static final void gtk_tree_store_insert(int /*long*/ store, int /*long*/
+@@ -11876,8 +11876,8 @@ public static final void gtk_tree_store_insert(int /*long*/ store, int /*long*/
}
}
/** @param types cast=(GType *) */
@@ -25313,7 +25608,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_store_newv(numColumns, types);
-@@ -11698,8 +11698,8 @@ public static final int /*long*/ gtk_tree_store_newv(int numColumns, int /*long*
+@@ -11889,8 +11889,8 @@ public static final int /*long*/ gtk_tree_store_newv(int numColumns, int /*long*
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25324,7 +25619,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_store_remove(store, iter);
-@@ -11711,8 +11711,8 @@ public static final void gtk_tree_store_remove(int /*long*/ store, int /*long*/
+@@ -11902,8 +11902,8 @@ public static final void gtk_tree_store_remove(int /*long*/ store, int /*long*/
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25335,7 +25630,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -11724,8 +11724,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
+@@ -11915,8 +11915,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25346,7 +25641,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -11737,8 +11737,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
+@@ -11928,8 +11928,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25357,7 +25652,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -11751,8 +11751,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
+@@ -11942,8 +11942,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param iter cast=(GtkTreeIter *)
* @param value flags=no_out
*/
@@ -25368,7 +25663,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -11764,8 +11764,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
+@@ -11955,8 +11955,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25379,7 +25674,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -11777,8 +11777,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
+@@ -11968,8 +11968,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
@@ -25390,7 +25685,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_create_row_drag_icon(view, path);
-@@ -11790,8 +11790,8 @@ public static final int /*long*/ gtk_tree_view_create_row_drag_icon(int /*long*/
+@@ -11981,8 +11981,8 @@ public static final int /*long*/ gtk_tree_view_create_row_drag_icon(int /*long*/
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
@@ -25401,7 +25696,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_collapse_row(view, path);
-@@ -11805,8 +11805,8 @@ public static final boolean gtk_tree_view_collapse_row(int /*long*/ view, int /*
+@@ -11996,8 +11996,8 @@ public static final boolean gtk_tree_view_collapse_row(int /*long*/ view, int /*
* @param attribute cast=(const gchar *)
* @param column cast=(gint)
*/
@@ -25412,7 +25707,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_column_add_attribute(treeColumn, cellRenderer, attribute, column);
-@@ -11821,8 +11821,8 @@ public static final void gtk_tree_view_column_add_attribute(int /*long*/ treeCol
+@@ -12012,8 +12012,8 @@ public static final void gtk_tree_view_column_add_attribute(int /*long*/ treeCol
* @param start_pos cast=(gint *)
* @param width cast=(gint *)
*/
@@ -25423,7 +25718,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_column_cell_get_position(tree_column, cell_renderer, start_pos, width);
-@@ -11838,8 +11838,8 @@ public static final boolean gtk_tree_view_column_cell_get_position(int /*long*/
+@@ -12029,8 +12029,8 @@ public static final boolean gtk_tree_view_column_cell_get_position(int /*long*/
* @param width cast=(gint *)
* @param height cast=(gint *)
*/
@@ -25434,7 +25729,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_column_cell_get_size(tree_column, cell_area, x_offset, y_offset, width, height);
-@@ -11852,8 +11852,8 @@ public static final void gtk_tree_view_column_cell_get_size(int /*long*/ tree_co
+@@ -12043,8 +12043,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 *)
*/
@@ -25445,7 +25740,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_column_cell_set_cell_data(tree_column, tree_model, iter, is_expander, is_expanded);
-@@ -11862,8 +11862,8 @@ public static final void gtk_tree_view_column_cell_set_cell_data(int /*long*/ tr
+@@ -12053,8 +12053,8 @@ public static final void gtk_tree_view_column_cell_set_cell_data(int /*long*/ tr
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -25456,7 +25751,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_column_clear(tree_column);
-@@ -11875,8 +11875,8 @@ public static final void gtk_tree_view_column_clear(int /*long*/ tree_column) {
+@@ -12066,8 +12066,8 @@ public static final void gtk_tree_view_column_clear(int /*long*/ tree_column) {
* @method flags=dynamic
* @param tree_column cast=(GtkTreeViewColumn *)
*/
@@ -25467,7 +25762,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_column_get_cell_renderers(tree_column);
-@@ -11885,8 +11885,8 @@ public static final int /*long*/ gtk_tree_view_column_get_cell_renderers(int /*l
+@@ -12076,8 +12076,8 @@ public static final int /*long*/ gtk_tree_view_column_get_cell_renderers(int /*l
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -25478,7 +25773,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_column_get_fixed_width(column);
-@@ -11895,8 +11895,8 @@ public static final int gtk_tree_view_column_get_fixed_width(int /*long*/ column
+@@ -12086,8 +12086,8 @@ public static final int gtk_tree_view_column_get_fixed_width(int /*long*/ column
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -25489,7 +25784,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_column_get_reorderable(column);
-@@ -11905,8 +11905,8 @@ public static final boolean gtk_tree_view_column_get_reorderable(int /*long*/ co
+@@ -12096,8 +12096,8 @@ public static final boolean gtk_tree_view_column_get_reorderable(int /*long*/ co
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -25500,7 +25795,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_column_get_resizable(column);
-@@ -11915,8 +11915,8 @@ public static final boolean gtk_tree_view_column_get_resizable(int /*long*/ colu
+@@ -12106,8 +12106,8 @@ public static final boolean gtk_tree_view_column_get_resizable(int /*long*/ colu
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -25511,7 +25806,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_column_get_sizing(tree_column);
-@@ -11925,8 +11925,8 @@ public static final int gtk_tree_view_column_get_sizing(int /*long*/ tree_column
+@@ -12116,8 +12116,8 @@ public static final int gtk_tree_view_column_get_sizing(int /*long*/ tree_column
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -25522,7 +25817,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_column_get_spacing(tree_column);
-@@ -11935,8 +11935,8 @@ public static final int gtk_tree_view_column_get_spacing(int /*long*/ tree_colum
+@@ -12126,8 +12126,8 @@ public static final int gtk_tree_view_column_get_spacing(int /*long*/ tree_colum
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -25533,7 +25828,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_column_get_visible(column);
-@@ -11945,8 +11945,8 @@ public static final boolean gtk_tree_view_column_get_visible(int /*long*/ column
+@@ -12136,8 +12136,8 @@ public static final boolean gtk_tree_view_column_get_visible(int /*long*/ column
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -25544,7 +25839,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_column_get_sort_indicator(tree_column);
-@@ -11955,8 +11955,8 @@ public static final boolean gtk_tree_view_column_get_sort_indicator(int /*long*/
+@@ -12146,8 +12146,8 @@ public static final boolean gtk_tree_view_column_get_sort_indicator(int /*long*/
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -25555,7 +25850,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_column_get_sort_order(tree_column);
-@@ -11965,8 +11965,8 @@ public static final int gtk_tree_view_column_get_sort_order(int /*long*/ tree_co
+@@ -12156,8 +12156,8 @@ public static final int gtk_tree_view_column_get_sort_order(int /*long*/ tree_co
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -25566,7 +25861,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_column_get_width(column);
-@@ -11974,8 +11974,8 @@ public static final int gtk_tree_view_column_get_width(int /*long*/ column) {
+@@ -12165,8 +12165,8 @@ public static final int gtk_tree_view_column_get_width(int /*long*/ column) {
lock.unlock();
}
}
@@ -25577,7 +25872,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_column_new();
-@@ -11988,8 +11988,8 @@ public static final int /*long*/ gtk_tree_view_column_new() {
+@@ -12179,8 +12179,8 @@ public static final int /*long*/ gtk_tree_view_column_new() {
* @param cell_renderer cast=(GtkCellRenderer *)
* @param expand cast=(gboolean)
*/
@@ -25588,7 +25883,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_column_pack_start(tree_column, cell_renderer, expand);
-@@ -12002,8 +12002,8 @@ public static final void gtk_tree_view_column_pack_start(int /*long*/ tree_colum
+@@ -12193,8 +12193,8 @@ public static final void gtk_tree_view_column_pack_start(int /*long*/ tree_colum
* @param cell_renderer cast=(GtkCellRenderer *)
* @param expand cast=(gboolean)
*/
@@ -25599,7 +25894,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_column_pack_end(tree_column, cell_renderer, expand);
-@@ -12012,8 +12012,8 @@ public static final void gtk_tree_view_column_pack_end(int /*long*/ tree_column,
+@@ -12203,8 +12203,8 @@ public static final void gtk_tree_view_column_pack_end(int /*long*/ tree_column,
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -25610,7 +25905,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_column_set_alignment(tree_column, xalign);
-@@ -12028,8 +12028,8 @@ public static final void gtk_tree_view_column_set_alignment(int /*long*/ tree_co
+@@ -12219,8 +12219,8 @@ public static final void gtk_tree_view_column_set_alignment(int /*long*/ tree_co
* @param func_data cast=(gpointer)
* @param destroy cast=(GDestroyNotify)
*/
@@ -25621,7 +25916,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_column_set_cell_data_func(tree_column, cell_renderer, func, func_data, destroy);
-@@ -12041,8 +12041,8 @@ public static final void gtk_tree_view_column_set_cell_data_func(int /*long*/ tr
+@@ -12232,8 +12232,8 @@ public static final void gtk_tree_view_column_set_cell_data_func(int /*long*/ tr
* @param column cast=(GtkTreeViewColumn *)
* @param clickable cast=(gboolean)
*/
@@ -25632,7 +25927,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_column_set_clickable(column, clickable);
-@@ -12054,8 +12054,8 @@ public static final void gtk_tree_view_column_set_clickable(int /*long*/ column,
+@@ -12245,8 +12245,8 @@ public static final void gtk_tree_view_column_set_clickable(int /*long*/ column,
* @param column cast=(GtkTreeViewColumn *)
* @param fixed_width cast=(gint)
*/
@@ -25643,7 +25938,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_column_set_fixed_width(column, fixed_width);
-@@ -12067,8 +12067,8 @@ public static final void gtk_tree_view_column_set_fixed_width(int /*long*/ colum
+@@ -12258,8 +12258,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)
*/
@@ -25654,7 +25949,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_column_set_min_width(tree_column, min_width);
-@@ -12080,8 +12080,8 @@ public static final void gtk_tree_view_column_set_min_width(int /*long*/ tree_co
+@@ -12271,8 +12271,8 @@ public static final void gtk_tree_view_column_set_min_width(int /*long*/ tree_co
* @param column cast=(GtkTreeViewColumn *)
* @param reorderable cast=(gboolean)
*/
@@ -25665,7 +25960,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_column_set_reorderable(column, reorderable);
-@@ -12093,8 +12093,8 @@ public static final void gtk_tree_view_column_set_reorderable(int /*long*/ colum
+@@ -12284,8 +12284,8 @@ public static final void gtk_tree_view_column_set_reorderable(int /*long*/ colum
* @param column cast=(GtkTreeViewColumn *)
* @param resizable cast=(gboolean)
*/
@@ -25676,7 +25971,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_column_set_resizable(column, resizable);
-@@ -12106,8 +12106,8 @@ public static final void gtk_tree_view_column_set_resizable(int /*long*/ column,
+@@ -12297,8 +12297,8 @@ public static final void gtk_tree_view_column_set_resizable(int /*long*/ column,
* @param column cast=(GtkTreeViewColumn *)
* @param type cast=(GtkTreeViewColumnSizing)
*/
@@ -25687,7 +25982,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_column_set_sizing(column, type);
-@@ -12119,8 +12119,8 @@ public static final void gtk_tree_view_column_set_sizing(int /*long*/ column, in
+@@ -12310,8 +12310,8 @@ public static final void gtk_tree_view_column_set_sizing(int /*long*/ column, in
* @param tree_column cast=(GtkTreeViewColumn *)
* @param setting cast=(gboolean)
*/
@@ -25698,7 +25993,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_column_set_sort_indicator(tree_column, setting);
-@@ -12132,8 +12132,8 @@ public static final void gtk_tree_view_column_set_sort_indicator(int /*long*/ tr
+@@ -12323,8 +12323,8 @@ public static final void gtk_tree_view_column_set_sort_indicator(int /*long*/ tr
* @param tree_column cast=(GtkTreeViewColumn *)
* @param order cast=(GtkSortType)
*/
@@ -25709,7 +26004,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_column_set_sort_order(tree_column, order);
-@@ -12145,8 +12145,8 @@ public static final void gtk_tree_view_column_set_sort_order(int /*long*/ tree_c
+@@ -12336,8 +12336,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 *)
*/
@@ -25720,7 +26015,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_column_set_title(tree_column, title);
-@@ -12155,8 +12155,8 @@ public static final void gtk_tree_view_column_set_title(int /*long*/ tree_column
+@@ -12346,8 +12346,8 @@ public static final void gtk_tree_view_column_set_title(int /*long*/ tree_column
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -25731,7 +26026,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_column_set_visible(tree_column, visible);
-@@ -12168,8 +12168,8 @@ public static final void gtk_tree_view_column_set_visible (int /*long*/ tree_col
+@@ -12359,8 +12359,8 @@ public static final void gtk_tree_view_column_set_visible (int /*long*/ tree_col
* @param tree_column cast=(GtkTreeViewColumn *)
* @param widget cast=(GtkWidget *)
*/
@@ -25742,7 +26037,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_column_set_widget(tree_column, widget);
-@@ -12181,8 +12181,8 @@ public static final void gtk_tree_view_column_set_widget(int /*long*/ tree_colum
+@@ -12372,8 +12372,8 @@ public static final void gtk_tree_view_column_set_widget(int /*long*/ tree_colum
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
@@ -25753,7 +26048,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_set_drag_dest_row(view, path, pos);
-@@ -12191,8 +12191,8 @@ public static final void gtk_tree_view_set_drag_dest_row(int /*long*/ view, int
+@@ -12382,8 +12382,8 @@ public static final void gtk_tree_view_set_drag_dest_row(int /*long*/ view, int
}
}
/** @param view cast=(GtkTreeView *) */
@@ -25764,7 +26059,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_set_enable_search(view, enable_search);
-@@ -12205,8 +12205,8 @@ public static final void gtk_tree_view_set_enable_search (int /*long*/ view, boo
+@@ -12396,8 +12396,8 @@ public static final void gtk_tree_view_set_enable_search (int /*long*/ view, boo
* @param path cast=(GtkTreePath *)
* @param open_all cast=(gboolean)
*/
@@ -25775,7 +26070,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_expand_row(view, path, open_all);
-@@ -12220,8 +12220,8 @@ public static final boolean gtk_tree_view_expand_row(int /*long*/ view, int /*lo
+@@ -12411,8 +12411,8 @@ public static final boolean gtk_tree_view_expand_row(int /*long*/ view, int /*lo
* @param column cast=(GtkTreeViewColumn *)
* @param rect cast=(GdkRectangle *)
*/
@@ -25786,7 +26081,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_get_background_area(tree_view, path, column, rect);
-@@ -12230,8 +12230,8 @@ public static final void gtk_tree_view_get_background_area(int /*long*/ tree_vie
+@@ -12421,8 +12421,8 @@ public static final void gtk_tree_view_get_background_area(int /*long*/ tree_vie
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -25797,7 +26092,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_get_bin_window(tree_view);
-@@ -12245,8 +12245,8 @@ public static final int /*long*/ gtk_tree_view_get_bin_window(int /*long*/ tree_
+@@ -12436,8 +12436,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
*/
@@ -25808,7 +26103,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_get_cell_area(tree_view, path, column, rect);
-@@ -12255,8 +12255,8 @@ public static final void gtk_tree_view_get_cell_area(int /*long*/ tree_view, int
+@@ -12446,8 +12446,8 @@ public static final void gtk_tree_view_get_cell_area(int /*long*/ tree_view, int
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -25819,7 +26114,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_get_expander_column(tree_view);
-@@ -12268,8 +12268,8 @@ public static final int /*long*/gtk_tree_view_get_expander_column(int /*long*/ t
+@@ -12459,8 +12459,8 @@ public static final int /*long*/gtk_tree_view_get_expander_column(int /*long*/ t
* @param tree_view cast=(GtkTreeView *)
* @param n cast=(gint)
*/
@@ -25830,7 +26125,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_get_column(tree_view, n);
-@@ -12278,8 +12278,8 @@ public static final int /*long*/ gtk_tree_view_get_column(int /*long*/ tree_view
+@@ -12469,8 +12469,8 @@ public static final int /*long*/ gtk_tree_view_get_column(int /*long*/ tree_view
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -25841,7 +26136,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_get_columns(tree_view);
-@@ -12292,8 +12292,8 @@ public static final int /*long*/ gtk_tree_view_get_columns(int /*long*/ tree_vie
+@@ -12483,8 +12483,8 @@ public static final int /*long*/ gtk_tree_view_get_columns(int /*long*/ tree_vie
* @param path cast=(GtkTreePath **)
* @param focus_column cast=(GtkTreeViewColumn **)
*/
@@ -25852,7 +26147,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_get_cursor(tree_view, path, focus_column);
-@@ -12302,8 +12302,8 @@ public static final void gtk_tree_view_get_cursor(int /*long*/ tree_view, int /*
+@@ -12493,8 +12493,8 @@ public static final void gtk_tree_view_get_cursor(int /*long*/ tree_view, int /*
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -25863,7 +26158,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_get_headers_visible(tree_view);
-@@ -12320,8 +12320,8 @@ public static final boolean gtk_tree_view_get_headers_visible(int /*long*/ tree_
+@@ -12511,8 +12511,8 @@ public static final boolean gtk_tree_view_get_headers_visible(int /*long*/ tree_
* @param cell_x cast=(gint *)
* @param cell_y cast=(gint *)
*/
@@ -25874,7 +26169,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_get_path_at_pos(tree_view, x, y, path, column, cell_x, cell_y);
-@@ -12330,8 +12330,8 @@ public static final boolean gtk_tree_view_get_path_at_pos(int /*long*/ tree_view
+@@ -12521,8 +12521,8 @@ public static final boolean gtk_tree_view_get_path_at_pos(int /*long*/ tree_view
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -25885,7 +26180,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_get_rules_hint(tree_view);
-@@ -12340,8 +12340,8 @@ public static final boolean gtk_tree_view_get_rules_hint(int /*long*/ tree_view)
+@@ -12531,8 +12531,8 @@ public static final boolean gtk_tree_view_get_rules_hint(int /*long*/ tree_view)
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -25896,7 +26191,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_get_selection(tree_view);
-@@ -12353,8 +12353,8 @@ public static final int /*long*/ gtk_tree_view_get_selection(int /*long*/ tree_v
+@@ -12544,8 +12544,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
*/
@@ -25907,7 +26202,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_get_visible_rect(tree_view, visible_rect);
-@@ -12367,8 +12367,8 @@ public static final void gtk_tree_view_get_visible_rect(int /*long*/ tree_view,
+@@ -12558,8 +12558,8 @@ public static final void gtk_tree_view_get_visible_rect(int /*long*/ tree_view,
* @param column cast=(GtkTreeViewColumn *)
* @param position cast=(gint)
*/
@@ -25918,7 +26213,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_insert_column(tree_view, column, position);
-@@ -12381,8 +12381,8 @@ public static final int gtk_tree_view_insert_column(int /*long*/ tree_view, int
+@@ -12572,8 +12572,8 @@ public static final int gtk_tree_view_insert_column(int /*long*/ tree_view, int
* @param column cast=(GtkTreeViewColumn *)
* @param base_column cast=(GtkTreeViewColumn *)
*/
@@ -25929,7 +26224,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_move_column_after(tree_view, column, base_column);
-@@ -12391,8 +12391,8 @@ public static final void gtk_tree_view_move_column_after(int /*long*/ tree_view,
+@@ -12582,8 +12582,8 @@ public static final void gtk_tree_view_move_column_after(int /*long*/ tree_view,
}
}
/** @param model cast=(GtkTreeModel *) */
@@ -25940,7 +26235,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_new_with_model(model);
-@@ -12404,8 +12404,8 @@ public static final int /*long*/ gtk_tree_view_new_with_model(int /*long*/ model
+@@ -12595,8 +12595,8 @@ public static final int /*long*/ gtk_tree_view_new_with_model(int /*long*/ model
* @param tree_view cast=(GtkTreeView *)
* @param column cast=(GtkTreeViewColumn *)
*/
@@ -25951,7 +26246,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_remove_column(tree_view, column);
-@@ -12417,8 +12417,8 @@ public static final void gtk_tree_view_remove_column(int /*long*/ tree_view, int
+@@ -12608,8 +12608,8 @@ public static final void gtk_tree_view_remove_column(int /*long*/ tree_view, int
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
@@ -25962,7 +26257,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_tree_view_row_expanded(view, path);
-@@ -12434,8 +12434,8 @@ public static final boolean gtk_tree_view_row_expanded(int /*long*/ view, int /*
+@@ -12625,8 +12625,8 @@ public static final boolean gtk_tree_view_row_expanded(int /*long*/ view, int /*
* @param row_aligh cast=(gfloat)
* @param column_align cast=(gfloat)
*/
@@ -25973,7 +26268,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_scroll_to_cell(tree_view, path, column, use_align, row_aligh, column_align);
-@@ -12448,8 +12448,8 @@ public static final void gtk_tree_view_scroll_to_cell(int /*long*/ tree_view, in
+@@ -12639,8 +12639,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)
*/
@@ -25984,7 +26279,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_scroll_to_point(tree_view, tree_x, tree_y);
-@@ -12462,8 +12462,8 @@ public static final void gtk_tree_view_scroll_to_point (int /*long*/ tree_view,
+@@ -12653,8 +12653,8 @@ public static final void gtk_tree_view_scroll_to_point (int /*long*/ tree_view,
* @param path cast=(GtkTreePath *)
* @param focus_column cast=(GtkTreeViewColumn *)
*/
@@ -25995,7 +26290,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_set_cursor(tree_view, path, focus_column, start_editing);
-@@ -12475,8 +12475,8 @@ public static final void gtk_tree_view_set_cursor(int /*long*/ tree_view, int /*
+@@ -12666,8 +12666,8 @@ public static final void gtk_tree_view_set_cursor(int /*long*/ tree_view, int /*
* @method flags=dynamic
* @param tree_view cast=(GtkTreeView*)
*/
@@ -26006,7 +26301,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_set_grid_lines(tree_view, grid_lines);
-@@ -12488,8 +12488,8 @@ public static final void gtk_tree_view_set_grid_lines(int /*long*/ tree_view, in
+@@ -12679,8 +12679,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)
*/
@@ -26017,7 +26312,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_set_headers_visible(tree_view, visible);
-@@ -12501,8 +12501,8 @@ public static final void gtk_tree_view_set_headers_visible(int /*long*/ tree_vie
+@@ -12692,8 +12692,8 @@ public static final void gtk_tree_view_set_headers_visible(int /*long*/ tree_vie
* @param tree_view cast=(GtkTreeView *)
* @param model cast=(GtkTreeModel *)
*/
@@ -26028,7 +26323,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_set_model(tree_view, model);
-@@ -12511,8 +12511,8 @@ public static final void gtk_tree_view_set_model(int /*long*/ tree_view, int /*l
+@@ -12702,8 +12702,8 @@ public static final void gtk_tree_view_set_model(int /*long*/ tree_view, int /*l
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -26039,7 +26334,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_set_rules_hint(tree_view, setting);
-@@ -12524,8 +12524,8 @@ public static final void gtk_tree_view_set_rules_hint(int /*long*/ tree_view, bo
+@@ -12715,8 +12715,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)
*/
@@ -26050,7 +26345,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_set_search_column(tree_view, column);
-@@ -12534,8 +12534,8 @@ public static final void gtk_tree_view_set_search_column(int /*long*/ tree_view,
+@@ -12725,8 +12725,8 @@ public static final void gtk_tree_view_set_search_column(int /*long*/ tree_view,
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -26061,7 +26356,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_unset_rows_drag_dest(tree_view);
-@@ -12547,8 +12547,8 @@ public static final void gtk_tree_view_unset_rows_drag_dest(int /*long*/ tree_vi
+@@ -12738,8 +12738,8 @@ public static final void gtk_tree_view_unset_rows_drag_dest(int /*long*/ tree_vi
* @method flags=dynamic
* @param tree_view cast=(GtkTreeView *)
*/
@@ -26072,7 +26367,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_widget_to_tree_coords(tree_view, wx, wy, tx, ty);
-@@ -12560,8 +12560,8 @@ public static final void gtk_tree_view_widget_to_tree_coords(int /*long*/ tree_v
+@@ -12751,8 +12751,8 @@ public static final void gtk_tree_view_widget_to_tree_coords(int /*long*/ tree_v
* @method flags=dynamic
* @param tree_view cast=(GtkTreeView *)
*/
@@ -26083,7 +26378,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_tree_view_convert_widget_to_bin_window_coords(tree_view, wx, wy, tx, ty);
-@@ -12573,8 +12573,8 @@ public static final void gtk_tree_view_convert_widget_to_bin_window_coords(int /
+@@ -12764,8 +12764,8 @@ public static final void gtk_tree_view_convert_widget_to_bin_window_coords(int /
* @param homogeneous cast=(gboolean)
* @param spacing cast=(gint)
*/
@@ -26094,7 +26389,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_vbox_new(homogeneous, spacing);
-@@ -12583,8 +12583,8 @@ public static final int /*long*/ gtk_vbox_new(boolean homogeneous, int spacing)
+@@ -12774,8 +12774,8 @@ public static final int /*long*/ gtk_vbox_new(boolean homogeneous, int spacing)
}
}
/** @param viewport cast=(GtkViewport *) */
@@ -26105,7 +26400,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_viewport_get_shadow_type(viewport);
-@@ -12596,8 +12596,8 @@ public static final int gtk_viewport_get_shadow_type(int /*long*/ viewport) {
+@@ -12787,8 +12787,8 @@ public static final int gtk_viewport_get_shadow_type(int /*long*/ viewport) {
* @param viewport cast=(GtkViewport *)
* @param type cast=(GtkShadowType)
*/
@@ -26116,7 +26411,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_viewport_set_shadow_type(viewport, type);
-@@ -12606,8 +12606,8 @@ public static final void gtk_viewport_set_shadow_type(int /*long*/ viewport, int
+@@ -12797,8 +12797,8 @@ public static final void gtk_viewport_set_shadow_type(int /*long*/ viewport, int
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -26127,7 +26422,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_vscale_new(adjustment);
-@@ -12616,8 +12616,8 @@ public static final int /*long*/ gtk_vscale_new(int /*long*/ adjustment) {
+@@ -12807,8 +12807,8 @@ public static final int /*long*/ gtk_vscale_new(int /*long*/ adjustment) {
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -26138,7 +26433,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_vscrollbar_new(adjustment);
-@@ -12625,8 +12625,8 @@ public static final int /*long*/ gtk_vscrollbar_new(int /*long*/ adjustment) {
+@@ -12816,8 +12816,8 @@ public static final int /*long*/ gtk_vscrollbar_new(int /*long*/ adjustment) {
lock.unlock();
}
}
@@ -26149,7 +26444,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_vseparator_new();
-@@ -12641,8 +12641,8 @@ public static final int /*long*/ gtk_vseparator_new() {
+@@ -12832,8 +12832,8 @@ public static final int /*long*/ gtk_vseparator_new() {
* @param accel_key cast=(guint)
* @param accel_mods cast=(GdkModifierType)
*/
@@ -26160,7 +26455,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_add_accelerator(widget, accel_signal, accel_group, accel_key, accel_mods, accel_flags);
-@@ -12654,8 +12654,8 @@ public static final void gtk_widget_add_accelerator(int /*long*/ widget, byte[]
+@@ -12845,8 +12845,8 @@ public static final void gtk_widget_add_accelerator(int /*long*/ widget, byte[]
* @param widget cast=(GtkWidget *)
* @param events cast=(gint)
*/
@@ -26171,7 +26466,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_add_events(widget, events);
-@@ -12664,8 +12664,8 @@ public static final void gtk_widget_add_events(int /*long*/ widget, int events)
+@@ -12855,8 +12855,8 @@ public static final void gtk_widget_add_events(int /*long*/ widget, int events)
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26182,7 +26477,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_widget_child_focus(widget, direction);
-@@ -12677,8 +12677,8 @@ public static final boolean gtk_widget_child_focus(int /*long*/ widget, int dire
+@@ -12868,8 +12868,8 @@ public static final boolean gtk_widget_child_focus(int /*long*/ widget, int dire
* @param widget cast=(GtkWidget *)
* @param text cast=(const gchar *)
*/
@@ -26193,7 +26488,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_widget_create_pango_layout(widget, text);
-@@ -12690,8 +12690,8 @@ public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ wid
+@@ -12881,8 +12881,8 @@ public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ wid
* @param widget cast=(GtkWidget *)
* @param text cast=(const gchar *)
*/
@@ -26204,7 +26499,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_widget_create_pango_layout(widget, text);
-@@ -12700,8 +12700,8 @@ public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ wid
+@@ -12891,8 +12891,8 @@ public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ wid
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26215,7 +26510,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_destroy(widget);
-@@ -12713,8 +12713,8 @@ public static final void gtk_widget_destroy(int /*long*/ widget) {
+@@ -12904,8 +12904,8 @@ public static final void gtk_widget_destroy(int /*long*/ widget) {
* @param widget cast=(GtkWidget *)
* @param event cast=(GdkEvent *)
*/
@@ -26226,7 +26521,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_widget_event(widget, event);
-@@ -12723,8 +12723,8 @@ public static final boolean gtk_widget_event(int /*long*/ widget, int /*long*/ e
+@@ -12914,8 +12914,8 @@ public static final boolean gtk_widget_event(int /*long*/ widget, int /*long*/ e
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26237,7 +26532,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_widget_get_accessible(widget);
-@@ -12733,8 +12733,8 @@ public static final int /*long*/ gtk_widget_get_accessible (int /*long*/ widget)
+@@ -12924,8 +12924,8 @@ public static final int /*long*/ gtk_widget_get_accessible (int /*long*/ widget)
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26248,7 +26543,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_widget_get_child_visible(widget);
-@@ -12751,8 +12751,8 @@ public static final int gtk_widget_get_default_direction() {
+@@ -12942,8 +12942,8 @@ public static final int gtk_widget_get_default_direction() {
lock.unlock();
}
}
@@ -26259,7 +26554,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_widget_get_default_style();
-@@ -12761,8 +12761,8 @@ public static final int /*long*/ gtk_widget_get_default_style() {
+@@ -12952,8 +12952,8 @@ public static final int /*long*/ gtk_widget_get_default_style() {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26270,7 +26565,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_widget_get_direction(widget);
-@@ -12771,8 +12771,8 @@ public static final int gtk_widget_get_direction(int /*long*/ widget) {
+@@ -12962,8 +12962,8 @@ public static final int gtk_widget_get_direction(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26281,7 +26576,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_widget_get_events(widget);
-@@ -12781,8 +12781,8 @@ public static final int gtk_widget_get_events(int /*long*/ widget) {
+@@ -12972,8 +12972,8 @@ public static final int gtk_widget_get_events(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26292,7 +26587,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_widget_get_modifier_style(widget);
-@@ -12791,8 +12791,8 @@ public static final int /*long*/ gtk_widget_get_modifier_style(int /*long*/ widg
+@@ -12982,8 +12982,8 @@ public static final int /*long*/ gtk_widget_get_modifier_style(int /*long*/ widg
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26303,7 +26598,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_widget_get_pango_context(widget);
-@@ -12801,8 +12801,8 @@ public static final int /*long*/ gtk_widget_get_pango_context(int /*long*/ widge
+@@ -12992,8 +12992,8 @@ public static final int /*long*/ gtk_widget_get_pango_context(int /*long*/ widge
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26314,7 +26609,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_widget_get_parent(widget);
-@@ -12811,8 +12811,8 @@ public static final int /*long*/ gtk_widget_get_parent(int /*long*/ widget) {
+@@ -13002,8 +13002,8 @@ public static final int /*long*/ gtk_widget_get_parent(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26325,7 +26620,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_widget_get_parent_window(widget);
-@@ -12821,8 +12821,8 @@ public static final int /*long*/ gtk_widget_get_parent_window(int /*long*/ widge
+@@ -13012,8 +13012,8 @@ public static final int /*long*/ gtk_widget_get_parent_window(int /*long*/ widge
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26336,7 +26631,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_widget_get_style(widget);
-@@ -12835,8 +12835,8 @@ public static final int /*long*/ gtk_widget_get_style(int /*long*/ widget) {
+@@ -13026,8 +13026,8 @@ public static final int /*long*/ gtk_widget_get_style(int /*long*/ widget) {
* @param width cast=(gint *)
* @param height cast=(gint *)
*/
@@ -26347,7 +26642,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_get_size_request(widget, width, height);
-@@ -12845,8 +12845,8 @@ public static final void gtk_widget_get_size_request(int /*long*/ widget, int []
+@@ -13036,8 +13036,8 @@ public static final void gtk_widget_get_size_request(int /*long*/ widget, int []
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26358,7 +26653,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_widget_get_toplevel(widget);
-@@ -12855,8 +12855,8 @@ public static final int /*long*/ gtk_widget_get_toplevel (int /*long*/ widget) {
+@@ -13046,8 +13046,8 @@ public static final int /*long*/ gtk_widget_get_toplevel (int /*long*/ widget) {
}
}
/** @method flags=dynamic */
@@ -26369,7 +26664,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_widget_get_tooltip_text(widget);
-@@ -12865,8 +12865,8 @@ public static final int /*long*/ gtk_widget_get_tooltip_text (int /*long*/ widge
+@@ -13056,8 +13056,8 @@ public static final int /*long*/ gtk_widget_get_tooltip_text (int /*long*/ widge
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26380,7 +26675,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_grab_focus(widget);
-@@ -12875,8 +12875,8 @@ public static final void gtk_widget_grab_focus(int /*long*/ widget) {
+@@ -13066,8 +13066,8 @@ public static final void gtk_widget_grab_focus(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26391,7 +26686,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_hide(widget);
-@@ -12888,8 +12888,8 @@ public static final void gtk_widget_hide(int /*long*/ widget) {
+@@ -13079,8 +13079,8 @@ public static final void gtk_widget_hide(int /*long*/ widget) {
* @method flags=dynamic
* @param widget cast=(GtkWidget *)
*/
@@ -26402,7 +26697,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_widget_is_composited(widget);
-@@ -12898,8 +12898,8 @@ public static final boolean gtk_widget_is_composited(int /*long*/ widget) {
+@@ -13089,8 +13089,8 @@ public static final boolean gtk_widget_is_composited(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26413,7 +26708,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_widget_is_focus(widget);
-@@ -12908,8 +12908,8 @@ public static final boolean gtk_widget_is_focus(int /*long*/ widget) {
+@@ -13099,8 +13099,8 @@ public static final boolean gtk_widget_is_focus(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26424,7 +26719,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_map(widget);
-@@ -12921,8 +12921,8 @@ public static final void gtk_widget_map(int /*long*/ widget) {
+@@ -13112,8 +13112,8 @@ public static final void gtk_widget_map(int /*long*/ widget) {
* @param widget cast=(GtkWidget *)
* @param group_cycling cast=(gboolean)
*/
@@ -26435,7 +26730,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_widget_mnemonic_activate(widget, group_cycling);
-@@ -12935,8 +12935,8 @@ public static final boolean gtk_widget_mnemonic_activate(int /*long*/ widget, bo
+@@ -13126,8 +13126,8 @@ public static final boolean gtk_widget_mnemonic_activate(int /*long*/ widget, bo
* @param state cast=(GtkStateType)
* @param color cast=(GdkColor *),flags=no_out
*/
@@ -26446,7 +26741,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_modify_base(widget, state, color);
-@@ -12949,8 +12949,8 @@ public static final void gtk_widget_modify_base(int /*long*/ widget, int state,
+@@ -13140,8 +13140,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
*/
@@ -26457,7 +26752,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_modify_bg(widget, state, color);
-@@ -12963,8 +12963,8 @@ public static final void gtk_widget_modify_bg(int /*long*/ widget, int state, Gd
+@@ -13154,8 +13154,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
*/
@@ -26468,7 +26763,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_modify_fg(widget, state, color);
-@@ -12976,8 +12976,8 @@ public static final void gtk_widget_modify_fg(int /*long*/ widget, int state, Gd
+@@ -13167,8 +13167,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 *)
*/
@@ -26479,7 +26774,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_modify_font(widget, pango_font_descr);
-@@ -12989,8 +12989,8 @@ public static final void gtk_widget_modify_font(int /*long*/ widget, int /*long*
+@@ -13180,8 +13180,8 @@ public static final void gtk_widget_modify_font(int /*long*/ widget, int /*long*
* @param widget cast=(GtkWidget *)
* @param style cast=(GtkRcStyle *)
*/
@@ -26490,7 +26785,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_modify_style(widget, style);
-@@ -13003,8 +13003,8 @@ public static final void gtk_widget_modify_style(int /*long*/ widget, int /*long
+@@ -13194,8 +13194,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
*/
@@ -26501,7 +26796,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_modify_text(widget, state, color);
-@@ -13013,8 +13013,8 @@ public static final void gtk_widget_modify_text(int /*long*/ widget, int state,
+@@ -13204,8 +13204,8 @@ public static final void gtk_widget_modify_text(int /*long*/ widget, int state,
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26512,7 +26807,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_queue_resize(widget);
-@@ -13023,8 +13023,8 @@ public static final void gtk_widget_queue_resize(int /*long*/ widget) {
+@@ -13214,8 +13214,8 @@ public static final void gtk_widget_queue_resize(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26523,7 +26818,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_realize(widget);
-@@ -13038,8 +13038,8 @@ public static final void gtk_widget_realize(int /*long*/ widget) {
+@@ -13229,8 +13229,8 @@ public static final void gtk_widget_realize(int /*long*/ widget) {
* @param accel_key cast=(guint)
* @param accel_mods cast=(GdkModifierType)
*/
@@ -26534,7 +26829,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_remove_accelerator(widget, accel_group, accel_key, accel_mods);
-@@ -13051,8 +13051,8 @@ public static final void gtk_widget_remove_accelerator(int /*long*/ widget, int
+@@ -13242,8 +13242,8 @@ public static final void gtk_widget_remove_accelerator(int /*long*/ widget, int
* @param widget cast=(GtkWidget *)
* @param new_parent cast=(GtkWidget *)
*/
@@ -26545,7 +26840,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_reparent(widget, new_parent);
-@@ -13064,8 +13064,8 @@ public static final void gtk_widget_reparent(int /*long*/ widget, int /*long*/ n
+@@ -13255,8 +13255,8 @@ public static final void gtk_widget_reparent(int /*long*/ widget, int /*long*/ n
* @param widget cast=(GtkWidget *)
* @param event cast=(GdkEvent *)
*/
@@ -26556,7 +26851,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_widget_send_expose(widget, event);
-@@ -13074,8 +13074,8 @@ public static final int gtk_widget_send_expose(int /*long*/ widget, int /*long*/
+@@ -13265,8 +13265,8 @@ public static final int gtk_widget_send_expose(int /*long*/ widget, int /*long*/
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26567,7 +26862,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_set_app_paintable(widget, app_paintable);
-@@ -13097,8 +13097,8 @@ public static final void gtk_widget_set_default_direction(int dir) {
+@@ -13288,8 +13288,8 @@ public static final void gtk_widget_set_default_direction(int dir) {
* @param widget cast=(GtkWidget *)
* @param dir cast=(GtkTextDirection)
*/
@@ -26578,7 +26873,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_set_direction(widget, dir);
-@@ -13110,8 +13110,8 @@ public static final void gtk_widget_set_direction(int /*long*/ widget, int dir)
+@@ -13301,8 +13301,8 @@ public static final void gtk_widget_set_direction(int /*long*/ widget, int dir)
* @param widget cast=(GtkWidget *)
* @param double_buffered cast=(gboolean)
*/
@@ -26589,7 +26884,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_set_double_buffered(widget, double_buffered);
-@@ -13123,8 +13123,8 @@ public static final void gtk_widget_set_double_buffered(int /*long*/ widget, boo
+@@ -13314,8 +13314,8 @@ public static final void gtk_widget_set_double_buffered(int /*long*/ widget, boo
* @param widget cast=(GtkWidget *)
* @param name cast=(const char *)
*/
@@ -26600,7 +26895,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_set_name(widget, name);
-@@ -13136,8 +13136,8 @@ public static final void gtk_widget_set_name(int /*long*/ widget, byte[] name) {
+@@ -13327,8 +13327,8 @@ public static final void gtk_widget_set_name(int /*long*/ widget, byte[] name) {
* @param widget cast=(GtkWidget *)
* @param redraw cast=(gboolean)
*/
@@ -26611,7 +26906,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_set_redraw_on_allocate(widget, redraw);
-@@ -13149,8 +13149,8 @@ public static final void gtk_widget_set_redraw_on_allocate(int /*long*/ widget,
+@@ -13340,8 +13340,8 @@ public static final void gtk_widget_set_redraw_on_allocate(int /*long*/ widget,
* @param widget cast=(GtkWidget *)
* @param sensitive cast=(gboolean)
*/
@@ -26622,7 +26917,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_set_sensitive(widget, sensitive);
-@@ -13163,8 +13163,8 @@ public static final void gtk_widget_set_sensitive(int /*long*/ widget, boolean s
+@@ -13354,8 +13354,8 @@ public static final void gtk_widget_set_sensitive(int /*long*/ widget, boolean s
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -26633,7 +26928,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_set_size_request(widget, width, height);
-@@ -13176,8 +13176,8 @@ public static final void gtk_widget_set_size_request(int /*long*/ widget, int wi
+@@ -13367,8 +13367,8 @@ public static final void gtk_widget_set_size_request(int /*long*/ widget, int wi
* @param widget cast=(GtkWidget *)
* @param state cast=(GtkStateType)
*/
@@ -26644,7 +26939,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_set_state(widget, state);
-@@ -13189,8 +13189,8 @@ public static final void gtk_widget_set_state(int /*long*/ widget, int state) {
+@@ -13380,8 +13380,8 @@ public static final void gtk_widget_set_state(int /*long*/ widget, int state) {
* @param widget cast=(GtkWidget *)
* @param style cast=(GtkStyle *)
*/
@@ -26655,7 +26950,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_set_style(widget, style);
-@@ -13204,8 +13204,8 @@ public static final void gtk_widget_set_style(int /*long*/ widget, int /*long*/
+@@ -13395,8 +13395,8 @@ public static final void gtk_widget_set_style(int /*long*/ widget, int /*long*/
* @param offset_x cast=(gint)
* @param offset_y cast=(gint)
*/
@@ -26666,7 +26961,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_shape_combine_mask(widget, shape_mask, offset_x, offset_y);
-@@ -13214,8 +13214,8 @@ public static final void gtk_widget_shape_combine_mask(int /*long*/ widget, int
+@@ -13405,8 +13405,8 @@ public static final void gtk_widget_shape_combine_mask(int /*long*/ widget, int
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26677,7 +26972,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_show(widget);
-@@ -13224,8 +13224,8 @@ public static final void gtk_widget_show(int /*long*/ widget) {
+@@ -13415,8 +13415,8 @@ public static final void gtk_widget_show(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26688,7 +26983,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_show_now(widget);
-@@ -13237,8 +13237,8 @@ public static final void gtk_widget_show_now(int /*long*/ widget) {
+@@ -13428,8 +13428,8 @@ public static final void gtk_widget_show_now(int /*long*/ widget) {
* @param widget cast=(GtkWidget *)
* @param allocation cast=(GtkAllocation *),flags=no_out
*/
@@ -26699,7 +26994,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_size_allocate(widget, allocation);
-@@ -13250,8 +13250,8 @@ public static final void gtk_widget_size_allocate(int /*long*/ widget, GtkAlloca
+@@ -13441,8 +13441,8 @@ public static final void gtk_widget_size_allocate(int /*long*/ widget, GtkAlloca
* @param widget cast=(GtkWidget *)
* @param requisition cast=(GtkRequisition *),flags=no_in
*/
@@ -26710,7 +27005,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_size_request(widget, requisition);
-@@ -13264,8 +13264,8 @@ public static final void gtk_widget_size_request(int /*long*/ widget, GtkRequisi
+@@ -13455,8 +13455,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
*/
@@ -26721,7 +27016,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_style_get(widget, property_name, value, terminator);
-@@ -13278,8 +13278,8 @@ public static final void gtk_widget_style_get(int /*long*/ widget, byte[] proper
+@@ -13469,8 +13469,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
*/
@@ -26732,7 +27027,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_style_get(widget, property_name, value, terminator);
-@@ -13291,8 +13291,8 @@ public static final void gtk_widget_style_get(int /*long*/ widget, byte[] proper
+@@ -13482,8 +13482,8 @@ public static final void gtk_widget_style_get(int /*long*/ widget, byte[] proper
* @param src_widget cast=(GtkWidget *)
* @param dest_widget cast=(GtkWidget *)
*/
@@ -26743,7 +27038,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_widget_translate_coordinates(src_widget, dest_widget, src_x, src_y, dest_x, dest_y);
-@@ -13301,8 +13301,8 @@ public static final boolean gtk_widget_translate_coordinates(int /*long*/ src_wi
+@@ -13492,8 +13492,8 @@ public static final boolean gtk_widget_translate_coordinates(int /*long*/ src_wi
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26754,7 +27049,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_unrealize(widget);
-@@ -13311,8 +13311,8 @@ public static final void gtk_widget_unrealize(int /*long*/ widget) {
+@@ -13502,8 +13502,8 @@ public static final void gtk_widget_unrealize(int /*long*/ widget) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -26765,7 +27060,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_window_activate_default(window);
-@@ -13324,8 +13324,8 @@ public static final boolean gtk_window_activate_default(int /*long*/ window) {
+@@ -13515,8 +13515,8 @@ public static final boolean gtk_window_activate_default(int /*long*/ window) {
* @param window cast=(GtkWindow *)
* @param accel_group cast=(GtkAccelGroup *)
*/
@@ -26776,7 +27071,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_add_accel_group(window, accel_group);
-@@ -13334,8 +13334,8 @@ public static final void gtk_window_add_accel_group(int /*long*/ window, int /*l
+@@ -13525,8 +13525,8 @@ public static final void gtk_window_add_accel_group(int /*long*/ window, int /*l
}
}
/** @param handle cast=(GtkWindow *) */
@@ -26787,7 +27082,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_deiconify(handle);
-@@ -13344,8 +13344,8 @@ public static final void gtk_window_deiconify(int /*long*/ handle) {
+@@ -13535,8 +13535,8 @@ public static final void gtk_window_deiconify(int /*long*/ handle) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -26798,7 +27093,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_window_get_focus(window);
-@@ -13357,8 +13357,8 @@ public static final int /*long*/ gtk_window_get_focus(int /*long*/ window) {
+@@ -13548,8 +13548,8 @@ public static final int /*long*/ gtk_window_get_focus(int /*long*/ window) {
* @method flags=dynamic
* @param window cast=(GtkWindow *)
*/
@@ -26809,7 +27104,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_window_get_group(window);
-@@ -13367,8 +13367,8 @@ public static final int /*long*/ gtk_window_get_group(int /*long*/ window) {
+@@ -13558,8 +13558,8 @@ public static final int /*long*/ gtk_window_get_group(int /*long*/ window) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -26820,7 +27115,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_window_get_icon_list(window);
-@@ -13377,8 +13377,8 @@ public static final int /*long*/ gtk_window_get_icon_list(int /*long*/ window) {
+@@ -13568,8 +13568,8 @@ public static final int /*long*/ gtk_window_get_icon_list(int /*long*/ window) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -26831,7 +27126,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_window_get_modal(window);
-@@ -13387,8 +13387,8 @@ public static final boolean gtk_window_get_modal(int /*long*/ window) {
+@@ -13578,8 +13578,8 @@ public static final boolean gtk_window_get_modal(int /*long*/ window) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -26842,7 +27137,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_window_get_mnemonic_modifier(window);
-@@ -13400,8 +13400,8 @@ public static final int gtk_window_get_mnemonic_modifier(int /*long*/ window) {
+@@ -13591,8 +13591,8 @@ public static final int gtk_window_get_mnemonic_modifier(int /*long*/ window) {
* @method flags=dynamic
* @param window cast=(GtkWindow *)
*/
@@ -26853,7 +27148,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_window_get_opacity (window);
-@@ -13414,8 +13414,8 @@ public static final double gtk_window_get_opacity (int /*long*/ window) {
+@@ -13605,8 +13605,8 @@ public static final double gtk_window_get_opacity (int /*long*/ window) {
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
@@ -26864,7 +27159,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_get_position(handle, x, y);
-@@ -13428,8 +13428,8 @@ public static final void gtk_window_get_position(int /*long*/ handle, int[] x, i
+@@ -13619,8 +13619,8 @@ public static final void gtk_window_get_position(int /*long*/ handle, int[] x, i
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
@@ -26875,7 +27170,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_get_size(handle, x, y);
-@@ -13441,8 +13441,8 @@ public static final void gtk_window_get_size(int /*long*/ handle, int[] x, int[]
+@@ -13632,8 +13632,8 @@ public static final void gtk_window_get_size(int /*long*/ handle, int[] x, int[]
* @param group cast=(GtkWindowGroup*)
* @param window cast=(GtkWindow*)
*/
@@ -26886,7 +27181,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_group_add_window(group, window);
-@@ -13454,8 +13454,8 @@ public static final void gtk_window_group_add_window(int /*long*/ group, int /*l
+@@ -13645,8 +13645,8 @@ public static final void gtk_window_group_add_window(int /*long*/ group, int /*l
* @param group cast=(GtkWindowGroup*)
* @param window cast=(GtkWindow*)
*/
@@ -26897,7 +27192,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_group_remove_window(group, window);
-@@ -13463,8 +13463,8 @@ public static final void gtk_window_group_remove_window(int /*long*/ group, int
+@@ -13654,8 +13654,8 @@ public static final void gtk_window_group_remove_window(int /*long*/ group, int
lock.unlock();
}
}
@@ -26908,7 +27203,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_window_group_new();
-@@ -13473,8 +13473,8 @@ public static final int /*long*/ gtk_window_group_new() {
+@@ -13664,8 +13664,8 @@ public static final int /*long*/ gtk_window_group_new() {
}
}
/** @param handle cast=(GtkWindow *) */
@@ -26919,7 +27214,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_window_is_active(handle);
-@@ -13483,8 +13483,8 @@ public static final boolean gtk_window_is_active(int /*long*/ handle) {
+@@ -13674,8 +13674,8 @@ public static final boolean gtk_window_is_active(int /*long*/ handle) {
}
}
/** @param handle cast=(GtkWindow *) */
@@ -26930,7 +27225,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_iconify(handle);
-@@ -13492,8 +13492,8 @@ public static final void gtk_window_iconify(int /*long*/ handle) {
+@@ -13683,8 +13683,8 @@ public static final void gtk_window_iconify(int /*long*/ handle) {
lock.unlock();
}
}
@@ -26941,7 +27236,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_window_list_toplevels ();
-@@ -13502,8 +13502,8 @@ public static final int /*long*/ gtk_window_list_toplevels () {
+@@ -13693,8 +13693,8 @@ public static final int /*long*/ gtk_window_list_toplevels () {
}
}
/** @param handle cast=(GtkWindow *) */
@@ -26952,7 +27247,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_maximize(handle);
-@@ -13512,8 +13512,8 @@ public static final void gtk_window_maximize(int /*long*/ handle) {
+@@ -13703,8 +13703,8 @@ public static final void gtk_window_maximize(int /*long*/ handle) {
}
}
/** @param handle cast=(GtkWindow *) */
@@ -26963,7 +27258,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_fullscreen(handle);
-@@ -13522,8 +13522,8 @@ public static final void gtk_window_fullscreen(int /*long*/ handle) {
+@@ -13713,8 +13713,8 @@ public static final void gtk_window_fullscreen(int /*long*/ handle) {
}
}
/** @param handle cast=(GtkWindow *) */
@@ -26974,7 +27269,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_unfullscreen(handle);
-@@ -13536,8 +13536,8 @@ public static final void gtk_window_unfullscreen(int /*long*/ handle) {
+@@ -13727,8 +13727,8 @@ public static final void gtk_window_unfullscreen(int /*long*/ handle) {
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -26985,7 +27280,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_move(handle, x, y);
-@@ -13546,8 +13546,8 @@ public static final void gtk_window_move(int /*long*/ handle, int x, int y) {
+@@ -13737,8 +13737,8 @@ public static final void gtk_window_move(int /*long*/ handle, int x, int y) {
}
}
/** @param type cast=(GtkWindowType) */
@@ -26996,7 +27291,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _gtk_window_new(type);
-@@ -13556,8 +13556,8 @@ public static final int /*long*/ gtk_window_new(int type) {
+@@ -13747,8 +13747,8 @@ public static final int /*long*/ gtk_window_new(int type) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -27007,7 +27302,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_present(window);
-@@ -13569,8 +13569,8 @@ public static final void gtk_window_present(int /*long*/ window) {
+@@ -13760,8 +13760,8 @@ public static final void gtk_window_present(int /*long*/ window) {
* @param window cast=(GtkWindow *)
* @param accel_group cast=(GtkAccelGroup *)
*/
@@ -27018,7 +27313,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_remove_accel_group(window, accel_group);
-@@ -13583,8 +13583,8 @@ public static final void gtk_window_remove_accel_group(int /*long*/ window, int
+@@ -13774,8 +13774,8 @@ public static final void gtk_window_remove_accel_group(int /*long*/ window, int
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -27029,7 +27324,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_resize(handle, x, y);
-@@ -13596,8 +13596,8 @@ public static final void gtk_window_resize(int /*long*/ handle, int x, int y) {
+@@ -13787,8 +13787,8 @@ public static final void gtk_window_resize(int /*long*/ handle, int x, int y) {
* @param window cast=(GtkWindow *)
* @param widget cast=(GtkWidget *)
*/
@@ -27040,7 +27335,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_set_default(window, widget);
-@@ -13609,8 +13609,8 @@ public static final void gtk_window_set_default(int /*long*/ window, int /*long*
+@@ -13800,8 +13800,8 @@ public static final void gtk_window_set_default(int /*long*/ window, int /*long*
* @param window cast=(GtkWindow *)
* @param setting cast=(gboolean)
*/
@@ -27051,7 +27346,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_set_destroy_with_parent(window, setting);
-@@ -13623,8 +13623,8 @@ public static final void gtk_window_set_destroy_with_parent(int /*long*/ window,
+@@ -13814,8 +13814,8 @@ public static final void gtk_window_set_destroy_with_parent(int /*long*/ window,
* @param window cast=(GtkWindow *)
* @param setting cast=(gboolean)
*/
@@ -27062,7 +27357,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_set_keep_below(window, setting);
-@@ -13637,8 +13637,8 @@ public static final void gtk_window_set_keep_below(int /*long*/ window, boolean
+@@ -13828,8 +13828,8 @@ public static final void gtk_window_set_keep_below(int /*long*/ window, boolean
* @param geometry_widget cast=(GtkWidget *)
* @param geometry flags=no_out
*/
@@ -27073,7 +27368,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_set_geometry_hints(window, geometry_widget, geometry, geom_mask);
-@@ -13650,8 +13650,8 @@ public static final void gtk_window_set_geometry_hints(int /*long*/ window, int
+@@ -13841,8 +13841,8 @@ public static final void gtk_window_set_geometry_hints(int /*long*/ window, int
* @param window cast=(GtkWindow *)
* @param list cast=(GList *)
*/
@@ -27084,7 +27379,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_set_icon_list(window, list);
-@@ -13663,8 +13663,8 @@ public static final void gtk_window_set_icon_list(int /*long*/ window, int /*lon
+@@ -13854,8 +13854,8 @@ public static final void gtk_window_set_icon_list(int /*long*/ window, int /*lon
* @param window cast=(GtkWindow *)
* @param modal cast=(gboolean)
*/
@@ -27095,7 +27390,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_set_modal(window, modal);
-@@ -13676,8 +13676,8 @@ public static final void gtk_window_set_modal(int /*long*/ window, boolean modal
+@@ -13867,8 +13867,8 @@ public static final void gtk_window_set_modal(int /*long*/ window, boolean modal
* @method flags=dynamic
* @param window cast=(GtkWindow *)
*/
@@ -27106,7 +27401,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_set_opacity(window, opacity);
-@@ -13690,8 +13690,8 @@ public static final void gtk_window_set_opacity(int /*long*/ window, double opac
+@@ -13881,8 +13881,8 @@ public static final void gtk_window_set_opacity(int /*long*/ window, double opac
* @param widget cast=(GtkWidget *)
* @param tip_text cast=(const gchar *)
*/
@@ -27117,7 +27412,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_set_tooltip_text(widget, tip_text);
-@@ -13703,8 +13703,8 @@ public static final void gtk_widget_set_tooltip_text(int /*long*/ widget, byte[]
+@@ -13894,8 +13894,8 @@ public static final void gtk_widget_set_tooltip_text(int /*long*/ widget, byte[]
* @param widget cast=(GtkWidget *)
* @param parent_window cast=(GdkWindow *)
*/
@@ -27128,7 +27423,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_widget_set_parent_window(widget, parent_window);
-@@ -13716,8 +13716,8 @@ public static final void gtk_widget_set_parent_window(int /*long*/ widget, int /
+@@ -13907,8 +13907,8 @@ public static final void gtk_widget_set_parent_window(int /*long*/ widget, int /
* @param window cast=(GtkWindow *)
* @param resizable cast=(gboolean)
*/
@@ -27139,7 +27434,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_set_resizable(window, resizable);
-@@ -13729,8 +13729,8 @@ public static final void gtk_window_set_resizable(int /*long*/ window, boolean r
+@@ -13920,8 +13920,8 @@ public static final void gtk_window_set_resizable(int /*long*/ window, boolean r
* @param window cast=(GtkWindow *)
* @param title cast=(const gchar *)
*/
@@ -27150,7 +27445,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_set_title(window, title);
-@@ -13743,8 +13743,8 @@ public static final void gtk_window_set_title(int /*long*/ window, byte[] title)
+@@ -13934,8 +13934,8 @@ public static final void gtk_window_set_title(int /*long*/ window, byte[] title)
* @param window cast=(GtkWindow *)
* @param skips_taskbar cast=(gboolean)
*/
@@ -27161,7 +27456,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_set_skip_taskbar_hint(window, skips_taskbar);
-@@ -13753,8 +13753,8 @@ public static final void gtk_window_set_skip_taskbar_hint(int /*long*/ window, b
+@@ -13944,8 +13944,8 @@ public static final void gtk_window_set_skip_taskbar_hint(int /*long*/ window, b
}
}
/** @param window cast=(GtkWindow *) */
@@ -27172,7 +27467,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_set_type_hint(window, hint);
-@@ -13766,8 +13766,8 @@ public static final void gtk_window_set_type_hint(int /*long*/ window, int hint)
+@@ -13957,8 +13957,8 @@ public static final void gtk_window_set_type_hint(int /*long*/ window, int hint)
* @param window cast=(GtkWindow *)
* @param parent cast=(GtkWindow *)
*/
@@ -27183,7 +27478,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_set_transient_for(window, parent);
-@@ -13776,8 +13776,8 @@ public static final void gtk_window_set_transient_for(int /*long*/ window, int /
+@@ -13967,8 +13967,8 @@ public static final void gtk_window_set_transient_for(int /*long*/ window, int /
}
}
/** @param handle cast=(GtkWindow *) */
@@ -27194,7 +27489,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_gtk_window_unmaximize(handle);
-@@ -13790,258 +13790,258 @@ public static final void gtk_window_unmaximize(int /*long*/ handle) {
+@@ -13981,258 +13981,258 @@ public static final void gtk_window_unmaximize(int /*long*/ handle) {
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
@@ -27502,7 +27797,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_attribute_copy(attribute);
-@@ -14049,8 +14049,8 @@ public static final int /*long*/ pango_attribute_copy (int /*long*/ attribute) {
+@@ -14240,8 +14240,8 @@ public static final int /*long*/ pango_attribute_copy (int /*long*/ attribute) {
lock.unlock();
}
}
@@ -27513,7 +27808,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_attr_background_new(red, green, blue);
-@@ -14059,8 +14059,8 @@ public static final int /*long*/ pango_attr_background_new (short red, short gre
+@@ -14250,8 +14250,8 @@ public static final int /*long*/ pango_attr_background_new (short red, short gre
}
}
/** @param desc cast=(const PangoFontDescription *) */
@@ -27524,7 +27819,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_attr_font_desc_new(desc);
-@@ -14068,8 +14068,8 @@ public static final int /*long*/ pango_attr_font_desc_new(int /*long*/ desc) {
+@@ -14259,8 +14259,8 @@ public static final int /*long*/ pango_attr_font_desc_new(int /*long*/ desc) {
lock.unlock();
}
}
@@ -27535,7 +27830,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_attr_foreground_new(red, green, blue);
-@@ -14077,8 +14077,8 @@ public static final int /*long*/ pango_attr_foreground_new (short red, short gre
+@@ -14268,8 +14268,8 @@ public static final int /*long*/ pango_attr_foreground_new (short red, short gre
lock.unlock();
}
}
@@ -27546,7 +27841,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_attr_rise_new(rise);
-@@ -14090,8 +14090,8 @@ public static final int /*long*/ pango_attr_rise_new(int rise) {
+@@ -14281,8 +14281,8 @@ public static final int /*long*/ pango_attr_rise_new(int rise) {
* @param ink_rect flags=no_out
* @param logical_rect flags=no_out
*/
@@ -27557,7 +27852,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_attr_shape_new(ink_rect, logical_rect);
-@@ -14103,8 +14103,8 @@ public static final int /*long*/ pango_attr_shape_new(PangoRectangle ink_rect, P
+@@ -14294,8 +14294,8 @@ public static final int /*long*/ pango_attr_shape_new(PangoRectangle ink_rect, P
* @param list cast=(PangoAttrList *)
* @param attr cast=(PangoAttribute *)
*/
@@ -27568,7 +27863,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_attr_list_insert(list, attr);
-@@ -14116,8 +14116,8 @@ public static final void pango_attr_list_insert(int /*long*/ list, int /*long*/
+@@ -14307,8 +14307,8 @@ public static final void pango_attr_list_insert(int /*long*/ list, int /*long*/
* @param list cast=(PangoAttrList *)
* @param attr cast=(PangoAttribute *)
*/
@@ -27579,7 +27874,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_attr_list_change(list, attr);
-@@ -14126,8 +14126,8 @@ public static final void pango_attr_list_change(int /*long*/ list, int /*long*/
+@@ -14317,8 +14317,8 @@ public static final void pango_attr_list_change(int /*long*/ list, int /*long*/
}
}
/** @param list cast=(PangoAttrList *) */
@@ -27590,7 +27885,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_attr_list_get_iterator(list);
-@@ -14136,8 +14136,8 @@ public static final int /*long*/ pango_attr_list_get_iterator(int /*long*/ list)
+@@ -14327,8 +14327,8 @@ public static final int /*long*/ pango_attr_list_get_iterator(int /*long*/ list)
}
}
/** @param iterator cast=(PangoAttrIterator *) */
@@ -27601,7 +27896,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_attr_iterator_next(iterator);
-@@ -14146,8 +14146,8 @@ public static final boolean pango_attr_iterator_next(int /*long*/ iterator) {
+@@ -14337,8 +14337,8 @@ public static final boolean pango_attr_iterator_next(int /*long*/ iterator) {
}
}
/** @param iterator cast=(PangoAttrIterator *) */
@@ -27612,7 +27907,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_attr_iterator_range(iterator, start, end);
-@@ -14159,8 +14159,8 @@ public static final void pango_attr_iterator_range(int /*long*/ iterator, int[]
+@@ -14350,8 +14350,8 @@ public static final void pango_attr_iterator_range(int /*long*/ iterator, int[]
* @param iterator cast=(PangoAttrIterator *)
* @param type cast=(PangoAttrType)
*/
@@ -27623,7 +27918,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_attr_iterator_get(iterator, type);
-@@ -14169,8 +14169,8 @@ public static final int /*long*/ pango_attr_iterator_get(int /*long*/ iterator,
+@@ -14360,8 +14360,8 @@ public static final int /*long*/ pango_attr_iterator_get(int /*long*/ iterator,
}
}
/** @param iterator cast=(PangoAttrIterator *) */
@@ -27634,7 +27929,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_attr_iterator_get_attrs(iterator);
-@@ -14180,8 +14180,8 @@ public static final int /*long*/ pango_attr_iterator_get_attrs(int /*long*/ iter
+@@ -14371,8 +14371,8 @@ public static final int /*long*/ pango_attr_iterator_get_attrs(int /*long*/ iter
}
/** @param iterator cast=(PangoAttrIterator *) */
@@ -27645,7 +27940,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_attr_iterator_destroy(iterator);
-@@ -14189,8 +14189,8 @@ public static final void pango_attr_iterator_destroy(int /*long*/ iterator) {
+@@ -14380,8 +14380,8 @@ public static final void pango_attr_iterator_destroy(int /*long*/ iterator) {
lock.unlock();
}
}
@@ -27656,7 +27951,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_attr_list_new();
-@@ -14199,8 +14199,8 @@ public static final int /*long*/ pango_attr_list_new() {
+@@ -14390,8 +14390,8 @@ public static final int /*long*/ pango_attr_list_new() {
}
}
/** @param list cast=(PangoAttrList *) */
@@ -27667,7 +27962,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_attr_list_unref(list);
-@@ -14209,8 +14209,8 @@ public static final void pango_attr_list_unref(int /*long*/ list) {
+@@ -14400,8 +14400,8 @@ public static final void pango_attr_list_unref(int /*long*/ list) {
}
}
/** @method flags=dynamic */
@@ -27678,7 +27973,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_attr_strikethrough_color_new(red, green, blue);
-@@ -14218,8 +14218,8 @@ public static final int /*long*/ pango_attr_strikethrough_color_new(short red, s
+@@ -14409,8 +14409,8 @@ public static final int /*long*/ pango_attr_strikethrough_color_new(short red, s
lock.unlock();
}
}
@@ -27689,7 +27984,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_attr_strikethrough_new(strikethrough);
-@@ -14228,8 +14228,8 @@ public static final int /*long*/ pango_attr_strikethrough_new(boolean strikethro
+@@ -14419,8 +14419,8 @@ public static final int /*long*/ pango_attr_strikethrough_new(boolean strikethro
}
}
/** @method flags=dynamic */
@@ -27700,7 +27995,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_attr_underline_color_new(red, green, blue);
-@@ -14237,8 +14237,8 @@ public static final int /*long*/ pango_attr_underline_color_new(short red, short
+@@ -14428,8 +14428,8 @@ public static final int /*long*/ pango_attr_underline_color_new(short red, short
lock.unlock();
}
}
@@ -27711,7 +28006,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_attr_underline_new(underline);
-@@ -14246,8 +14246,8 @@ public static final int /*long*/ pango_attr_underline_new(int underline) {
+@@ -14437,8 +14437,8 @@ public static final int /*long*/ pango_attr_underline_new(int underline) {
lock.unlock();
}
}
@@ -27722,7 +28017,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_attr_weight_new(weight);
-@@ -14256,8 +14256,8 @@ public static final int /*long*/ pango_attr_weight_new(int weight) {
+@@ -14447,8 +14447,8 @@ public static final int /*long*/ pango_attr_weight_new(int weight) {
}
}
/** @method flags=dynamic */
@@ -27733,7 +28028,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_cairo_font_map_get_default();
-@@ -14266,8 +14266,8 @@ public static final int /*long*/ pango_cairo_font_map_get_default() {
+@@ -14457,8 +14457,8 @@ public static final int /*long*/ pango_cairo_font_map_get_default() {
}
}
/** @method flags=dynamic */
@@ -27744,7 +28039,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_cairo_font_map_new();
-@@ -14276,8 +14276,8 @@ public static final int /*long*/ pango_cairo_font_map_new() {
+@@ -14467,8 +14467,8 @@ public static final int /*long*/ pango_cairo_font_map_new() {
}
}
/** @method flags=dynamic */
@@ -27755,7 +28050,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_cairo_font_map_create_context(fontmap);
-@@ -14286,8 +14286,8 @@ public static final int /*long*/ pango_cairo_font_map_create_context(int /*long*
+@@ -14477,8 +14477,8 @@ public static final int /*long*/ pango_cairo_font_map_create_context(int /*long*
}
}
/** @method flags=dynamic */
@@ -27766,7 +28061,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_cairo_create_layout(cairo);
-@@ -14299,8 +14299,8 @@ public static final int /*long*/ pango_cairo_create_layout(int /*long*/ cairo) {
+@@ -14490,8 +14490,8 @@ public static final int /*long*/ pango_cairo_create_layout(int /*long*/ cairo) {
* @method flags=dynamic
* @param context cast=(PangoContext *)
*/
@@ -27777,7 +28072,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_cairo_context_get_font_options(context);
-@@ -14312,8 +14312,8 @@ public static final int /*long*/ pango_cairo_context_get_font_options(int /*long
+@@ -14503,8 +14503,8 @@ public static final int /*long*/ pango_cairo_context_get_font_options(int /*long
* @method flags=dynamic
* @param context cast=(PangoContext *)
*/
@@ -27788,7 +28083,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_cairo_context_set_font_options(context, options);
-@@ -14322,8 +14322,8 @@ public static final void pango_cairo_context_set_font_options(int /*long*/ conte
+@@ -14513,8 +14513,8 @@ public static final void pango_cairo_context_set_font_options(int /*long*/ conte
}
}
/** @method flags=dynamic */
@@ -27799,7 +28094,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_cairo_font_map_set_resolution(fontmap, dpi);
-@@ -14332,8 +14332,8 @@ public static final void pango_cairo_font_map_set_resolution(int /*long*/ fontma
+@@ -14523,8 +14523,8 @@ public static final void pango_cairo_font_map_set_resolution(int /*long*/ fontma
}
}
/** @method flags=dynamic */
@@ -27810,7 +28105,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_cairo_layout_path(cairo, layout);
-@@ -14342,8 +14342,8 @@ public static final void pango_cairo_layout_path(int /*long*/ cairo, int /*long*
+@@ -14533,8 +14533,8 @@ public static final void pango_cairo_layout_path(int /*long*/ cairo, int /*long*
}
}
/** @method flags=dynamic */
@@ -27821,7 +28116,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_cairo_show_layout(cairo, layout);
-@@ -14352,8 +14352,8 @@ public static final void pango_cairo_show_layout(int /*long*/ cairo, int /*long*
+@@ -14543,8 +14543,8 @@ public static final void pango_cairo_show_layout(int /*long*/ cairo, int /*long*
}
}
/** @param context cast=(PangoContext *) */
@@ -27832,7 +28127,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_context_get_base_dir(context);
-@@ -14362,8 +14362,8 @@ public static final int pango_context_get_base_dir(int /*long*/ context) {
+@@ -14553,8 +14553,8 @@ public static final int pango_context_get_base_dir(int /*long*/ context) {
}
}
/** @param context cast=(PangoContext *) */
@@ -27843,7 +28138,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_context_get_language(context);
-@@ -14376,8 +14376,8 @@ public static final int /*long*/ pango_context_get_language(int /*long*/ context
+@@ -14567,8 +14567,8 @@ public static final int /*long*/ pango_context_get_language(int /*long*/ context
* @param desc cast=(const PangoFontDescription *)
* @param language cast=(PangoLanguage *)
*/
@@ -27854,7 +28149,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_context_get_metrics(context, desc, language);
-@@ -14390,8 +14390,8 @@ public static final int /*long*/ pango_context_get_metrics(int /*long*/ context,
+@@ -14581,8 +14581,8 @@ public static final int /*long*/ pango_context_get_metrics(int /*long*/ context,
* @param families cast=(PangoFontFamily ***)
* @param n_families cast=(int *)
*/
@@ -27865,7 +28160,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_context_list_families(context, families, n_families);
-@@ -14400,8 +14400,8 @@ public static final void pango_context_list_families(int /*long*/ context, int /
+@@ -14591,8 +14591,8 @@ public static final void pango_context_list_families(int /*long*/ context, int /
}
}
/** @param context cast=(PangoContext *) */
@@ -27876,7 +28171,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_context_set_base_dir(context, direction);
-@@ -14413,8 +14413,8 @@ public static final void pango_context_set_base_dir(int /*long*/ context, int di
+@@ -14604,8 +14604,8 @@ public static final void pango_context_set_base_dir(int /*long*/ context, int di
* @param context cast=(PangoContext *)
* @param language cast=(PangoLanguage *)
*/
@@ -27887,7 +28182,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_context_set_language(context, language);
-@@ -14423,8 +14423,8 @@ public static final void pango_context_set_language(int /*long*/ context, int /*
+@@ -14614,8 +14614,8 @@ public static final void pango_context_set_language(int /*long*/ context, int /*
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -27898,7 +28193,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_font_description_copy(desc);
-@@ -14433,8 +14433,8 @@ public static final int /*long*/ pango_font_description_copy(int /*long*/ desc)
+@@ -14624,8 +14624,8 @@ public static final int /*long*/ pango_font_description_copy(int /*long*/ desc)
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -27909,7 +28204,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_font_description_free(desc);
-@@ -14443,8 +14443,8 @@ public static final void pango_font_description_free(int /*long*/ desc) {
+@@ -14634,8 +14634,8 @@ public static final void pango_font_description_free(int /*long*/ desc) {
}
}
/** @param str cast=(const char *),flags=no_out critical */
@@ -27920,7 +28215,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_font_description_from_string(str);
-@@ -14453,8 +14453,8 @@ public static final int /*long*/ pango_font_description_from_string(byte[] str)
+@@ -14644,8 +14644,8 @@ public static final int /*long*/ pango_font_description_from_string(byte[] str)
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -27931,7 +28226,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_font_description_get_family(desc);
-@@ -14463,8 +14463,8 @@ public static final int /*long*/ pango_font_description_get_family(int /*long*/
+@@ -14654,8 +14654,8 @@ public static final int /*long*/ pango_font_description_get_family(int /*long*/
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -27942,7 +28237,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_font_description_get_size(desc);
-@@ -14473,8 +14473,8 @@ public static final int pango_font_description_get_size(int /*long*/ desc) {
+@@ -14664,8 +14664,8 @@ public static final int pango_font_description_get_size(int /*long*/ desc) {
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -27953,7 +28248,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_font_description_get_stretch(desc);
-@@ -14483,8 +14483,8 @@ public static final int pango_font_description_get_stretch(int /*long*/ desc) {
+@@ -14674,8 +14674,8 @@ public static final int pango_font_description_get_stretch(int /*long*/ desc) {
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -27964,7 +28259,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_font_description_get_variant(desc);
-@@ -14493,8 +14493,8 @@ public static final int pango_font_description_get_variant(int /*long*/ desc) {
+@@ -14684,8 +14684,8 @@ public static final int pango_font_description_get_variant(int /*long*/ desc) {
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -27975,7 +28270,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_font_description_get_style(desc);
-@@ -14503,8 +14503,8 @@ public static final int pango_font_description_get_style(int /*long*/ desc) {
+@@ -14694,8 +14694,8 @@ public static final int pango_font_description_get_style(int /*long*/ desc) {
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -27986,7 +28281,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_font_description_get_weight(desc);
-@@ -14512,8 +14512,8 @@ public static final int pango_font_description_get_weight(int /*long*/ desc) {
+@@ -14703,8 +14703,8 @@ public static final int pango_font_description_get_weight(int /*long*/ desc) {
lock.unlock();
}
}
@@ -27997,7 +28292,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_font_description_new();
-@@ -14525,8 +14525,8 @@ public static final int /*long*/ pango_font_description_new() {
+@@ -14716,8 +14716,8 @@ public static final int /*long*/ pango_font_description_new() {
* @param desc cast=(PangoFontDescription *)
* @param family cast=(const char *),flags=no_out critical
*/
@@ -28008,7 +28303,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_font_description_set_family(desc, family);
-@@ -14538,8 +14538,8 @@ public static final void pango_font_description_set_family(int /*long*/ desc, by
+@@ -14729,8 +14729,8 @@ public static final void pango_font_description_set_family(int /*long*/ desc, by
* @param desc cast=(PangoFontDescription *)
* @param size cast=(gint)
*/
@@ -28019,7 +28314,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_font_description_set_size(desc, size);
-@@ -14551,8 +14551,8 @@ public static final void pango_font_description_set_size(int /*long*/ desc, int
+@@ -14742,8 +14742,8 @@ public static final void pango_font_description_set_size(int /*long*/ desc, int
* @param desc cast=(PangoFontDescription *)
* @param stretch cast=(PangoStretch)
*/
@@ -28030,7 +28325,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_font_description_set_stretch(desc, stretch);
-@@ -14564,8 +14564,8 @@ public static final void pango_font_description_set_stretch(int /*long*/ desc, i
+@@ -14755,8 +14755,8 @@ public static final void pango_font_description_set_stretch(int /*long*/ desc, i
* @param desc cast=(PangoFontDescription *)
* @param weight cast=(PangoStyle)
*/
@@ -28041,7 +28336,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_font_description_set_style(desc, weight);
-@@ -14577,8 +14577,8 @@ public static final void pango_font_description_set_style(int /*long*/ desc, int
+@@ -14768,8 +14768,8 @@ public static final void pango_font_description_set_style(int /*long*/ desc, int
* @param desc cast=(PangoFontDescription *)
* @param weight cast=(PangoWeight)
*/
@@ -28052,7 +28347,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_font_description_set_weight(desc, weight);
-@@ -14590,8 +14590,8 @@ public static final void pango_font_description_set_weight(int /*long*/ desc, in
+@@ -14781,8 +14781,8 @@ public static final void pango_font_description_set_weight(int /*long*/ desc, in
* @param desc cast=(PangoFontDescription *)
* @param variant cast=(PangoVariant)
*/
@@ -28063,7 +28358,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_font_description_set_variant(desc, variant);
-@@ -14600,8 +14600,8 @@ public static final void pango_font_description_set_variant(int /*long*/ desc, i
+@@ -14791,8 +14791,8 @@ public static final void pango_font_description_set_variant(int /*long*/ desc, i
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -28074,7 +28369,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_font_description_to_string(desc);
-@@ -14610,8 +14610,8 @@ public static final int /*long*/ pango_font_description_to_string(int /*long*/ d
+@@ -14801,8 +14801,8 @@ public static final int /*long*/ pango_font_description_to_string(int /*long*/ d
}
}
/** @param face cast=(PangoFontFace *) */
@@ -28085,7 +28380,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_font_face_describe(face);
-@@ -14620,8 +14620,8 @@ public static final int /*long*/ pango_font_face_describe(int /*long*/ face) {
+@@ -14811,8 +14811,8 @@ public static final int /*long*/ pango_font_face_describe(int /*long*/ face) {
}
}
/** @param family cast=(PangoFontFamily *) */
@@ -28096,7 +28391,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_font_family_get_name(family);
-@@ -14634,8 +14634,8 @@ public static final int /*long*/ pango_font_family_get_name(int /*long*/ family)
+@@ -14825,8 +14825,8 @@ public static final int /*long*/ pango_font_family_get_name(int /*long*/ family)
* @param faces cast=(PangoFontFace ***)
* @param n_faces cast=(int *)
*/
@@ -28107,7 +28402,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_font_family_list_faces(family, faces, n_faces);
-@@ -14647,8 +14647,8 @@ public static final void pango_font_family_list_faces(int /*long*/ family, int /
+@@ -14838,8 +14838,8 @@ public static final void pango_font_family_list_faces(int /*long*/ family, int /
* @param font cast=(PangoFont *)
* @param language cast=(PangoLanguage *)
*/
@@ -28118,7 +28413,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_font_get_metrics(font, language);
-@@ -14657,8 +14657,8 @@ public static final int /*long*/ pango_font_get_metrics(int /*long*/ font, int /
+@@ -14848,8 +14848,8 @@ public static final int /*long*/ pango_font_get_metrics(int /*long*/ font, int /
}
}
/** @param metrics cast=(PangoFontMetrics *) */
@@ -28129,7 +28424,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_font_metrics_get_approximate_char_width(metrics);
-@@ -14667,8 +14667,8 @@ public static final int pango_font_metrics_get_approximate_char_width(int /*long
+@@ -14858,8 +14858,8 @@ public static final int pango_font_metrics_get_approximate_char_width(int /*long
}
}
/** @param metrics cast=(PangoFontMetrics *) */
@@ -28140,7 +28435,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_font_metrics_get_ascent(metrics);
-@@ -14677,8 +14677,8 @@ public static final int pango_font_metrics_get_ascent(int /*long*/ metrics) {
+@@ -14868,8 +14868,8 @@ public static final int pango_font_metrics_get_ascent(int /*long*/ metrics) {
}
}
/** @param metrics cast=(PangoFontMetrics *) */
@@ -28151,7 +28446,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_font_metrics_get_descent(metrics);
-@@ -14687,8 +14687,8 @@ public static final int pango_font_metrics_get_descent(int /*long*/ metrics) {
+@@ -14878,8 +14878,8 @@ public static final int pango_font_metrics_get_descent(int /*long*/ metrics) {
}
}
/** @method flags=dynamic */
@@ -28162,7 +28457,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_font_metrics_get_underline_thickness(metrics);
-@@ -14697,8 +14697,8 @@ public static final int pango_font_metrics_get_underline_thickness(int /*long*/
+@@ -14888,8 +14888,8 @@ public static final int pango_font_metrics_get_underline_thickness(int /*long*/
}
}
/** @method flags=dynamic */
@@ -28173,7 +28468,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_font_metrics_get_underline_position(metrics);
-@@ -14707,8 +14707,8 @@ public static final int pango_font_metrics_get_underline_position(int /*long*/ m
+@@ -14898,8 +14898,8 @@ public static final int pango_font_metrics_get_underline_position(int /*long*/ m
}
}
/** @method flags=dynamic */
@@ -28184,7 +28479,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_font_metrics_get_strikethrough_thickness(metrics);
-@@ -14717,8 +14717,8 @@ public static final int pango_font_metrics_get_strikethrough_thickness(int /*lon
+@@ -14908,8 +14908,8 @@ public static final int pango_font_metrics_get_strikethrough_thickness(int /*lon
}
}
/** @method flags=dynamic */
@@ -28195,7 +28490,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_font_metrics_get_strikethrough_position(metrics);
-@@ -14727,8 +14727,8 @@ public static final int pango_font_metrics_get_strikethrough_position(int /*long
+@@ -14918,8 +14918,8 @@ public static final int pango_font_metrics_get_strikethrough_position(int /*long
}
}
/** @param metrics cast=(PangoFontMetrics *) */
@@ -28206,7 +28501,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_font_metrics_unref(metrics);
-@@ -14737,8 +14737,8 @@ public static final void pango_font_metrics_unref(int /*long*/ metrics) {
+@@ -14928,8 +14928,8 @@ public static final void pango_font_metrics_unref(int /*long*/ metrics) {
}
}
/** @param language cast=(const char *),flags=no_out */
@@ -28217,7 +28512,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_language_from_string(language);
-@@ -14747,8 +14747,8 @@ public static final int /*long*/ pango_language_from_string(byte[] language) {
+@@ -14938,8 +14938,8 @@ public static final int /*long*/ pango_language_from_string(byte[] language) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28228,7 +28523,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_layout_context_changed(layout);
-@@ -14757,8 +14757,8 @@ public static final void pango_layout_context_changed(int /*long*/ layout) {
+@@ -14948,8 +14948,8 @@ public static final void pango_layout_context_changed(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28239,7 +28534,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_layout_get_alignment(layout);
-@@ -14767,8 +14767,8 @@ public static final int pango_layout_get_alignment(int /*long*/ layout) {
+@@ -14958,8 +14958,8 @@ public static final int pango_layout_get_alignment(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28250,7 +28545,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_layout_get_context(layout);
-@@ -14777,8 +14777,8 @@ public static final int /*long*/ pango_layout_get_context(int /*long*/ layout) {
+@@ -14968,8 +14968,8 @@ public static final int /*long*/ pango_layout_get_context(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28261,7 +28556,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_layout_get_attributes(layout);
-@@ -14787,8 +14787,8 @@ public static final int /*long*/ pango_layout_get_attributes(int /*long*/ layout
+@@ -14978,8 +14978,8 @@ public static final int /*long*/ pango_layout_get_attributes(int /*long*/ layout
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28272,7 +28567,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_layout_get_indent(layout);
-@@ -14797,8 +14797,8 @@ public static final int pango_layout_get_indent(int /*long*/ layout) {
+@@ -14988,8 +14988,8 @@ public static final int pango_layout_get_indent(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28283,7 +28578,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_layout_get_iter(layout);
-@@ -14807,8 +14807,8 @@ public static final int /*long*/ pango_layout_get_iter(int /*long*/ layout) {
+@@ -14998,8 +14998,8 @@ public static final int /*long*/ pango_layout_get_iter(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28294,7 +28589,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_layout_get_justify(layout);
-@@ -14817,8 +14817,8 @@ public static final boolean pango_layout_get_justify(int /*long*/ layout) {
+@@ -15008,8 +15008,8 @@ public static final boolean pango_layout_get_justify(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28305,7 +28600,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_layout_get_line(layout, line);
-@@ -14827,8 +14827,8 @@ public static final int /*long*/ pango_layout_get_line(int /*long*/ layout, int
+@@ -15018,8 +15018,8 @@ public static final int /*long*/ pango_layout_get_line(int /*long*/ layout, int
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28316,7 +28611,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_layout_get_line_count(layout);
-@@ -14841,8 +14841,8 @@ public static final int pango_layout_get_line_count(int /*long*/ layout) {
+@@ -15032,8 +15032,8 @@ public static final int pango_layout_get_line_count(int /*long*/ layout) {
* @param attrs cast=(PangoLogAttr **)
* @param n_attrs cast=(int *)
*/
@@ -28327,7 +28622,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_layout_get_log_attrs(layout, attrs, n_attrs);
-@@ -14855,8 +14855,8 @@ public static final void pango_layout_get_log_attrs(int /*long*/ layout, int /*l
+@@ -15046,8 +15046,8 @@ public static final void pango_layout_get_log_attrs(int /*long*/ layout, int /*l
* @param width cast=(int *)
* @param height cast=(int *)
*/
@@ -28338,7 +28633,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_layout_get_size(layout, width, height);
-@@ -14865,8 +14865,8 @@ public static final void pango_layout_get_size(int /*long*/ layout, int[] width,
+@@ -15056,8 +15056,8 @@ public static final void pango_layout_get_size(int /*long*/ layout, int[] width,
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28349,7 +28644,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_layout_get_spacing(layout);
-@@ -14875,8 +14875,8 @@ public static final int pango_layout_get_spacing(int /*long*/ layout) {
+@@ -15066,8 +15066,8 @@ public static final int pango_layout_get_spacing(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28360,7 +28655,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_layout_get_tabs(layout);
-@@ -14885,8 +14885,8 @@ public static final int /*long*/ pango_layout_get_tabs(int /*long*/ layout) {
+@@ -15076,8 +15076,8 @@ public static final int /*long*/ pango_layout_get_tabs(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28371,7 +28666,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_layout_get_text(layout);
-@@ -14895,8 +14895,8 @@ public static final int /*long*/ pango_layout_get_text(int /*long*/ layout) {
+@@ -15086,8 +15086,8 @@ public static final int /*long*/ pango_layout_get_text(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28382,7 +28677,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_layout_get_width(layout);
-@@ -14908,8 +14908,8 @@ public static final int pango_layout_get_width(int /*long*/ layout) {
+@@ -15099,8 +15099,8 @@ public static final int pango_layout_get_width(int /*long*/ layout) {
* @param layout cast=(PangoLayout*)
* @param pos flags=no_in
*/
@@ -28393,7 +28688,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_layout_index_to_pos(layout, index, pos);
-@@ -14918,8 +14918,8 @@ public static final void pango_layout_index_to_pos(int /*long*/ layout, int inde
+@@ -15109,8 +15109,8 @@ public static final void pango_layout_index_to_pos(int /*long*/ layout, int inde
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -28404,7 +28699,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_layout_iter_free(iter);
-@@ -14932,8 +14932,8 @@ public static final void pango_layout_iter_free(int /*long*/ iter) {
+@@ -15123,8 +15123,8 @@ public static final void pango_layout_iter_free(int /*long*/ iter) {
* @param ink_rect flags=no_in
* @param logical_rect flags=no_in
*/
@@ -28415,7 +28710,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_layout_iter_get_line_extents(iter, ink_rect, logical_rect);
-@@ -14942,8 +14942,8 @@ public static final void pango_layout_iter_get_line_extents(int /*long*/ iter, P
+@@ -15133,8 +15133,8 @@ public static final void pango_layout_iter_get_line_extents(int /*long*/ iter, P
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -28426,7 +28721,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_layout_iter_get_index(iter);
-@@ -14952,8 +14952,8 @@ public static final int pango_layout_iter_get_index(int /*long*/ iter) {
+@@ -15143,8 +15143,8 @@ public static final int pango_layout_iter_get_index(int /*long*/ iter) {
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -28437,7 +28732,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_layout_iter_get_run(iter);
-@@ -14962,8 +14962,8 @@ public static final int /*long*/ pango_layout_iter_get_run(int /*long*/ iter) {
+@@ -15153,8 +15153,8 @@ public static final int /*long*/ pango_layout_iter_get_run(int /*long*/ iter) {
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -28448,7 +28743,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_layout_iter_next_line(iter);
-@@ -14972,8 +14972,8 @@ public static final boolean pango_layout_iter_next_line(int /*long*/ iter) {
+@@ -15163,8 +15163,8 @@ public static final boolean pango_layout_iter_next_line(int /*long*/ iter) {
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -28459,7 +28754,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_layout_iter_next_run(iter);
-@@ -14986,8 +14986,8 @@ public static final boolean pango_layout_iter_next_run(int /*long*/ iter) {
+@@ -15177,8 +15177,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
*/
@@ -28470,7 +28765,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_layout_line_get_extents(line, ink_rect, logical_rect);
-@@ -15000,8 +15000,8 @@ public static final void pango_layout_line_get_extents(int /*long*/ line, PangoR
+@@ -15191,8 +15191,8 @@ public static final void pango_layout_line_get_extents(int /*long*/ line, PangoR
* @param index_ cast=(int *)
* @param trailing cast=(int *)
*/
@@ -28481,7 +28776,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_layout_line_x_to_index(line, x_pos, index_, trailing);
-@@ -15010,8 +15010,8 @@ public static final boolean pango_layout_line_x_to_index(int /*long*/ line, int
+@@ -15201,8 +15201,8 @@ public static final boolean pango_layout_line_x_to_index(int /*long*/ line, int
}
}
/** @param context cast=(PangoContext *) */
@@ -28492,7 +28787,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_layout_new(context);
-@@ -15020,8 +15020,8 @@ public static final int /*long*/ pango_layout_new(int /*long*/ context) {
+@@ -15211,8 +15211,8 @@ public static final int /*long*/ pango_layout_new(int /*long*/ context) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28503,7 +28798,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_layout_set_alignment(layout, alignment);
-@@ -15033,8 +15033,8 @@ public static final void pango_layout_set_alignment (int /*long*/ layout, int al
+@@ -15224,8 +15224,8 @@ public static final void pango_layout_set_alignment (int /*long*/ layout, int al
* @param layout cast=(PangoLayout *)
* @param attrs cast=(PangoAttrList *)
*/
@@ -28514,7 +28809,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_layout_set_attributes(layout, attrs);
-@@ -15043,8 +15043,8 @@ public static final void pango_layout_set_attributes(int /*long*/ layout, int /*
+@@ -15234,8 +15234,8 @@ public static final void pango_layout_set_attributes(int /*long*/ layout, int /*
}
}
/** @method flags=dynamic */
@@ -28525,7 +28820,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_layout_set_auto_dir(layout, auto_dir);
-@@ -15056,8 +15056,8 @@ public static final void pango_layout_set_auto_dir(int /*long*/ layout, boolean
+@@ -15247,8 +15247,8 @@ public static final void pango_layout_set_auto_dir(int /*long*/ layout, boolean
* @param context cast=(PangoLayout *)
* @param descr cast=(PangoFontDescription *)
*/
@@ -28536,7 +28831,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_layout_set_font_description(context, descr);
-@@ -15066,8 +15066,8 @@ public static final void pango_layout_set_font_description(int /*long*/ context,
+@@ -15257,8 +15257,8 @@ public static final void pango_layout_set_font_description(int /*long*/ context,
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28547,7 +28842,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_layout_set_indent(layout, indent);
-@@ -15076,8 +15076,8 @@ public static final void pango_layout_set_indent(int /*long*/ layout, int indent
+@@ -15267,8 +15267,8 @@ public static final void pango_layout_set_indent(int /*long*/ layout, int indent
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28558,7 +28853,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_layout_set_justify(layout, justify);
-@@ -15089,8 +15089,8 @@ public static final void pango_layout_set_justify(int /*long*/ layout, boolean j
+@@ -15280,8 +15280,8 @@ public static final void pango_layout_set_justify(int /*long*/ layout, boolean j
* @param context cast=(PangoLayout *)
* @param setting cast=(gboolean)
*/
@@ -28569,7 +28864,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_layout_set_single_paragraph_mode(context, setting);
-@@ -15099,8 +15099,8 @@ public static final void pango_layout_set_single_paragraph_mode(int /*long*/ con
+@@ -15290,8 +15290,8 @@ public static final void pango_layout_set_single_paragraph_mode(int /*long*/ con
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28580,7 +28875,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_layout_set_spacing(layout, spacing);
-@@ -15112,8 +15112,8 @@ public static final void pango_layout_set_spacing(int /*long*/ layout, int spaci
+@@ -15303,8 +15303,8 @@ public static final void pango_layout_set_spacing(int /*long*/ layout, int spaci
* @param layout cast=(PangoLayout *)
* @param tabs cast=(PangoTabArray *)
*/
@@ -28591,7 +28886,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_layout_set_tabs(layout, tabs);
-@@ -15126,8 +15126,8 @@ public static final void pango_layout_set_tabs(int /*long*/ layout, int /*long*/
+@@ -15317,8 +15317,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)
*/
@@ -28602,7 +28897,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_layout_set_text(layout, text, length);
-@@ -15136,8 +15136,8 @@ public static final void pango_layout_set_text(int /*long*/ layout, byte[] text,
+@@ -15327,8 +15327,8 @@ public static final void pango_layout_set_text(int /*long*/ layout, byte[] text,
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28613,7 +28908,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_layout_set_width(layout, width);
-@@ -15146,8 +15146,8 @@ public static final void pango_layout_set_width(int /*long*/ layout, int width)
+@@ -15337,8 +15337,8 @@ public static final void pango_layout_set_width(int /*long*/ layout, int width)
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28624,7 +28919,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_layout_set_wrap(layout, wrap);
-@@ -15160,8 +15160,8 @@ public static final void pango_layout_set_wrap (int /*long*/ layout, int wrap) {
+@@ -15351,8 +15351,8 @@ public static final void pango_layout_set_wrap (int /*long*/ layout, int wrap) {
* @param index cast=(int *)
* @param trailing cast=(int *)
*/
@@ -28635,7 +28930,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_layout_xy_to_index(layout, x, y, index, trailing);
-@@ -15170,8 +15170,8 @@ public static final boolean pango_layout_xy_to_index(int /*long*/ layout, int x,
+@@ -15361,8 +15361,8 @@ public static final boolean pango_layout_xy_to_index(int /*long*/ layout, int x,
}
}
/** @param tab_array cast=(PangoTabArray *) */
@@ -28646,7 +28941,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_tab_array_get_size(tab_array);
-@@ -15184,8 +15184,8 @@ public static final int pango_tab_array_get_size(int /*long*/ tab_array) {
+@@ -15375,8 +15375,8 @@ public static final int pango_tab_array_get_size(int /*long*/ tab_array) {
* @param alignments cast=(PangoTabAlign **)
* @param locations cast=(int **)
*/
@@ -28657,7 +28952,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_tab_array_get_tabs(tab_array, alignments, locations);
-@@ -15194,8 +15194,8 @@ public static final void pango_tab_array_get_tabs(int /*long*/ tab_array, int /*
+@@ -15385,8 +15385,8 @@ public static final void pango_tab_array_get_tabs(int /*long*/ tab_array, int /*
}
}
/** @param tab_array cast=(PangoTabArray *) */
@@ -28668,7 +28963,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_tab_array_free(tab_array);
-@@ -15207,8 +15207,8 @@ public static final void pango_tab_array_free(int /*long*/ tab_array) {
+@@ -15398,8 +15398,8 @@ public static final void pango_tab_array_free(int /*long*/ tab_array) {
* @param initial_size cast=(gint)
* @param positions_in_pixels cast=(gboolean)
*/
@@ -28679,7 +28974,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _pango_tab_array_new(initial_size, positions_in_pixels);
-@@ -15222,8 +15222,8 @@ public static final int /*long*/ pango_tab_array_new(int initial_size, boolean p
+@@ -15413,8 +15413,8 @@ public static final int /*long*/ pango_tab_array_new(int initial_size, boolean p
* @param alignment cast=(PangoTabAlign)
* @param location cast=(gint)
*/
@@ -28690,7 +28985,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
_pango_tab_array_set_tab(tab_array, tab_index, alignment, location);
-@@ -15234,8 +15234,8 @@ public static final void pango_tab_array_set_tab(int /*long*/ tab_array, int tab
+@@ -15425,8 +15425,8 @@ public static final void pango_tab_array_set_tab(int /*long*/ tab_array, int tab
/**
* @method flags=dynamic
*/
@@ -28701,7 +28996,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _ubuntu_menu_proxy_get();
-@@ -15249,8 +15249,8 @@ public static final int /*long*/ ubuntu_menu_proxy_get() {
+@@ -15440,8 +15440,8 @@ public static final int /*long*/ ubuntu_menu_proxy_get() {
* @param relationship cast=(AtkRelationType)
* @param target cast=(AtkObject *)
*/
@@ -28712,7 +29007,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _atk_object_add_relationship(object, relationship, target);
-@@ -15264,8 +15264,8 @@ public static final boolean atk_object_add_relationship (int /*long*/ object, in
+@@ -15455,8 +15455,8 @@ public static final boolean atk_object_add_relationship (int /*long*/ object, in
* @param relationship cast=(AtkRelationType)
* @param target cast=(AtkObject *)
*/
@@ -28723,7 +29018,7 @@ index 5306e6e..15bf432 100644
lock.lock();
try {
return _atk_object_remove_relationship(object, relationship, target);
-@@ -15289,5 +15289,5 @@ public static final int access (byte [] path, int amode) {
+@@ -15480,5 +15480,5 @@ public static final int access (byte [] path, int amode) {
* @param s1 cast=(const char*)
* @param s2 cast=(const char*)
*/
@@ -28902,10 +29197,10 @@ index b748c34..df24fb9 100644
public static final int sizeof = OS.XWindowChanges_sizeof();
}
diff --git a/org/eclipse/swt/internal/mozilla/XPCOM.java b/org/eclipse/swt/internal/mozilla/XPCOM.java
-index 1b772ad..ccf7ff2 100644
+index fd0259f..30f3da8 100644
--- a/org/eclipse/swt/internal/mozilla/XPCOM.java
+++ b/org/eclipse/swt/internal/mozilla/XPCOM.java
-@@ -149,7 +149,7 @@ public class XPCOM extends C {
+@@ -160,7 +160,7 @@ public class XPCOM extends C {
public static final native int nsDynamicFunctionLoad_sizeof ();
@@ -28914,7 +29209,7 @@ index 1b772ad..ccf7ff2 100644
if (nsISupports.IsXULRunner10) { // TODO change this reference
memmove (dest, new byte[] {src[0] ? (byte)1 : 0}, 1);
} else {
-@@ -157,7 +157,7 @@ public static void memmove(int /*long*/ dest, boolean[] src) {
+@@ -168,7 +168,7 @@ public static void memmove(int /*long*/ dest, boolean[] src) {
}
}
@@ -28923,7 +29218,7 @@ index 1b772ad..ccf7ff2 100644
if (nsISupports.IsXULRunner10) { // TODO change this reference
byte[] result = new byte[1];
memmove (result, src, 1);
-@@ -174,25 +174,25 @@ public static void memmove(boolean[] dest, int /*long*/ src) {
+@@ -185,28 +185,28 @@ public static void memmove(boolean[] dest, int /*long*/ src) {
* @param src cast=(const void *),flags=no_out critical
* @param size cast=(size_t)
*/
@@ -28948,6 +29243,21 @@ index 1b772ad..ccf7ff2 100644
+public static final native int strlen_PRUnichar(long /*int*/ s);
/** @method flags=no_gen */
+-public static final native int /*long*/ CALLBACK_JSNative(int /*long*/ func);
++public static final native long /*int*/ CALLBACK_JSNative(long /*int*/ func);
+
+ /** @method flags=no_gen */
+-public static final native int /*long*/ _JS_DefineFunction(byte[] mozillaPath, int /*long*/ cx, int /*long*/ obj, byte[] name, int /*long*/ call, int nargs, int flags);
+-public static final int /*long*/ JS_DefineFunction(byte[] mozillaPath, int /*long*/ cx, int /*long*/ obj, byte[] name, int /*long*/ call, int nargs, int flags) {
++public static final native long /*int*/ _JS_DefineFunction(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, byte[] name, long /*int*/ call, int nargs, int flags);
++public static final long /*int*/ JS_DefineFunction(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, byte[] name, long /*int*/ call, int nargs, int flags) {
+ lock.lock();
+ try {
+ return _JS_DefineFunction(mozillaPath, cx, obj, name, call, nargs, flags);
+@@ -215,8 +215,8 @@ public static final int /*long*/ JS_DefineFunction(byte[] mozillaPath, int /*lon
+ }
+ }
+ /** @method flags=no_gen */
-public static final native int _JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, int /*long*/ cx, int /*long*/ obj, int /*long*/ principals, char[] chars, int length, byte[] filename, int lineno, int /*long*/[] retVal);
-public static final int JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, int /*long*/ cx, int /*long*/ obj, int /*long*/ principals, char[] chars, int length, byte[] filename, int lineno, int /*long*/[] retVal) {
+public static final native int _JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, long /*int*/ principals, char[] chars, int length, byte[] filename, int lineno, long /*int*/[] retVal);
@@ -28955,7 +29265,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _JS_EvaluateUCScriptForPrincipals(mozillaPath, cx, obj, principals, chars, length, filename, lineno, retVal);
-@@ -201,8 +201,8 @@ public static final int JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, int
+@@ -225,8 +225,8 @@ public static final int JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, int
}
}
/** @method flags=no_gen */
@@ -28966,7 +29276,18 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _JS_GetGlobalObject(mozillaPath, cx);
-@@ -211,8 +211,8 @@ public static final int /*long*/ JS_GetGlobalObject(byte[] mozillaPath, int /*lo
+@@ -235,8 +235,8 @@ public static final int /*long*/ JS_GetGlobalObject(byte[] mozillaPath, int /*lo
+ }
+ }
+ /** @method flags=no_gen */
+-public static final native int /*long*/ _JS_NewObject(byte[] mozillaPath, int /*long*/ cx, int /*long*/ clasp, int /*long*/ proto, int /*long*/ parent);
+-public static final int /*long*/ JS_NewObject(byte[] mozillaPath, int /*long*/ cx, int /*long*/ clasp, int /*long*/ proto, int /*long*/ parent) {
++public static final native long /*int*/ _JS_NewObject(byte[] mozillaPath, long /*int*/ cx, long /*int*/ clasp, long /*int*/ proto, long /*int*/ parent);
++public static final long /*int*/ JS_NewObject(byte[] mozillaPath, long /*int*/ cx, long /*int*/ clasp, long /*int*/ proto, long /*int*/ parent) {
+ lock.lock();
+ try {
+ return _JS_NewObject(mozillaPath, cx, clasp, proto, parent);
+@@ -245,8 +245,8 @@ public static final int /*long*/ JS_NewObject(byte[] mozillaPath, int /*long*/ c
}
}
/** @method flags=no_gen */
@@ -28977,7 +29298,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _NS_Free(mozillaPath, aPtr);
-@@ -221,8 +221,8 @@ public static final boolean NS_Free(byte[] mozillaPath, int /*long*/ aPtr) {
+@@ -255,8 +255,8 @@ public static final boolean NS_Free(byte[] mozillaPath, int /*long*/ aPtr) {
}
}
/** @param result cast=(nsIComponentManager**) */
@@ -28988,7 +29309,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _NS_GetComponentManager(result);
-@@ -231,8 +231,8 @@ public static final int NS_GetComponentManager(int /*long*/[] result) {
+@@ -265,8 +265,8 @@ public static final int NS_GetComponentManager(int /*long*/[] result) {
}
}
/** @param result cast=(nsIServiceManager**) */
@@ -28999,7 +29320,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _NS_GetServiceManager(result);
-@@ -245,8 +245,8 @@ public static final int NS_GetServiceManager(int /*long*/[] result) {
+@@ -279,8 +279,8 @@ public static final int NS_GetServiceManager(int /*long*/[] result) {
* @param binDirectory cast=(nsIFile *)
* @param appFileLocationProvider cast=(nsIDirectoryServiceProvider *)
*/
@@ -29010,7 +29331,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _NS_InitXPCOM2(result, binDirectory, appFileLocationProvider);
-@@ -258,8 +258,8 @@ public static final int NS_InitXPCOM2(int /*long*/ result, int /*long*/ binDirec
+@@ -292,8 +292,8 @@ public static final int NS_InitXPCOM2(int /*long*/ result, int /*long*/ binDirec
* @param path cast=(nsAString *),flags=struct
* @param result cast=(nsILocalFile**)
*/
@@ -29021,7 +29342,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _NS_NewLocalFile(path, followLinks, result);
-@@ -268,8 +268,8 @@ public static final int NS_NewLocalFile(int /*long*/ path, int followLinks, int
+@@ -302,8 +302,8 @@ public static final int NS_NewLocalFile(int /*long*/ path, int followLinks, int
}
}
/** @method flags=new */
@@ -29032,7 +29353,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _nsEmbedCString_new();
-@@ -281,8 +281,8 @@ public static final int /*long*/ nsEmbedCString_new() {
+@@ -315,8 +315,8 @@ public static final int /*long*/ nsEmbedCString_new() {
* @method flags=new
* @param aString cast=(const char *)
*/
@@ -29043,7 +29364,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _nsEmbedCString_new(aString, length);
-@@ -294,8 +294,8 @@ public static final int /*long*/ nsEmbedCString_new(byte[] aString, int length)
+@@ -328,8 +328,8 @@ public static final int /*long*/ nsEmbedCString_new(byte[] aString, int length)
* @method flags=new
* @param aString cast=(const char *)
*/
@@ -29054,7 +29375,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _nsEmbedCString_new(aString, length);
-@@ -307,8 +307,8 @@ public static final int /*long*/ nsEmbedCString_new(int /*long*/ aString, int le
+@@ -341,8 +341,8 @@ public static final int /*long*/ nsEmbedCString_new(int /*long*/ aString, int le
* @method flags=delete
* @param ptr cast=(nsEmbedCString *)
*/
@@ -29065,7 +29386,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
_nsEmbedCString_delete(ptr);
-@@ -320,8 +320,8 @@ public static final void nsEmbedCString_delete(int /*long*/ ptr) {
+@@ -354,8 +354,8 @@ public static final void nsEmbedCString_delete(int /*long*/ ptr) {
* @method flags=cpp
* @param ptr cast=(nsEmbedCString *)
*/
@@ -29076,7 +29397,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _nsEmbedCString_Length(ptr);
-@@ -333,8 +333,8 @@ public static final int nsEmbedCString_Length(int /*long*/ ptr) {
+@@ -367,8 +367,8 @@ public static final int nsEmbedCString_Length(int /*long*/ ptr) {
* @method flags=cpp
* @param ptr cast=(nsIScriptGlobalObject *)
*/
@@ -29087,7 +29408,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _nsIScriptGlobalObject_EnsureScriptEnvironment(ptr, lang);
-@@ -346,8 +346,8 @@ public static final int nsIScriptGlobalObject_EnsureScriptEnvironment(int /*long
+@@ -380,8 +380,8 @@ public static final int nsIScriptGlobalObject_EnsureScriptEnvironment(int /*long
* @method flags=cpp
* @param ptr cast=(nsIScriptGlobalObject *)
*/
@@ -29098,7 +29419,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _nsIScriptGlobalObject_GetScriptContext(ptr, lang);
-@@ -359,8 +359,8 @@ public static final int /*long*/ nsIScriptGlobalObject_GetScriptContext(int /*lo
+@@ -393,8 +393,8 @@ public static final int /*long*/ nsIScriptGlobalObject_GetScriptContext(int /*lo
* @method flags=cpp
* @param ptr cast=(nsIScriptContext *)
*/
@@ -29109,7 +29430,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _nsIScriptContext_GetNativeContext(ptr);
-@@ -373,8 +373,8 @@ public static final int /*long*/ nsIScriptContext_GetNativeContext(int /*long*/
+@@ -406,8 +406,8 @@ public static final int /*long*/ nsIScriptContext_GetNativeContext(int /*long*/
* @method flags=cpp
* @param ptr cast=(nsEmbedCString *)
*/
@@ -29120,7 +29441,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _nsEmbedCString_get(ptr);
-@@ -386,8 +386,8 @@ public static final int /*long*/ nsEmbedCString_get(int /*long*/ ptr) {
+@@ -419,8 +419,8 @@ public static final int /*long*/ nsEmbedCString_get(int /*long*/ ptr) {
* @method flags=delete
* @param ptr cast=(nsID *)
*/
@@ -29131,7 +29452,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
_nsID_delete(ptr);
-@@ -396,8 +396,8 @@ public static final void nsID_delete(int /*long*/ ptr) {
+@@ -429,8 +429,8 @@ public static final void nsID_delete(int /*long*/ ptr) {
}
}
/** @method flags=new */
@@ -29142,7 +29463,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _nsID_new();
-@@ -410,8 +410,8 @@ public static final int /*long*/ nsID_new() {
+@@ -443,8 +443,8 @@ public static final int /*long*/ nsID_new() {
* @param ptr cast=(nsID *)
* @param other cast=(nsID *),flags=struct
*/
@@ -29153,7 +29474,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _nsID_Equals(ptr, other);
-@@ -420,8 +420,8 @@ public static final int nsID_Equals(int /*long*/ ptr, int /*long*/ other) {
+@@ -453,8 +453,8 @@ public static final int nsID_Equals(int /*long*/ ptr, int /*long*/ other) {
}
}
/** @method flags=new */
@@ -29164,7 +29485,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _nsEmbedString_new();
-@@ -433,8 +433,8 @@ public static final int /*long*/ nsEmbedString_new() {
+@@ -466,8 +466,8 @@ public static final int /*long*/ nsEmbedString_new() {
* @method flags=new
* @param aString cast=(PRUnichar *)
*/
@@ -29175,7 +29496,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _nsEmbedString_new(aString);
-@@ -446,8 +446,8 @@ public static final int /*long*/ nsEmbedString_new(char[] aString) {
+@@ -479,8 +479,8 @@ public static final int /*long*/ nsEmbedString_new(char[] aString) {
* @method flags=delete
* @param ptr cast=(nsEmbedString *)
*/
@@ -29186,7 +29507,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
_nsEmbedString_delete(ptr);
-@@ -459,8 +459,8 @@ public static final void nsEmbedString_delete(int /*long*/ ptr) {
+@@ -492,8 +492,8 @@ public static final void nsEmbedString_delete(int /*long*/ ptr) {
* @method flags=cpp
* @param ptr cast=(nsEmbedString *)
*/
@@ -29197,7 +29518,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _nsEmbedString_Length(ptr);
-@@ -472,8 +472,8 @@ public static final int nsEmbedString_Length(int /*long*/ ptr) {
+@@ -505,8 +505,8 @@ public static final int nsEmbedString_Length(int /*long*/ ptr) {
* @method flags=cpp
* @param ptr cast=(nsEmbedString *)
*/
@@ -29208,7 +29529,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _nsEmbedString_get(ptr);
-@@ -486,8 +486,8 @@ public static final int /*long*/ nsEmbedString_get(int /*long*/ ptr) {
+@@ -519,8 +519,8 @@ public static final int /*long*/ nsEmbedString_get(int /*long*/ ptr) {
* @param ptr cast=(nsIMemory *)
* @param size cast=(size_t)
*/
@@ -29219,7 +29540,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _nsIMemory_Alloc(ptr, size);
-@@ -501,8 +501,8 @@ public static final int /*long*/ nsIMemory_Alloc(int /*long*/ ptr, int size) {
+@@ -534,8 +534,8 @@ public static final int /*long*/ nsIMemory_Alloc(int /*long*/ ptr, int size) {
* @param ptr2 cast=(void *)
* @param size cast=(size_t)
*/
@@ -29230,7 +29551,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _nsIMemory_Realloc(ptr1, ptr2, size);
-@@ -511,8 +511,8 @@ public static final int /*long*/ nsIMemory_Realloc(int /*long*/ ptr1, int /*long
+@@ -544,8 +544,8 @@ public static final int /*long*/ nsIMemory_Realloc(int /*long*/ ptr1, int /*long
}
}
/** @param functionLoad cast=(const nsDynamicFunctionLoad *) */
@@ -29241,7 +29562,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _XPCOMGlueLoadXULFunctions(functionLoad);
-@@ -540,8 +540,8 @@ public static final int XPCOMGlueShutdown() {
+@@ -573,8 +573,8 @@ public static final int XPCOMGlueShutdown() {
}
}
@@ -29252,7 +29573,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _Call(ptr);
-@@ -557,8 +557,8 @@ public static final int Call(int /*long*/ ptr) {
+@@ -590,8 +590,8 @@ public static final int Call(int /*long*/ ptr) {
* @param aFromSegment cast=(const char *)
* @param aWriteCount cast=(PRUint32 *)
*/
@@ -29263,7 +29584,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _Call(ptr, aInStream, aClosure, aFromSegment, aToOffset, aCount, aWriteCount);
-@@ -574,8 +574,8 @@ public static final int /*long*/ Call(int /*long*/ ptr, int /*long*/ aInStream,
+@@ -607,8 +607,8 @@ public static final int /*long*/ Call(int /*long*/ ptr, int /*long*/ aInStream,
* @param aAppDirProvider cast=(nsIDirectoryServiceProvider *)
* @param aStaticComponents cast=(nsStaticModuleInfo const *)
*/
@@ -29274,7 +29595,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _Call(ptr, aLibXULDirectory, aAppDirectory, aAppDirProvider, aStaticComponents, aStaticComponentsCount);
-@@ -590,8 +590,8 @@ public static final int Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, in
+@@ -623,8 +623,8 @@ public static final int Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, in
* @param aAppDirectory cast=(nsILocalFile *)
* @param aAppDirProvider cast=(nsIDirectoryServiceProvider *)
*/
@@ -29285,7 +29606,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _Call(ptr, aLibXULDirectory, aAppDirectory, aAppDirProvider);
-@@ -600,8 +600,8 @@ public static final int Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, in
+@@ -633,8 +633,8 @@ public static final int Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, in
}
}
@@ -29296,7 +29617,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl);
-@@ -610,8 +610,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl) {
+@@ -643,8 +643,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl) {
}
}
@@ -29307,7 +29628,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -619,8 +619,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0) {
+@@ -652,8 +652,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0) {
lock.unlock();
}
}
@@ -29318,7 +29639,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -628,8 +628,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0) {
+@@ -661,8 +661,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0) {
lock.unlock();
}
}
@@ -29329,7 +29650,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -637,8 +637,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, double arg0) {
+@@ -670,8 +670,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, double arg0) {
lock.unlock();
}
}
@@ -29340,7 +29661,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -646,8 +646,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0) {
+@@ -679,8 +679,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0) {
lock.unlock();
}
}
@@ -29351,7 +29672,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -655,8 +655,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float[] arg0) {
+@@ -688,8 +688,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float[] arg0) {
lock.unlock();
}
}
@@ -29362,7 +29683,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -664,8 +664,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0) {
+@@ -697,8 +697,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0) {
lock.unlock();
}
}
@@ -29373,7 +29694,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -673,8 +673,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0) {
+@@ -706,8 +706,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0) {
lock.unlock();
}
}
@@ -29384,7 +29705,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -682,8 +682,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0) {
+@@ -715,8 +715,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0) {
lock.unlock();
}
}
@@ -29395,7 +29716,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -691,8 +691,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0) {
+@@ -724,8 +724,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0) {
lock.unlock();
}
}
@@ -29406,7 +29727,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -700,8 +700,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0) {
+@@ -733,8 +733,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0) {
lock.unlock();
}
}
@@ -29417,7 +29738,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
-@@ -710,8 +710,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0) {
+@@ -743,8 +743,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0) {
}
}
@@ -29428,7 +29749,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -719,8 +719,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1)
+@@ -752,8 +752,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1)
lock.unlock();
}
}
@@ -29439,7 +29760,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -728,8 +728,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1
+@@ -761,8 +761,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1
lock.unlock();
}
}
@@ -29450,7 +29771,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -737,8 +737,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
+@@ -770,8 +770,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
@@ -29461,7 +29782,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -746,8 +746,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -779,8 +779,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -29472,7 +29793,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -755,8 +755,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
+@@ -788,8 +788,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
lock.unlock();
}
}
@@ -29483,7 +29804,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -764,8 +764,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long[] ar
+@@ -797,8 +797,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long[] ar
lock.unlock();
}
}
@@ -29494,7 +29815,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -773,8 +773,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long[] a
+@@ -806,8 +806,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long[] a
lock.unlock();
}
}
@@ -29505,7 +29826,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -782,8 +782,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, short[] a
+@@ -815,8 +815,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, short[] a
lock.unlock();
}
}
@@ -29516,7 +29837,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -791,8 +791,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] ar
+@@ -824,8 +824,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] ar
lock.unlock();
}
}
@@ -29527,7 +29848,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -800,8 +800,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, short[]
+@@ -833,8 +833,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, short[]
lock.unlock();
}
}
@@ -29538,7 +29859,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -809,8 +809,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[]
+@@ -842,8 +842,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[]
lock.unlock();
}
}
@@ -29549,7 +29870,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -818,8 +818,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[]
+@@ -851,8 +851,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[]
lock.unlock();
}
}
@@ -29560,7 +29881,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -827,8 +827,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long a
+@@ -860,8 +860,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long a
lock.unlock();
}
}
@@ -29571,7 +29892,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -836,8 +836,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
+@@ -869,8 +869,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
lock.unlock();
}
}
@@ -29582,7 +29903,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -845,8 +845,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, short
+@@ -878,8 +878,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, short
lock.unlock();
}
}
@@ -29593,7 +29914,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -854,8 +854,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1
+@@ -887,8 +887,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1
lock.unlock();
}
}
@@ -29604,7 +29925,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -863,8 +863,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg
+@@ -896,8 +896,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg
lock.unlock();
}
}
@@ -29615,7 +29936,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -872,8 +872,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
+@@ -905,8 +905,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
@@ -29626,7 +29947,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -881,8 +881,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] a
+@@ -914,8 +914,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] a
lock.unlock();
}
}
@@ -29637,7 +29958,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -890,8 +890,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[]
+@@ -923,8 +923,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[]
lock.unlock();
}
}
@@ -29648,7 +29969,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -899,8 +899,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1
+@@ -932,8 +932,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1
lock.unlock();
}
}
@@ -29659,7 +29980,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -908,8 +908,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg
+@@ -941,8 +941,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg
lock.unlock();
}
}
@@ -29670,7 +29991,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -917,8 +917,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int[] ar
+@@ -950,8 +950,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int[] ar
lock.unlock();
}
}
@@ -29681,7 +30002,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -926,8 +926,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long[] a
+@@ -959,8 +959,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long[] a
lock.unlock();
}
}
@@ -29692,7 +30013,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -935,8 +935,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[]
+@@ -968,8 +968,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[]
lock.unlock();
}
}
@@ -29703,7 +30024,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -944,8 +944,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
+@@ -977,8 +977,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
lock.unlock();
}
}
@@ -29714,7 +30035,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -953,8 +953,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
+@@ -986,8 +986,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
lock.unlock();
}
}
@@ -29725,7 +30046,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -963,8 +963,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
+@@ -996,8 +996,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
}
}
@@ -29736,7 +30057,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -972,8 +972,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
+@@ -1005,8 +1005,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
@@ -29747,7 +30068,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -981,8 +981,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
+@@ -1014,8 +1014,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
@@ -29758,7 +30079,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -990,8 +990,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
+@@ -1023,8 +1023,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
@@ -29769,7 +30090,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -999,8 +999,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
+@@ -1032,8 +1032,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
@@ -29780,7 +30101,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1008,8 +1008,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] a
+@@ -1041,8 +1041,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] a
lock.unlock();
}
}
@@ -29791,7 +30112,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
-@@ -1017,8 +1017,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long
+@@ -1050,8 +1050,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long
lock.unlock();
}
}
@@ -29802,7 +30123,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1026,8 +1026,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
+@@ -1059,8 +1059,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
lock.unlock();
}
}
@@ -29813,7 +30134,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1035,8 +1035,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
+@@ -1068,8 +1068,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
lock.unlock();
}
}
@@ -29824,7 +30145,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1045,8 +1045,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long
+@@ -1078,8 +1078,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long
}
}
@@ -29835,7 +30156,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1054,8 +1054,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[]
+@@ -1087,8 +1087,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[]
lock.unlock();
}
}
@@ -29846,7 +30167,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1063,8 +1063,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[]
+@@ -1096,8 +1096,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[]
lock.unlock();
}
}
@@ -29857,7 +30178,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1072,8 +1072,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
+@@ -1105,8 +1105,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
lock.unlock();
}
}
@@ -29868,7 +30189,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1081,8 +1081,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long a
+@@ -1114,8 +1114,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long a
lock.unlock();
}
}
@@ -29879,7 +30200,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1090,8 +1090,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID a
+@@ -1123,8 +1123,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID a
lock.unlock();
}
}
@@ -29890,7 +30211,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1099,8 +1099,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID a
+@@ -1132,8 +1132,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID a
lock.unlock();
}
}
@@ -29901,7 +30222,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1108,8 +1108,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int ar
+@@ -1141,8 +1141,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int ar
lock.unlock();
}
}
@@ -29912,7 +30233,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1117,8 +1117,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long a
+@@ -1150,8 +1150,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long a
lock.unlock();
}
}
@@ -29923,7 +30244,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1126,8 +1126,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
+@@ -1159,8 +1159,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
@@ -29934,7 +30255,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1135,8 +1135,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
+@@ -1168,8 +1168,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
@@ -29945,7 +30266,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1144,8 +1144,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -1177,8 +1177,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -29956,7 +30277,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1153,8 +1153,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -1186,8 +1186,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -29967,7 +30288,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1162,8 +1162,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1
+@@ -1195,8 +1195,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1
lock.unlock();
}
}
@@ -29978,7 +30299,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1171,8 +1171,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -1204,8 +1204,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -29989,7 +30310,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1180,8 +1180,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -1213,8 +1213,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30000,7 +30321,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1189,8 +1189,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -1222,8 +1222,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30011,7 +30332,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1198,8 +1198,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -1231,8 +1231,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30022,7 +30343,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1207,8 +1207,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
+@@ -1240,8 +1240,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
@@ -30033,7 +30354,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1216,8 +1216,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -1249,8 +1249,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30044,7 +30365,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1225,8 +1225,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1
+@@ -1258,8 +1258,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1
lock.unlock();
}
}
@@ -30055,7 +30376,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1234,8 +1234,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg
+@@ -1267,8 +1267,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg
lock.unlock();
}
}
@@ -30066,7 +30387,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1243,8 +1243,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -1276,8 +1276,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30077,7 +30398,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1252,8 +1252,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg
+@@ -1285,8 +1285,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg
lock.unlock();
}
}
@@ -30088,7 +30409,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1261,8 +1261,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg
+@@ -1294,8 +1294,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg
lock.unlock();
}
}
@@ -30099,7 +30420,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1270,8 +1270,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
+@@ -1303,8 +1303,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
lock.unlock();
}
}
@@ -30110,7 +30431,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1279,8 +1279,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
+@@ -1312,8 +1312,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
lock.unlock();
}
}
@@ -30121,7 +30442,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1288,8 +1288,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[]
+@@ -1321,8 +1321,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[]
lock.unlock();
}
}
@@ -30132,7 +30453,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1297,8 +1297,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[]
+@@ -1330,8 +1330,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[]
lock.unlock();
}
}
@@ -30143,7 +30464,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1306,8 +1306,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[]
+@@ -1339,8 +1339,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[]
lock.unlock();
}
}
@@ -30154,7 +30475,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1315,8 +1315,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID a
+@@ -1348,8 +1348,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID a
lock.unlock();
}
}
@@ -30165,7 +30486,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1324,8 +1324,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID a
+@@ -1357,8 +1357,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID a
lock.unlock();
}
}
@@ -30176,7 +30497,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1333,8 +1333,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
+@@ -1366,8 +1366,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
lock.unlock();
}
}
@@ -30187,7 +30508,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1342,8 +1342,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
+@@ -1375,8 +1375,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
lock.unlock();
}
}
@@ -30198,7 +30519,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1351,8 +1351,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -1384,8 +1384,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30209,7 +30530,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1360,8 +1360,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -1393,8 +1393,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30220,7 +30541,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1370,8 +1370,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
+@@ -1403,8 +1403,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
}
}
@@ -30231,7 +30552,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1379,8 +1379,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -1412,8 +1412,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30242,7 +30563,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1388,8 +1388,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -1421,8 +1421,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30253,7 +30574,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1397,8 +1397,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
+@@ -1430,8 +1430,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
lock.unlock();
}
}
@@ -30264,7 +30585,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1406,8 +1406,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
+@@ -1439,8 +1439,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
lock.unlock();
}
}
@@ -30275,7 +30596,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1415,8 +1415,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
+@@ -1448,8 +1448,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
lock.unlock();
}
}
@@ -30286,7 +30607,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1424,8 +1424,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
+@@ -1457,8 +1457,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
lock.unlock();
}
}
@@ -30297,7 +30618,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1433,8 +1433,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
+@@ -1466,8 +1466,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
lock.unlock();
}
}
@@ -30308,7 +30629,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1442,8 +1442,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
+@@ -1475,8 +1475,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
lock.unlock();
}
}
@@ -30319,7 +30640,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1451,8 +1451,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
+@@ -1484,8 +1484,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
lock.unlock();
}
}
@@ -30330,7 +30651,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1460,8 +1460,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0, float a
+@@ -1493,8 +1493,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0, float a
lock.unlock();
}
}
@@ -30341,7 +30662,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
-@@ -1470,8 +1470,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0, float a
+@@ -1503,8 +1503,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0, float a
}
}
@@ -30352,7 +30673,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1479,8 +1479,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, int arg
+@@ -1512,8 +1512,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, int arg
lock.unlock();
}
}
@@ -30363,7 +30684,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1488,8 +1488,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, long ar
+@@ -1521,8 +1521,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, long ar
lock.unlock();
}
}
@@ -30374,7 +30695,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1497,8 +1497,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
+@@ -1530,8 +1530,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
lock.unlock();
}
}
@@ -30385,7 +30706,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1506,8 +1506,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long a
+@@ -1539,8 +1539,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long a
lock.unlock();
}
}
@@ -30396,7 +30717,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1515,8 +1515,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
+@@ -1548,8 +1548,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
lock.unlock();
}
}
@@ -30407,7 +30728,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1524,8 +1524,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
+@@ -1557,8 +1557,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
lock.unlock();
}
}
@@ -30418,7 +30739,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1533,8 +1533,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
+@@ -1566,8 +1566,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
@@ -30429,7 +30750,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1542,8 +1542,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
+@@ -1575,8 +1575,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
@@ -30440,7 +30761,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1551,8 +1551,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
+@@ -1584,8 +1584,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
@@ -30451,7 +30772,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1560,8 +1560,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -1593,8 +1593,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30462,7 +30783,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1569,8 +1569,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -1602,8 +1602,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30473,7 +30794,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1578,8 +1578,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -1611,8 +1611,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30484,7 +30805,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1587,8 +1587,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -1620,8 +1620,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30495,7 +30816,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1596,8 +1596,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -1629,8 +1629,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30506,7 +30827,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1605,8 +1605,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -1638,8 +1638,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30517,7 +30838,18 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1614,8 +1614,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -1647,8 +1647,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1656,8 +1656,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30528,7 +30860,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1623,8 +1623,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -1665,8 +1665,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30539,7 +30871,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1632,8 +1632,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -1674,8 +1674,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30550,7 +30882,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1641,8 +1641,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] a
+@@ -1683,8 +1683,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] a
lock.unlock();
}
}
@@ -30561,7 +30893,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1650,8 +1650,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
+@@ -1692,8 +1692,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
lock.unlock();
}
}
@@ -30572,7 +30904,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1659,8 +1659,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
+@@ -1701,8 +1701,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
lock.unlock();
}
}
@@ -30583,7 +30915,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1668,8 +1668,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] a
+@@ -1710,8 +1710,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] a
lock.unlock();
}
}
@@ -30594,7 +30926,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1677,8 +1677,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] a
+@@ -1719,8 +1719,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] a
lock.unlock();
}
}
@@ -30605,7 +30937,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1686,8 +1686,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1
+@@ -1728,8 +1728,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1
lock.unlock();
}
}
@@ -30616,7 +30948,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1695,8 +1695,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg
+@@ -1737,8 +1737,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg
lock.unlock();
}
}
@@ -30627,7 +30959,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1704,8 +1704,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
+@@ -1746,8 +1746,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
lock.unlock();
}
}
@@ -30638,7 +30970,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1713,8 +1713,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
+@@ -1755,8 +1755,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
lock.unlock();
}
}
@@ -30649,7 +30981,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1722,8 +1722,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -1764,8 +1764,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30660,7 +30992,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1731,8 +1731,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -1773,8 +1773,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30671,7 +31003,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1740,8 +1740,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -1782,8 +1782,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30682,7 +31014,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1749,8 +1749,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -1791,8 +1791,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30693,7 +31025,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1758,8 +1758,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, int a
+@@ -1800,8 +1800,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, int a
lock.unlock();
}
}
@@ -30704,7 +31036,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1767,8 +1767,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, long
+@@ -1809,8 +1809,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, long
lock.unlock();
}
}
@@ -30715,7 +31047,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1776,8 +1776,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
+@@ -1818,8 +1818,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
@@ -30726,7 +31058,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1785,8 +1785,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -1827,8 +1827,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30737,7 +31069,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1794,8 +1794,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
+@@ -1836,8 +1836,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
@@ -30748,7 +31080,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
-@@ -1804,8 +1804,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -1846,8 +1846,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
}
}
@@ -30759,7 +31091,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1813,8 +1813,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int ar
+@@ -1855,8 +1855,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int ar
lock.unlock();
}
}
@@ -30770,7 +31102,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1822,8 +1822,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int ar
+@@ -1864,8 +1864,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int ar
lock.unlock();
}
}
@@ -30781,7 +31113,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1831,8 +1831,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -1873,8 +1873,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30792,7 +31124,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1840,8 +1840,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -1882,8 +1882,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30803,7 +31135,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1849,8 +1849,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
+@@ -1891,8 +1891,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
@@ -30814,7 +31146,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1858,8 +1858,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
+@@ -1900,8 +1900,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
@@ -30825,7 +31157,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1867,8 +1867,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -1909,8 +1909,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30836,7 +31168,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1876,8 +1876,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -1918,8 +1918,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -30847,7 +31179,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1885,8 +1885,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
+@@ -1927,8 +1927,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
lock.unlock();
}
}
@@ -30858,7 +31190,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1894,8 +1894,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
+@@ -1936,8 +1936,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
@@ -30869,7 +31201,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1903,8 +1903,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
+@@ -1945,8 +1945,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
@@ -30880,7 +31212,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1912,8 +1912,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
+@@ -1954,8 +1954,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
lock.unlock();
}
}
@@ -30891,7 +31223,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1921,8 +1921,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
+@@ -1963,8 +1963,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
lock.unlock();
}
}
@@ -30902,7 +31234,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1931,8 +1931,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -1973,8 +1973,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
}
}
@@ -30913,7 +31245,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1940,8 +1940,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -1982,8 +1982,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -30924,7 +31256,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1949,8 +1949,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1
+@@ -1991,8 +1991,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1
lock.unlock();
}
}
@@ -30935,7 +31267,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1958,8 +1958,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg
+@@ -2000,8 +2000,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg
lock.unlock();
}
}
@@ -30946,7 +31278,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1967,8 +1967,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
+@@ -2009,8 +2009,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
@@ -30957,7 +31289,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
-@@ -1977,8 +1977,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -2019,8 +2019,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
}
}
@@ -30968,7 +31300,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1986,8 +1986,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
+@@ -2028,8 +2028,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
lock.unlock();
}
}
@@ -30979,7 +31311,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -1995,8 +1995,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
+@@ -2037,8 +2037,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
lock.unlock();
}
}
@@ -30990,7 +31322,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2004,8 +2004,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -2046,8 +2046,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31001,7 +31333,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2013,8 +2013,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -2055,8 +2055,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -31012,7 +31344,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2022,8 +2022,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -2064,8 +2064,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31023,7 +31355,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2031,8 +2031,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -2073,8 +2073,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -31034,7 +31366,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2041,8 +2041,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] a
+@@ -2083,8 +2083,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] a
}
}
@@ -31045,7 +31377,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2050,8 +2050,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0, long[]
+@@ -2092,8 +2092,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0, long[]
lock.unlock();
}
}
@@ -31056,7 +31388,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2059,8 +2059,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -2101,8 +2101,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31067,7 +31399,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2068,8 +2068,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -2110,8 +2110,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -31078,7 +31410,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2078,8 +2078,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -2120,8 +2120,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
}
}
@@ -31089,7 +31421,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2087,8 +2087,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -2129,8 +2129,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -31100,7 +31432,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2096,8 +2096,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] a
+@@ -2138,8 +2138,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] a
lock.unlock();
}
}
@@ -31111,7 +31443,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2105,8 +2105,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] a
+@@ -2147,8 +2147,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] a
lock.unlock();
}
}
@@ -31122,7 +31454,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2114,8 +2114,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -2156,8 +2156,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31133,7 +31465,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2123,8 +2123,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -2165,8 +2165,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -31144,7 +31476,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2132,8 +2132,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
+@@ -2174,8 +2174,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
@@ -31155,7 +31487,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2141,8 +2141,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
+@@ -2183,8 +2183,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
@@ -31166,7 +31498,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2150,8 +2150,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
+@@ -2192,8 +2192,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
lock.unlock();
}
}
@@ -31177,7 +31509,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2159,8 +2159,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
+@@ -2201,8 +2201,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
lock.unlock();
}
}
@@ -31188,7 +31520,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2168,8 +2168,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -2210,8 +2210,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31199,7 +31531,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2177,8 +2177,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
+@@ -2219,8 +2219,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
@@ -31210,7 +31542,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2186,8 +2186,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -2228,8 +2228,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31221,7 +31553,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2195,8 +2195,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -2237,8 +2237,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -31232,7 +31564,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2204,8 +2204,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -2246,8 +2246,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31243,7 +31575,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2213,8 +2213,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -2255,8 +2255,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -31254,7 +31586,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2222,8 +2222,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -2264,8 +2264,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31265,7 +31597,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -2232,8 +2232,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
+@@ -2274,8 +2274,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
}
}
@@ -31276,7 +31608,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2241,8 +2241,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
+@@ -2283,8 +2283,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
@@ -31287,7 +31619,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2250,8 +2250,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
+@@ -2292,8 +2292,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
@@ -31298,7 +31630,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2259,8 +2259,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
+@@ -2301,8 +2301,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
@@ -31309,7 +31641,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2268,8 +2268,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
+@@ -2310,8 +2310,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
@@ -31320,7 +31652,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2277,8 +2277,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -2319,8 +2319,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31331,7 +31663,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2286,8 +2286,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -2328,8 +2328,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -31342,7 +31674,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2295,8 +2295,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -2337,8 +2337,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31353,7 +31685,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2304,8 +2304,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -2346,8 +2346,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -31364,7 +31696,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2313,8 +2313,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -2355,8 +2355,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31375,7 +31707,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -2323,8 +2323,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
+@@ -2365,8 +2365,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
}
}
@@ -31386,7 +31718,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-@@ -2332,8 +2332,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
+@@ -2374,8 +2374,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
@@ -31397,7 +31729,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-@@ -2341,8 +2341,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
+@@ -2383,8 +2383,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
@@ -31408,7 +31740,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-@@ -2350,8 +2350,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -2392,8 +2392,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31419,7 +31751,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-@@ -2359,8 +2359,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1
+@@ -2401,8 +2401,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1
lock.unlock();
}
}
@@ -31430,7 +31762,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-@@ -2369,8 +2369,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
+@@ -2411,8 +2411,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
}
}
@@ -31441,7 +31773,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-@@ -2378,8 +2378,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -2420,8 +2420,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31452,7 +31784,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-@@ -2387,8 +2387,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -2429,8 +2429,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -31463,7 +31795,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-@@ -2396,8 +2396,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -2438,8 +2438,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31474,7 +31806,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-@@ -2405,8 +2405,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
+@@ -2447,8 +2447,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
@@ -31485,7 +31817,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-@@ -2414,8 +2414,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
+@@ -2456,8 +2456,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
@@ -31496,7 +31828,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-@@ -2423,8 +2423,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
+@@ -2465,8 +2465,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
@@ -31507,7 +31839,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
-@@ -2432,8 +2432,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -2474,8 +2474,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31518,7 +31850,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
-@@ -2441,8 +2441,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -2483,8 +2483,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -31529,7 +31861,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
-@@ -2450,8 +2450,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -2492,8 +2492,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31540,7 +31872,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
-@@ -2459,8 +2459,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
+@@ -2501,8 +2501,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
@@ -31551,7 +31883,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14);
-@@ -2468,8 +2468,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -2510,8 +2510,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
@@ -31562,7 +31894,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14);
-@@ -2478,8 +2478,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
+@@ -2520,8 +2520,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
}
}
@@ -31573,7 +31905,7 @@ index 1b772ad..ccf7ff2 100644
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
-@@ -2488,8 +2488,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
+@@ -2530,8 +2530,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
}
}
@@ -33783,469 +34115,469 @@ index 9e2a28b..71987ad 100644
boolean result = XPCOM.nsID_Equals (ptr, otherPtr) != 0;
XPCOM.nsID_delete (ptr);
diff --git a/org/eclipse/swt/internal/mozilla/nsIDOMDocument.java b/org/eclipse/swt/internal/mozilla/nsIDOMDocument.java
-index e2dbda4..4d25db5 100644
+index 6bda020..216b387 100644
--- a/org/eclipse/swt/internal/mozilla/nsIDOMDocument.java
+++ b/org/eclipse/swt/internal/mozilla/nsIDOMDocument.java
@@ -43,166 +43,166 @@ public class nsIDOMDocument extends nsIDOMNode {
- public static final nsID NS_IDOMDOCUMENT_10_IID =
- new nsID(NS_IDOMDOCUMENT_10_IID_STR);
-
-- public nsIDOMDocument(int /*long*/ address) {
-+ public nsIDOMDocument(long /*int*/ address) {
- super(address);
- }
-
-- public int GetDoctype(int /*long*/[] aDoctype) {
-+ public int GetDoctype(long /*int*/[] aDoctype) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 1, getAddress(), aDoctype);
- }
-
-- public int GetImplementation(int /*long*/[] aImplementation) {
-+ public int GetImplementation(long /*int*/[] aImplementation) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 2, getAddress(), aImplementation);
- }
-
-- public int GetDocumentElement(int /*long*/[] aDocumentElement) {
-+ public int GetDocumentElement(long /*int*/[] aDocumentElement) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 3, getAddress(), aDocumentElement);
- }
-
-- public int CreateElement(int /*long*/ tagName, int /*long*/[] _retval) {
-+ public int CreateElement(long /*int*/ tagName, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 4, getAddress(), tagName, _retval);
- }
-
-- public int CreateDocumentFragment(int /*long*/[] _retval) {
-+ public int CreateDocumentFragment(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 5, getAddress(), _retval);
- }
-
-- public int CreateTextNode(int /*long*/ data, int /*long*/[] _retval) {
-+ public int CreateTextNode(long /*int*/ data, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 6, getAddress(), data, _retval);
- }
-
-- public int CreateComment(int /*long*/ data, int /*long*/[] _retval) {
-+ public int CreateComment(long /*int*/ data, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 7, getAddress(), data, _retval);
- }
-
-- public int CreateCDATASection(int /*long*/ data, int /*long*/[] _retval) {
-+ public int CreateCDATASection(long /*int*/ data, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 8, getAddress(), data, _retval);
- }
-
-- public int CreateProcessingInstruction(int /*long*/ target, int /*long*/ data, int /*long*/[] _retval) {
-+ public int CreateProcessingInstruction(long /*int*/ target, long /*int*/ data, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 9, getAddress(), target, data, _retval);
- }
-
-- public int CreateAttribute(int /*long*/ name, int /*long*/[] _retval) {
-+ public int CreateAttribute(long /*int*/ name, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 10, getAddress(), name, _retval);
- }
-
-- public int CreateEntityReference(int /*long*/ name, int /*long*/[] _retval) {
-+ public int CreateEntityReference(long /*int*/ name, long /*int*/[] _retval) {
- if (IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 11, getAddress(), name, _retval);
- }
-
-- public int GetElementsByTagName(int /*long*/ tagname, int /*long*/[] _retval) {
-+ public int GetElementsByTagName(long /*int*/ tagname, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 11 : 12), getAddress(), tagname, _retval);
- }
-
-- public int ImportNode(int /*long*/ importedNode, int deep, int /*long*/[] _retval) {
-+ public int ImportNode(long /*int*/ importedNode, int deep, long /*int*/[] _retval) {
- if (IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 13, getAddress(), importedNode, deep, _retval);
- }
-
-- public int ImportNode(int /*long*/ importedNode, int deep, int _argc, int /*long*/[] _retval) {
-+ public int ImportNode(long /*int*/ importedNode, int deep, int _argc, long /*int*/[] _retval) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 12, getAddress(), importedNode, deep, _argc, _retval);
- }
-
-- public int CreateElementNS(int /*long*/ namespaceURI, int /*long*/ qualifiedName, int /*long*/[] _retval) {
-+ public int CreateElementNS(long /*int*/ namespaceURI, long /*int*/ qualifiedName, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 13 : 14), getAddress(), namespaceURI, qualifiedName, _retval);
- }
-
-- public int CreateAttributeNS(int /*long*/ namespaceURI, int /*long*/ qualifiedName, int /*long*/[] _retval) {
-+ public int CreateAttributeNS(long /*int*/ namespaceURI, long /*int*/ qualifiedName, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 14 : 15), getAddress(), namespaceURI, qualifiedName, _retval);
- }
-
-- public int GetElementsByTagNameNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/[] _retval) {
-+ public int GetElementsByTagNameNS(long /*int*/ namespaceURI, long /*int*/ localName, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 15 : 16), getAddress(), namespaceURI, localName, _retval);
- }
-
-- public int GetElementById(int /*long*/ elementId, int /*long*/[] _retval) {
-+ public int GetElementById(long /*int*/ elementId, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 16 : 17), getAddress(), elementId, _retval);
- }
-
-- public int GetInputEncoding(int /*long*/ aInputEncoding) {
-+ public int GetInputEncoding(long /*int*/ aInputEncoding) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 17, getAddress(), aInputEncoding);
- }
-
-- public int GetDocumentURI(int /*long*/ aDocumentURI) {
-+ public int GetDocumentURI(long /*int*/ aDocumentURI) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 18, getAddress(), aDocumentURI);
- }
-
-- public int AdoptNode(int /*long*/ source, int /*long*/[] _retval) {
-+ public int AdoptNode(long /*int*/ source, long /*int*/[] _retval) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 19, getAddress(), source, _retval);
- }
-
-- public int CreateRange(int /*long*/[] _retval) {
-+ public int CreateRange(long /*int*/[] _retval) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 20, getAddress(), _retval);
- }
-
-- public int CreateNodeIterator(int /*long*/ root, int whatToShow, int /*long*/ filter, int entityReferenceExpansion, int /*long*/[] _retval) {
-+ public int CreateNodeIterator(long /*int*/ root, int whatToShow, long /*int*/ filter, int entityReferenceExpansion, long /*int*/[] _retval) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 21, getAddress(), root, whatToShow, filter, entityReferenceExpansion, _retval);
- }
-
-- public int CreateTreeWalker(int /*long*/ root, int whatToShow, int /*long*/ filter, int entityReferenceExpansion, int /*long*/[] _retval) {
-+ public int CreateTreeWalker(long /*int*/ root, int whatToShow, long /*int*/ filter, int entityReferenceExpansion, long /*int*/[] _retval) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 22, getAddress(), root, whatToShow, filter, entityReferenceExpansion, _retval);
- }
-
-- public int CreateEvent(int /*long*/ eventType, int /*long*/[] _retval) {
-+ public int CreateEvent(long /*int*/ eventType, long /*int*/[] _retval) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 23, getAddress(), eventType, _retval);
- }
-
-- public int GetDefaultView(int /*long*/[] aDefaultView) {
-+ public int GetDefaultView(long /*int*/[] aDefaultView) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 24, getAddress(), aDefaultView);
- }
-
-- public int GetCharacterSet(int /*long*/ aCharacterSet) {
-+ public int GetCharacterSet(long /*int*/ aCharacterSet) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 25, getAddress(), aCharacterSet);
- }
-
-- public int GetDir(int /*long*/ aDir) {
-+ public int GetDir(long /*int*/ aDir) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 26, getAddress(), aDir);
- }
-
-- public int SetDir(int /*long*/ aDir) {
-+ public int SetDir(long /*int*/ aDir) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 27, getAddress(), aDir);
- }
-
-- public int GetLocation(int /*long*/[] aLocation) {
-+ public int GetLocation(long /*int*/[] aLocation) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 28, getAddress(), aLocation);
- }
-
-- public int GetTitle(int /*long*/ aTitle) {
-+ public int GetTitle(long /*int*/ aTitle) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 29, getAddress(), aTitle);
- }
-
-- public int SetTitle(int /*long*/ aTitle) {
-+ public int SetTitle(long /*int*/ aTitle) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 30, getAddress(), aTitle);
- }
-
-- public int GetReadyState(int /*long*/ aReadyState) {
-+ public int GetReadyState(long /*int*/ aReadyState) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 31, getAddress(), aReadyState);
- }
-
-- public int GetLastModified(int /*long*/ aLastModified) {
-+ public int GetLastModified(long /*int*/ aLastModified) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 32, getAddress(), aLastModified);
- }
-
-- public int GetReferrer(int /*long*/ aReferrer) {
-+ public int GetReferrer(long /*int*/ aReferrer) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 33, getAddress(), aReferrer);
- }
+ public static final nsID NS_IDOMDOCUMENT_10_IID =
+ new nsID(NS_IDOMDOCUMENT_10_IID_STR);
+
+- public nsIDOMDocument(int /*long*/ address) {
++ public nsIDOMDocument(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetDoctype(int /*long*/[] aDoctype) {
++ public int GetDoctype(long /*int*/[] aDoctype) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 1, getAddress(), aDoctype);
+ }
+
+- public int GetImplementation(int /*long*/[] aImplementation) {
++ public int GetImplementation(long /*int*/[] aImplementation) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 2, getAddress(), aImplementation);
+ }
+
+- public int GetDocumentElement(int /*long*/[] aDocumentElement) {
++ public int GetDocumentElement(long /*int*/[] aDocumentElement) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 3, getAddress(), aDocumentElement);
+ }
+
+- public int CreateElement(int /*long*/ tagName, int /*long*/[] _retval) {
++ public int CreateElement(long /*int*/ tagName, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 4, getAddress(), tagName, _retval);
+ }
+
+- public int CreateDocumentFragment(int /*long*/[] _retval) {
++ public int CreateDocumentFragment(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 5, getAddress(), _retval);
+ }
+
+- public int CreateTextNode(int /*long*/ data, int /*long*/[] _retval) {
++ public int CreateTextNode(long /*int*/ data, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 6, getAddress(), data, _retval);
+ }
+
+- public int CreateComment(int /*long*/ data, int /*long*/[] _retval) {
++ public int CreateComment(long /*int*/ data, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 7, getAddress(), data, _retval);
+ }
+
+- public int CreateCDATASection(int /*long*/ data, int /*long*/[] _retval) {
++ public int CreateCDATASection(long /*int*/ data, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 8, getAddress(), data, _retval);
+ }
+
+- public int CreateProcessingInstruction(int /*long*/ target, int /*long*/ data, int /*long*/[] _retval) {
++ public int CreateProcessingInstruction(long /*int*/ target, long /*int*/ data, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 9, getAddress(), target, data, _retval);
+ }
+
+- public int CreateAttribute(int /*long*/ name, int /*long*/[] _retval) {
++ public int CreateAttribute(long /*int*/ name, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 10, getAddress(), name, _retval);
+ }
+
+- public int CreateEntityReference(int /*long*/ name, int /*long*/[] _retval) {
++ public int CreateEntityReference(long /*int*/ name, long /*int*/[] _retval) {
+ if (IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 11, getAddress(), name, _retval);
+ }
+
+- public int GetElementsByTagName(int /*long*/ tagname, int /*long*/[] _retval) {
++ public int GetElementsByTagName(long /*int*/ tagname, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 11 : 12), getAddress(), tagname, _retval);
+ }
+
+- public int ImportNode(int /*long*/ importedNode, int deep, int /*long*/[] _retval) {
++ public int ImportNode(long /*int*/ importedNode, int deep, long /*int*/[] _retval) {
+ if (IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 13, getAddress(), importedNode, deep, _retval);
+ }
+
+- public int ImportNode(int /*long*/ importedNode, int deep, int _argc, int /*long*/[] _retval) {
++ public int ImportNode(long /*int*/ importedNode, int deep, int _argc, long /*int*/[] _retval) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 12, getAddress(), importedNode, deep, _argc, _retval);
+ }
+
+- public int CreateElementNS(int /*long*/ namespaceURI, int /*long*/ qualifiedName, int /*long*/[] _retval) {
++ public int CreateElementNS(long /*int*/ namespaceURI, long /*int*/ qualifiedName, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 13 : 14), getAddress(), namespaceURI, qualifiedName, _retval);
+ }
+
+- public int CreateAttributeNS(int /*long*/ namespaceURI, int /*long*/ qualifiedName, int /*long*/[] _retval) {
++ public int CreateAttributeNS(long /*int*/ namespaceURI, long /*int*/ qualifiedName, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 14 : 15), getAddress(), namespaceURI, qualifiedName, _retval);
+ }
+
+- public int GetElementsByTagNameNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/[] _retval) {
++ public int GetElementsByTagNameNS(long /*int*/ namespaceURI, long /*int*/ localName, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 15 : 16), getAddress(), namespaceURI, localName, _retval);
+ }
+
+- public int GetElementById(int /*long*/ elementId, int /*long*/[] _retval) {
++ public int GetElementById(long /*int*/ elementId, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 16 : 17), getAddress(), elementId, _retval);
+ }
+
+- public int GetInputEncoding(int /*long*/ aInputEncoding) {
++ public int GetInputEncoding(long /*int*/ aInputEncoding) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 17, getAddress(), aInputEncoding);
+ }
+
+- public int GetDocumentURI(int /*long*/ aDocumentURI) {
++ public int GetDocumentURI(long /*int*/ aDocumentURI) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 18, getAddress(), aDocumentURI);
+ }
+
+- public int AdoptNode(int /*long*/ source, int /*long*/[] _retval) {
++ public int AdoptNode(long /*int*/ source, long /*int*/[] _retval) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 19, getAddress(), source, _retval);
+ }
+
+- public int CreateRange(int /*long*/[] _retval) {
++ public int CreateRange(long /*int*/[] _retval) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 20, getAddress(), _retval);
+ }
+
+- public int CreateNodeIterator(int /*long*/ root, int whatToShow, int /*long*/ filter, int entityReferenceExpansion, int /*long*/[] _retval) {
++ public int CreateNodeIterator(long /*int*/ root, int whatToShow, long /*int*/ filter, int entityReferenceExpansion, long /*int*/[] _retval) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 21, getAddress(), root, whatToShow, filter, entityReferenceExpansion, _retval);
+ }
+
+- public int CreateTreeWalker(int /*long*/ root, int whatToShow, int /*long*/ filter, int entityReferenceExpansion, int /*long*/[] _retval) {
++ public int CreateTreeWalker(long /*int*/ root, int whatToShow, long /*int*/ filter, int entityReferenceExpansion, long /*int*/[] _retval) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 22, getAddress(), root, whatToShow, filter, entityReferenceExpansion, _retval);
+ }
+
+- public int CreateEvent(int /*long*/ eventType, int /*long*/[] _retval) {
++ public int CreateEvent(long /*int*/ eventType, long /*int*/[] _retval) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 23, getAddress(), eventType, _retval);
+ }
+
+- public int GetDefaultView(int /*long*/[] aDefaultView) {
++ public int GetDefaultView(long /*int*/[] aDefaultView) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 24, getAddress(), aDefaultView);
+ }
+
+- public int GetCharacterSet(int /*long*/ aCharacterSet) {
++ public int GetCharacterSet(long /*int*/ aCharacterSet) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 25, getAddress(), aCharacterSet);
+ }
+
+- public int GetDir(int /*long*/ aDir) {
++ public int GetDir(long /*int*/ aDir) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 26, getAddress(), aDir);
+ }
+
+- public int SetDir(int /*long*/ aDir) {
++ public int SetDir(long /*int*/ aDir) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 27, getAddress(), aDir);
+ }
+
+- public int GetLocation(int /*long*/[] aLocation) {
++ public int GetLocation(long /*int*/[] aLocation) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 28, getAddress(), aLocation);
+ }
+
+- public int GetTitle(int /*long*/ aTitle) {
++ public int GetTitle(long /*int*/ aTitle) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 29, getAddress(), aTitle);
+ }
+
+- public int SetTitle(int /*long*/ aTitle) {
++ public int SetTitle(long /*int*/ aTitle) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 30, getAddress(), aTitle);
+ }
+
+- public int GetReadyState(int /*long*/ aReadyState) {
++ public int GetReadyState(long /*int*/ aReadyState) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 31, getAddress(), aReadyState);
+ }
+
+- public int GetLastModified(int /*long*/ aLastModified) {
++ public int GetLastModified(long /*int*/ aLastModified) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 32, getAddress(), aLastModified);
+ }
+
+- public int GetReferrer(int /*long*/ aReferrer) {
++ public int GetReferrer(long /*int*/ aReferrer) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 33, getAddress(), aReferrer);
+ }
@@ -212,57 +212,57 @@ public class nsIDOMDocument extends nsIDOMNode {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 34, getAddress(), _retval);
- }
-
-- public int GetActiveElement(int /*long*/[] aActiveElement) {
-+ public int GetActiveElement(long /*int*/[] aActiveElement) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 35, getAddress(), aActiveElement);
- }
-
-- public int GetElementsByClassName(int /*long*/ classes, int /*long*/[] _retval) {
-+ public int GetElementsByClassName(long /*int*/ classes, long /*int*/[] _retval) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 36, getAddress(), classes, _retval);
- }
-
-- public int GetStyleSheets(int /*long*/[] aStyleSheets) {
-+ public int GetStyleSheets(long /*int*/[] aStyleSheets) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 37, getAddress(), aStyleSheets);
- }
-
-- public int GetPreferredStyleSheetSet(int /*long*/ aPreferredStyleSheetSet) {
-+ public int GetPreferredStyleSheetSet(long /*int*/ aPreferredStyleSheetSet) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 38, getAddress(), aPreferredStyleSheetSet);
- }
-
-- public int GetSelectedStyleSheetSet(int /*long*/ aSelectedStyleSheetSet) {
-+ public int GetSelectedStyleSheetSet(long /*int*/ aSelectedStyleSheetSet) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 39, getAddress(), aSelectedStyleSheetSet);
- }
-
-- public int SetSelectedStyleSheetSet(int /*long*/ aSelectedStyleSheetSet) {
-+ public int SetSelectedStyleSheetSet(long /*int*/ aSelectedStyleSheetSet) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 40, getAddress(), aSelectedStyleSheetSet);
- }
-
-- public int GetLastStyleSheetSet(int /*long*/ aLastStyleSheetSet) {
-+ public int GetLastStyleSheetSet(long /*int*/ aLastStyleSheetSet) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 41, getAddress(), aLastStyleSheetSet);
- }
-
-- public int GetStyleSheetSets(int /*long*/[] aStyleSheetSets) {
-+ public int GetStyleSheetSets(long /*int*/[] aStyleSheetSets) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 42, getAddress(), aStyleSheetSets);
- }
-
-- public int EnableStyleSheetsForSet(int /*long*/ name) {
-+ public int EnableStyleSheetsForSet(long /*int*/ name) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 43, getAddress(), name);
- }
-
-- public int ElementFromPoint(float x, float y, int /*long*/[] _retval) {
-+ public int ElementFromPoint(float x, float y, long /*int*/[] _retval) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 44, getAddress(), x, y, _retval);
- }
-
-- public int GetContentType(int /*long*/ aContentType) {
-+ public int GetContentType(long /*int*/ aContentType) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 45, getAddress(), aContentType);
- }
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 34, getAddress(), _retval);
+ }
+
+- public int GetActiveElement(int /*long*/[] aActiveElement) {
++ public int GetActiveElement(long /*int*/[] aActiveElement) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 35, getAddress(), aActiveElement);
+ }
+
+- public int GetElementsByClassName(int /*long*/ classes, int /*long*/[] _retval) {
++ public int GetElementsByClassName(long /*int*/ classes, long /*int*/[] _retval) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 36, getAddress(), classes, _retval);
+ }
+
+- public int GetStyleSheets(int /*long*/[] aStyleSheets) {
++ public int GetStyleSheets(long /*int*/[] aStyleSheets) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 37, getAddress(), aStyleSheets);
+ }
+
+- public int GetPreferredStyleSheetSet(int /*long*/ aPreferredStyleSheetSet) {
++ public int GetPreferredStyleSheetSet(long /*int*/ aPreferredStyleSheetSet) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 38, getAddress(), aPreferredStyleSheetSet);
+ }
+
+- public int GetSelectedStyleSheetSet(int /*long*/ aSelectedStyleSheetSet) {
++ public int GetSelectedStyleSheetSet(long /*int*/ aSelectedStyleSheetSet) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 39, getAddress(), aSelectedStyleSheetSet);
+ }
+
+- public int SetSelectedStyleSheetSet(int /*long*/ aSelectedStyleSheetSet) {
++ public int SetSelectedStyleSheetSet(long /*int*/ aSelectedStyleSheetSet) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 40, getAddress(), aSelectedStyleSheetSet);
+ }
+
+- public int GetLastStyleSheetSet(int /*long*/ aLastStyleSheetSet) {
++ public int GetLastStyleSheetSet(long /*int*/ aLastStyleSheetSet) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 41, getAddress(), aLastStyleSheetSet);
+ }
+
+- public int GetStyleSheetSets(int /*long*/[] aStyleSheetSets) {
++ public int GetStyleSheetSets(long /*int*/[] aStyleSheetSets) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 42, getAddress(), aStyleSheetSets);
+ }
+
+- public int EnableStyleSheetsForSet(int /*long*/ name) {
++ public int EnableStyleSheetsForSet(long /*int*/ name) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 43, getAddress(), name);
+ }
+
+- public int ElementFromPoint(float x, float y, int /*long*/[] _retval) {
++ public int ElementFromPoint(float x, float y, long /*int*/[] _retval) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 44, getAddress(), x, y, _retval);
+ }
+
+- public int GetContentType(int /*long*/ aContentType) {
++ public int GetContentType(long /*int*/ aContentType) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 45, getAddress(), aContentType);
+ }
@@ -272,7 +272,7 @@ public class nsIDOMDocument extends nsIDOMNode {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 46, getAddress(), aMozSyntheticDocument);
- }
-
-- public int GetCurrentScript(int /*long*/[] aCurrentScript) {
-+ public int GetCurrentScript(long /*int*/[] aCurrentScript) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 47, getAddress(), aCurrentScript);
- }
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 46, getAddress(), aMozSyntheticDocument);
+ }
+
+- public int GetCurrentScript(int /*long*/[] aCurrentScript) {
++ public int GetCurrentScript(long /*int*/[] aCurrentScript) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 47, getAddress(), aCurrentScript);
+ }
@@ -282,12 +282,12 @@ public class nsIDOMDocument extends nsIDOMNode {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 48, getAddress());
- }
-
-- public int MozSetImageElement(int /*long*/ aImageElementId, int /*long*/ aImageElement) {
-+ public int MozSetImageElement(long /*int*/ aImageElementId, long /*int*/ aImageElement) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 49, getAddress(), aImageElementId, aImageElement);
- }
-
-- public int GetMozFullScreenElement(int /*long*/[] aMozFullScreenElement) {
-+ public int GetMozFullScreenElement(long /*int*/[] aMozFullScreenElement) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 50, getAddress(), aMozFullScreenElement);
- }
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 48, getAddress());
+ }
+
+- public int MozSetImageElement(int /*long*/ aImageElementId, int /*long*/ aImageElement) {
++ public int MozSetImageElement(long /*int*/ aImageElementId, long /*int*/ aImageElement) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 49, getAddress(), aImageElementId, aImageElement);
+ }
+
+- public int GetMozFullScreenElement(int /*long*/[] aMozFullScreenElement) {
++ public int GetMozFullScreenElement(long /*int*/[] aMozFullScreenElement) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 50, getAddress(), aMozFullScreenElement);
+ }
@@ -307,32 +307,32 @@ public class nsIDOMDocument extends nsIDOMNode {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 53, getAddress(), aMozFullScreenEnabled);
- }
-
-- public int GetOnreadystatechange(int /*long*/ cx, int /*long*/ aOnreadystatechange) {
-+ public int GetOnreadystatechange(long /*int*/ cx, long /*int*/ aOnreadystatechange) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 54, getAddress(), cx, aOnreadystatechange);
- }
-
-- public int SetOnreadystatechange(int /*long*/ cx, int /*long*/ aOnreadystatechange) {
-+ public int SetOnreadystatechange(long /*int*/ cx, long /*int*/ aOnreadystatechange) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 55, getAddress(), cx, aOnreadystatechange);
- }
-
-- public int GetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
-+ public int GetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 56, getAddress(), cx, aOnmouseenter);
- }
-
-- public int SetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
-+ public int SetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 57, getAddress(), cx, aOnmouseenter);
- }
-
-- public int GetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
-+ public int GetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 58, getAddress(), cx, aOnmouseleave);
- }
-
-- public int SetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
-+ public int SetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 59, getAddress(), cx, aOnmouseleave);
- }
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 53, getAddress(), aMozFullScreenEnabled);
+ }
+
+- public int GetOnreadystatechange(int /*long*/ cx, int /*long*/ aOnreadystatechange) {
++ public int GetOnreadystatechange(long /*int*/ cx, long /*int*/ aOnreadystatechange) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 54, getAddress(), cx, aOnreadystatechange);
+ }
+
+- public int SetOnreadystatechange(int /*long*/ cx, int /*long*/ aOnreadystatechange) {
++ public int SetOnreadystatechange(long /*int*/ cx, long /*int*/ aOnreadystatechange) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 55, getAddress(), cx, aOnreadystatechange);
+ }
+
+- public int GetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
++ public int GetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 56, getAddress(), cx, aOnmouseenter);
+ }
+
+- public int SetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
++ public int SetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 57, getAddress(), cx, aOnmouseenter);
+ }
+
+- public int GetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
++ public int GetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 58, getAddress(), cx, aOnmouseleave);
+ }
+
+- public int SetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
++ public int SetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 59, getAddress(), cx, aOnmouseleave);
+ }
@@ -342,7 +342,7 @@ public class nsIDOMDocument extends nsIDOMNode {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 60, getAddress(), aMozHidden);
- }
-
-- public int GetMozVisibilityState(int /*long*/ aMozVisibilityState) {
-+ public int GetMozVisibilityState(long /*int*/ aMozVisibilityState) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 61, getAddress(), aMozVisibilityState);
- }
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 60, getAddress(), aMozHidden);
+ }
+
+- public int GetMozVisibilityState(int /*long*/ aMozVisibilityState) {
++ public int GetMozVisibilityState(long /*int*/ aMozVisibilityState) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 61, getAddress(), aMozVisibilityState);
+ }
diff --git a/org/eclipse/swt/internal/mozilla/nsIDOMElement.java b/org/eclipse/swt/internal/mozilla/nsIDOMElement.java
-index 87f630e..1a8f52d 100644
+index 5748b9d..b1a11fb 100644
--- a/org/eclipse/swt/internal/mozilla/nsIDOMElement.java
+++ b/org/eclipse/swt/internal/mozilla/nsIDOMElement.java
@@ -43,90 +43,90 @@ public class nsIDOMElement extends nsIDOMNode {
- public static final nsID NS_IDOMELEMENT_10_IID =
- new nsID(NS_IDOMELEMENT_10_IID_STR);
-
-- public nsIDOMElement(int /*long*/ address) {
-+ public nsIDOMElement(long /*int*/ address) {
- super(address);
- }
-
-- public int GetTagName(int /*long*/ aTagName) {
-+ public int GetTagName(long /*int*/ aTagName) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 1, getAddress(), aTagName);
- }
-
-- public int GetAttribute(int /*long*/ name, int /*long*/ _retval) {
-+ public int GetAttribute(long /*int*/ name, long /*int*/ _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 2, getAddress(), name, _retval);
- }
-
-- public int SetAttribute(int /*long*/ name, int /*long*/ value) {
-+ public int SetAttribute(long /*int*/ name, long /*int*/ value) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 3, getAddress(), name, value);
- }
-
-- public int RemoveAttribute(int /*long*/ name) {
-+ public int RemoveAttribute(long /*int*/ name) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 4, getAddress(), name);
- }
-
-- public int GetAttributeNode(int /*long*/ name, int /*long*/[] _retval) {
-+ public int GetAttributeNode(long /*int*/ name, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 5, getAddress(), name, _retval);
- }
-
-- public int SetAttributeNode(int /*long*/ newAttr, int /*long*/[] _retval) {
-+ public int SetAttributeNode(long /*int*/ newAttr, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 6, getAddress(), newAttr, _retval);
- }
-
-- public int RemoveAttributeNode(int /*long*/ oldAttr, int /*long*/[] _retval) {
-+ public int RemoveAttributeNode(long /*int*/ oldAttr, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 7, getAddress(), oldAttr, _retval);
- }
-
-- public int GetElementsByTagName(int /*long*/ name, int /*long*/[] _retval) {
-+ public int GetElementsByTagName(long /*int*/ name, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 8, getAddress(), name, _retval);
- }
-
-- public int GetAttributeNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/ _retval) {
-+ public int GetAttributeNS(long /*int*/ namespaceURI, long /*int*/ localName, long /*int*/ _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 9, getAddress(), namespaceURI, localName, _retval);
- }
-
-- public int SetAttributeNS(int /*long*/ namespaceURI, int /*long*/ qualifiedName, int /*long*/ value) {
-+ public int SetAttributeNS(long /*int*/ namespaceURI, long /*int*/ qualifiedName, long /*int*/ value) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 10, getAddress(), namespaceURI, qualifiedName, value);
- }
-
-- public int RemoveAttributeNS(int /*long*/ namespaceURI, int /*long*/ localName) {
-+ public int RemoveAttributeNS(long /*int*/ namespaceURI, long /*int*/ localName) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 11, getAddress(), namespaceURI, localName);
- }
-
-- public int GetAttributeNodeNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/[] _retval) {
-+ public int GetAttributeNodeNS(long /*int*/ namespaceURI, long /*int*/ localName, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 12, getAddress(), namespaceURI, localName, _retval);
- }
-
-- public int SetAttributeNodeNS(int /*long*/ newAttr, int /*long*/[] _retval) {
-+ public int SetAttributeNodeNS(long /*int*/ newAttr, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 13, getAddress(), newAttr, _retval);
- }
-
-- public int GetElementsByTagNameNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/[] _retval) {
-+ public int GetElementsByTagNameNS(long /*int*/ namespaceURI, long /*int*/ localName, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 14, getAddress(), namespaceURI, localName, _retval);
- }
-
-- public int HasAttribute(int /*long*/ name, int[] _retval) {
-+ public int HasAttribute(long /*int*/ name, int[] _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 15, getAddress(), name, _retval);
- }
-
-- public int HasAttributeNS(int /*long*/ namespaceURI, int /*long*/ localName, int[] _retval) {
-+ public int HasAttributeNS(long /*int*/ namespaceURI, long /*int*/ localName, int[] _retval) {
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 16, getAddress(), namespaceURI, localName, _retval);
- }
-
-- public int GetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
-+ public int GetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 17, getAddress(), cx, aOnmouseenter);
- }
-
-- public int SetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
-+ public int SetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 18, getAddress(), cx, aOnmouseenter);
- }
-
-- public int GetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
-+ public int GetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 19, getAddress(), cx, aOnmouseleave);
- }
-
-- public int SetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
-+ public int SetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 20, getAddress(), cx, aOnmouseleave);
- }
+ public static final nsID NS_IDOMELEMENT_10_IID =
+ new nsID(NS_IDOMELEMENT_10_IID_STR);
+
+- public nsIDOMElement(int /*long*/ address) {
++ public nsIDOMElement(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetTagName(int /*long*/ aTagName) {
++ public int GetTagName(long /*int*/ aTagName) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 1, getAddress(), aTagName);
+ }
+
+- public int GetAttribute(int /*long*/ name, int /*long*/ _retval) {
++ public int GetAttribute(long /*int*/ name, long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 2, getAddress(), name, _retval);
+ }
+
+- public int SetAttribute(int /*long*/ name, int /*long*/ value) {
++ public int SetAttribute(long /*int*/ name, long /*int*/ value) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 3, getAddress(), name, value);
+ }
+
+- public int RemoveAttribute(int /*long*/ name) {
++ public int RemoveAttribute(long /*int*/ name) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 4, getAddress(), name);
+ }
+
+- public int GetAttributeNode(int /*long*/ name, int /*long*/[] _retval) {
++ public int GetAttributeNode(long /*int*/ name, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 5, getAddress(), name, _retval);
+ }
+
+- public int SetAttributeNode(int /*long*/ newAttr, int /*long*/[] _retval) {
++ public int SetAttributeNode(long /*int*/ newAttr, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 6, getAddress(), newAttr, _retval);
+ }
+
+- public int RemoveAttributeNode(int /*long*/ oldAttr, int /*long*/[] _retval) {
++ public int RemoveAttributeNode(long /*int*/ oldAttr, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 7, getAddress(), oldAttr, _retval);
+ }
+
+- public int GetElementsByTagName(int /*long*/ name, int /*long*/[] _retval) {
++ public int GetElementsByTagName(long /*int*/ name, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 8, getAddress(), name, _retval);
+ }
+
+- public int GetAttributeNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/ _retval) {
++ public int GetAttributeNS(long /*int*/ namespaceURI, long /*int*/ localName, long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 9, getAddress(), namespaceURI, localName, _retval);
+ }
+
+- public int SetAttributeNS(int /*long*/ namespaceURI, int /*long*/ qualifiedName, int /*long*/ value) {
++ public int SetAttributeNS(long /*int*/ namespaceURI, long /*int*/ qualifiedName, long /*int*/ value) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 10, getAddress(), namespaceURI, qualifiedName, value);
+ }
+
+- public int RemoveAttributeNS(int /*long*/ namespaceURI, int /*long*/ localName) {
++ public int RemoveAttributeNS(long /*int*/ namespaceURI, long /*int*/ localName) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 11, getAddress(), namespaceURI, localName);
+ }
+
+- public int GetAttributeNodeNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/[] _retval) {
++ public int GetAttributeNodeNS(long /*int*/ namespaceURI, long /*int*/ localName, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 12, getAddress(), namespaceURI, localName, _retval);
+ }
+
+- public int SetAttributeNodeNS(int /*long*/ newAttr, int /*long*/[] _retval) {
++ public int SetAttributeNodeNS(long /*int*/ newAttr, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 13, getAddress(), newAttr, _retval);
+ }
+
+- public int GetElementsByTagNameNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/[] _retval) {
++ public int GetElementsByTagNameNS(long /*int*/ namespaceURI, long /*int*/ localName, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 14, getAddress(), namespaceURI, localName, _retval);
+ }
+
+- public int HasAttribute(int /*long*/ name, int[] _retval) {
++ public int HasAttribute(long /*int*/ name, int[] _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 15, getAddress(), name, _retval);
+ }
+
+- public int HasAttributeNS(int /*long*/ namespaceURI, int /*long*/ localName, int[] _retval) {
++ public int HasAttributeNS(long /*int*/ namespaceURI, long /*int*/ localName, int[] _retval) {
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 16, getAddress(), namespaceURI, localName, _retval);
+ }
+
+- public int GetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
++ public int GetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 17, getAddress(), cx, aOnmouseenter);
+ }
+
+- public int SetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
++ public int SetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 18, getAddress(), cx, aOnmouseenter);
+ }
+
+- public int GetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
++ public int GetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 19, getAddress(), cx, aOnmouseleave);
+ }
+
+- public int SetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
++ public int SetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 20, getAddress(), cx, aOnmouseleave);
+ }
diff --git a/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java b/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
index 57c28a7..f161696 100644
--- a/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
@@ -34390,218 +34722,218 @@ index 0083edc..f862555 100644
return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 14, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg, pressure, inputSourceArg);
}
diff --git a/org/eclipse/swt/internal/mozilla/nsIDOMNode.java b/org/eclipse/swt/internal/mozilla/nsIDOMNode.java
-index 61e02ad..5fad800 100644
+index 088908b..c67b5bc 100644
--- a/org/eclipse/swt/internal/mozilla/nsIDOMNode.java
+++ b/org/eclipse/swt/internal/mozilla/nsIDOMNode.java
@@ -43,7 +43,7 @@ public class nsIDOMNode extends nsISupports {
- public static final nsID NS_IDOMNODE_10_IID =
- new nsID(NS_IDOMNODE_10_IID_STR);
-
-- public nsIDOMNode(int /*long*/ address) {
-+ public nsIDOMNode(long /*int*/ address) {
- super(address);
- }
-
+ public static final nsID NS_IDOMNODE_10_IID =
+ new nsID(NS_IDOMNODE_10_IID_STR);
+
+- public nsIDOMNode(int /*long*/ address) {
++ public nsIDOMNode(long /*int*/ address) {
+ super(address);
+ }
+
@@ -60,15 +60,15 @@ public class nsIDOMNode extends nsISupports {
- public static final int DOCUMENT_FRAGMENT_NODE = 11;
- public static final int NOTATION_NODE = 12;
-
-- public int GetNodeName(int /*long*/ aNodeName) {
-+ public int GetNodeName(long /*int*/ aNodeName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNodeName);
- }
-
-- public int GetNodeValue(int /*long*/ aNodeValue) {
-+ public int GetNodeValue(long /*int*/ aNodeValue) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aNodeValue);
- }
-
-- public int SetNodeValue(int /*long*/ aNodeValue) {
-+ public int SetNodeValue(long /*int*/ aNodeValue) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aNodeValue);
- }
-
+ public static final int DOCUMENT_FRAGMENT_NODE = 11;
+ public static final int NOTATION_NODE = 12;
+
+- public int GetNodeName(int /*long*/ aNodeName) {
++ public int GetNodeName(long /*int*/ aNodeName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNodeName);
+ }
+
+- public int GetNodeValue(int /*long*/ aNodeValue) {
++ public int GetNodeValue(long /*int*/ aNodeValue) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aNodeValue);
+ }
+
+- public int SetNodeValue(int /*long*/ aNodeValue) {
++ public int SetNodeValue(long /*int*/ aNodeValue) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aNodeValue);
+ }
+
@@ -76,56 +76,56 @@ public class nsIDOMNode extends nsISupports {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNodeType);
- }
-
-- public int GetParentNode(int /*long*/[] aParentNode) {
-+ public int GetParentNode(long /*int*/[] aParentNode) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParentNode);
- }
-
-- public int GetParentElement(int /*long*/[] aParentElement) {
-+ public int GetParentElement(long /*int*/[] aParentElement) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParentElement);
- }
-
-- public int GetChildNodes(int /*long*/[] aChildNodes) {
-+ public int GetChildNodes(long /*int*/[] aChildNodes) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 7 : 6), getAddress(), aChildNodes);
- }
-
-- public int GetFirstChild(int /*long*/[] aFirstChild) {
-+ public int GetFirstChild(long /*int*/[] aFirstChild) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 8 : 7), getAddress(), aFirstChild);
- }
-
-- public int GetLastChild(int /*long*/[] aLastChild) {
-+ public int GetLastChild(long /*int*/[] aLastChild) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 9 : 8), getAddress(), aLastChild);
- }
-
-- public int GetPreviousSibling(int /*long*/[] aPreviousSibling) {
-+ public int GetPreviousSibling(long /*int*/[] aPreviousSibling) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 10 : 9), getAddress(), aPreviousSibling);
- }
-
-- public int GetNextSibling(int /*long*/[] aNextSibling) {
-+ public int GetNextSibling(long /*int*/[] aNextSibling) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 11 : 10), getAddress(), aNextSibling);
- }
-
-- public int GetAttributes(int /*long*/[] aAttributes) {
-+ public int GetAttributes(long /*int*/[] aAttributes) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 12 : 11), getAddress(), aAttributes);
- }
-
-- public int GetOwnerDocument(int /*long*/[] aOwnerDocument) {
-+ public int GetOwnerDocument(long /*int*/[] aOwnerDocument) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 13 : 12), getAddress(), aOwnerDocument);
- }
-
-- public int InsertBefore(int /*long*/ newChild, int /*long*/ refChild, int /*long*/[] _retval) {
-+ public int InsertBefore(long /*int*/ newChild, long /*int*/ refChild, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 14 : 13), getAddress(), newChild, refChild, _retval);
- }
-
-- public int ReplaceChild(int /*long*/ newChild, int /*long*/ oldChild, int /*long*/[] _retval) {
-+ public int ReplaceChild(long /*int*/ newChild, long /*int*/ oldChild, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 15 : 14), getAddress(), newChild, oldChild, _retval);
- }
-
-- public int RemoveChild(int /*long*/ oldChild, int /*long*/[] _retval) {
-+ public int RemoveChild(long /*int*/ oldChild, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 16 : 15), getAddress(), oldChild, _retval);
- }
-
-- public int AppendChild(int /*long*/ newChild, int /*long*/[] _retval) {
-+ public int AppendChild(long /*int*/ newChild, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 16), getAddress(), newChild, _retval);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNodeType);
+ }
+
+- public int GetParentNode(int /*long*/[] aParentNode) {
++ public int GetParentNode(long /*int*/[] aParentNode) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParentNode);
+ }
+
+- public int GetParentElement(int /*long*/[] aParentElement) {
++ public int GetParentElement(long /*int*/[] aParentElement) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParentElement);
+ }
+
+- public int GetChildNodes(int /*long*/[] aChildNodes) {
++ public int GetChildNodes(long /*int*/[] aChildNodes) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 7 : 6), getAddress(), aChildNodes);
+ }
+
+- public int GetFirstChild(int /*long*/[] aFirstChild) {
++ public int GetFirstChild(long /*int*/[] aFirstChild) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 8 : 7), getAddress(), aFirstChild);
+ }
+
+- public int GetLastChild(int /*long*/[] aLastChild) {
++ public int GetLastChild(long /*int*/[] aLastChild) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 9 : 8), getAddress(), aLastChild);
+ }
+
+- public int GetPreviousSibling(int /*long*/[] aPreviousSibling) {
++ public int GetPreviousSibling(long /*int*/[] aPreviousSibling) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 10 : 9), getAddress(), aPreviousSibling);
+ }
+
+- public int GetNextSibling(int /*long*/[] aNextSibling) {
++ public int GetNextSibling(long /*int*/[] aNextSibling) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 11 : 10), getAddress(), aNextSibling);
+ }
+
+- public int GetAttributes(int /*long*/[] aAttributes) {
++ public int GetAttributes(long /*int*/[] aAttributes) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 12 : 11), getAddress(), aAttributes);
+ }
+
+- public int GetOwnerDocument(int /*long*/[] aOwnerDocument) {
++ public int GetOwnerDocument(long /*int*/[] aOwnerDocument) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 13 : 12), getAddress(), aOwnerDocument);
+ }
+
+- public int InsertBefore(int /*long*/ newChild, int /*long*/ refChild, int /*long*/[] _retval) {
++ public int InsertBefore(long /*int*/ newChild, long /*int*/ refChild, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 14 : 13), getAddress(), newChild, refChild, _retval);
+ }
+
+- public int ReplaceChild(int /*long*/ newChild, int /*long*/ oldChild, int /*long*/[] _retval) {
++ public int ReplaceChild(long /*int*/ newChild, long /*int*/ oldChild, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 15 : 14), getAddress(), newChild, oldChild, _retval);
+ }
+
+- public int RemoveChild(int /*long*/ oldChild, int /*long*/[] _retval) {
++ public int RemoveChild(long /*int*/ oldChild, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 16 : 15), getAddress(), oldChild, _retval);
+ }
+
+- public int AppendChild(int /*long*/ newChild, int /*long*/[] _retval) {
++ public int AppendChild(long /*int*/ newChild, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 16), getAddress(), newChild, _retval);
+ }
+
@@ -133,7 +133,7 @@ public class nsIDOMNode extends nsISupports {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 18 : 17), getAddress(), _retval);
- }
-
-- public int CloneNode(int deep, int /*long*/[] _retval) {
-+ public int CloneNode(int deep, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 19 : 18), getAddress(), deep, _retval);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 18 : 17), getAddress(), _retval);
+ }
+
+- public int CloneNode(int deep, int /*long*/[] _retval) {
++ public int CloneNode(int deep, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 19 : 18), getAddress(), deep, _retval);
+ }
+
@@ -141,24 +141,24 @@ public class nsIDOMNode extends nsISupports {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 19), getAddress());
- }
-
-- public int IsSupported(int /*long*/ feature, int /*long*/ version, int[] _retval) {
-+ public int IsSupported(long /*int*/ feature, long /*int*/ version, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 20), getAddress(), feature, version, _retval);
- }
-
-- public int GetNamespaceURI(int /*long*/ aNamespaceURI) {
-+ public int GetNamespaceURI(long /*int*/ aNamespaceURI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 22 : 21), getAddress(), aNamespaceURI);
- }
-
-- public int GetPrefix(int /*long*/ aPrefix) {
-+ public int GetPrefix(long /*int*/ aPrefix) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 23 : 22), getAddress(), aPrefix);
- }
-
-- public int SetPrefix(int /*long*/ aPrefix) {
-+ public int SetPrefix(long /*int*/ aPrefix) {
- if (IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aPrefix);
- }
-
-- public int GetLocalName(int /*long*/ aLocalName) {
-+ public int GetLocalName(long /*int*/ aLocalName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aLocalName);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 19), getAddress());
+ }
+
+- public int IsSupported(int /*long*/ feature, int /*long*/ version, int[] _retval) {
++ public int IsSupported(long /*int*/ feature, long /*int*/ version, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 20), getAddress(), feature, version, _retval);
+ }
+
+- public int GetNamespaceURI(int /*long*/ aNamespaceURI) {
++ public int GetNamespaceURI(long /*int*/ aNamespaceURI) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 22 : 21), getAddress(), aNamespaceURI);
+ }
+
+- public int GetPrefix(int /*long*/ aPrefix) {
++ public int GetPrefix(long /*int*/ aPrefix) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 23 : 22), getAddress(), aPrefix);
+ }
+
+- public int SetPrefix(int /*long*/ aPrefix) {
++ public int SetPrefix(long /*int*/ aPrefix) {
+ if (IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aPrefix);
+ }
+
+- public int GetLocalName(int /*long*/ aLocalName) {
++ public int GetLocalName(long /*int*/ aLocalName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aLocalName);
+ }
+
@@ -166,7 +166,7 @@ public class nsIDOMNode extends nsISupports {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), _retval);
- }
-
-- public int GetDOMBaseURI(int /*long*/ aBaseURI) {
-+ public int GetDOMBaseURI(long /*int*/ aBaseURI) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aBaseURI);
- }
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), _retval);
+ }
+
+- public int GetDOMBaseURI(int /*long*/ aBaseURI) {
++ public int GetDOMBaseURI(long /*int*/ aBaseURI) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aBaseURI);
+ }
@@ -179,52 +179,52 @@ public class nsIDOMNode extends nsISupports {
- public static final int DOCUMENT_POSITION_CONTAINED_BY = 16;
- public static final int DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC = 32;
-
-- public int CompareDocumentPosition(int /*long*/ other, short[] _retval) {
-+ public int CompareDocumentPosition(long /*int*/ other, short[] _retval) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), other, _retval);
- }
-
-- public int GetTextContent(int /*long*/ aTextContent) {
-+ public int GetTextContent(long /*int*/ aTextContent) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aTextContent);
- }
-
-- public int SetTextContent(int /*long*/ aTextContent) {
-+ public int SetTextContent(long /*int*/ aTextContent) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aTextContent);
- }
-
-- public int LookupPrefix(int /*long*/ namespaceURI, int /*long*/ _retval) {
-+ public int LookupPrefix(long /*int*/ namespaceURI, long /*int*/ _retval) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), namespaceURI, _retval);
- }
-
-- public int IsDefaultNamespace(int /*long*/ namespaceURI, int[] _retval) {
-+ public int IsDefaultNamespace(long /*int*/ namespaceURI, int[] _retval) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), namespaceURI, _retval);
- }
-
-- public int LookupNamespaceURI(int /*long*/ prefix, int /*long*/ _retval) {
-+ public int LookupNamespaceURI(long /*int*/ prefix, long /*int*/ _retval) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), prefix, _retval);
- }
-
-- public int IsEqualNode(int /*long*/ arg, int[] _retval) {
-+ public int IsEqualNode(long /*int*/ arg, int[] _retval) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), arg, _retval);
- }
-
-- public int SetUserData(int /*long*/ key, int /*long*/ data, int /*long*/ handler, int /*long*/[] _retval) {
-+ public int SetUserData(long /*int*/ key, long /*int*/ data, long /*int*/ handler, long /*int*/[] _retval) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), key, data, handler, _retval);
- }
-
-- public int GetUserData(int /*long*/ key, int /*long*/[] _retval) {
-+ public int GetUserData(long /*int*/ key, long /*int*/[] _retval) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), key, _retval);
- }
-
-- public int Contains(int /*long*/ aOther, int[] _retval) {
-+ public int Contains(long /*int*/ aOther, int[] _retval) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aOther, _retval);
- }
+ public static final int DOCUMENT_POSITION_CONTAINED_BY = 16;
+ public static final int DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC = 32;
+
+- public int CompareDocumentPosition(int /*long*/ other, short[] _retval) {
++ public int CompareDocumentPosition(long /*int*/ other, short[] _retval) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), other, _retval);
+ }
+
+- public int GetTextContent(int /*long*/ aTextContent) {
++ public int GetTextContent(long /*int*/ aTextContent) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aTextContent);
+ }
+
+- public int SetTextContent(int /*long*/ aTextContent) {
++ public int SetTextContent(long /*int*/ aTextContent) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aTextContent);
+ }
+
+- public int LookupPrefix(int /*long*/ namespaceURI, int /*long*/ _retval) {
++ public int LookupPrefix(long /*int*/ namespaceURI, long /*int*/ _retval) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), namespaceURI, _retval);
+ }
+
+- public int IsDefaultNamespace(int /*long*/ namespaceURI, int[] _retval) {
++ public int IsDefaultNamespace(long /*int*/ namespaceURI, int[] _retval) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), namespaceURI, _retval);
+ }
+
+- public int LookupNamespaceURI(int /*long*/ prefix, int /*long*/ _retval) {
++ public int LookupNamespaceURI(long /*int*/ prefix, long /*int*/ _retval) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), prefix, _retval);
+ }
+
+- public int IsEqualNode(int /*long*/ arg, int[] _retval) {
++ public int IsEqualNode(long /*int*/ arg, int[] _retval) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), arg, _retval);
+ }
+
+- public int SetUserData(int /*long*/ key, int /*long*/ data, int /*long*/ handler, int /*long*/[] _retval) {
++ public int SetUserData(long /*int*/ key, long /*int*/ data, long /*int*/ handler, long /*int*/[] _retval) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), key, data, handler, _retval);
+ }
+
+- public int GetUserData(int /*long*/ key, int /*long*/[] _retval) {
++ public int GetUserData(long /*int*/ key, long /*int*/[] _retval) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), key, _retval);
+ }
+
+- public int Contains(int /*long*/ aOther, int[] _retval) {
++ public int Contains(long /*int*/ aOther, int[] _retval) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aOther, _retval);
+ }
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
@@ -35321,12 +35653,12 @@ index ad3c5d1..7474263 100644
}
}
diff --git a/org/eclipse/swt/internal/mozilla/nsIDocShell.java b/org/eclipse/swt/internal/mozilla/nsIDocShell.java
-index 7a11c2b..71f88ac 100644
+index a67056b..ea92362 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);
+@@ -49,23 +49,23 @@ public class nsIDocShell extends nsISupports {
+ public static final nsID NS_IDOCSHELL_10_IID =
+ new nsID(NS_IDOCSHELL_10_IID_STR);
- public nsIDocShell(int /*long*/ address) {
+ public nsIDocShell(long /*int*/ address) {
@@ -35353,7 +35685,7 @@ index 7a11c2b..71f88ac 100644
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);
}
-@@ -61,7 +61,7 @@ public class nsIDocShell extends nsISupports {
+@@ -73,7 +73,7 @@ public class nsIDocShell extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
}
@@ -35362,7 +35694,7 @@ index 7a11c2b..71f88ac 100644
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);
}
-@@ -69,43 +69,43 @@ public class nsIDocShell extends nsISupports {
+@@ -81,43 +81,43 @@ public class nsIDocShell extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress());
}
@@ -35416,7 +35748,7 @@ index 7a11c2b..71f88ac 100644
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocumentCharsetInfo);
}
-@@ -153,7 +153,7 @@ public class nsIDocShell extends nsISupports {
+@@ -165,7 +165,7 @@ public class nsIDocShell extends nsISupports {
public static final int ENUMERATE_BACKWARDS = 1;
@@ -35425,7 +35757,7 @@ index 7a11c2b..71f88ac 100644
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aItemType, aDirection, _retval);
}
-@@ -249,11 +249,11 @@ public class nsIDocShell extends nsISupports {
+@@ -261,11 +261,11 @@ public class nsIDocShell extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aIsExecutingOnLoadHandler);
}
@@ -35439,142 +35771,6 @@ index 7a11c2b..71f88ac 100644
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 aec4a31..72419ee 100644
---- a/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java
-+++ b/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java
-@@ -43,15 +43,15 @@ public class nsIDocShell_1_8 extends nsISupports {
- public static final nsID NS_IDOCSHELL_10_IID =
- new nsID(NS_IDOCSHELL_10_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);
- }
-
-@@ -59,11 +59,11 @@ public class nsIDocShell_1_8 extends nsISupports {
- public static final int INTERNAL_LOAD_FLAGS_INHERIT_OWNER = 1;
- 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);
- }
-
-@@ -71,7 +71,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);
- }
-
-@@ -79,35 +79,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);
- }
-
-@@ -154,7 +154,7 @@ public class nsIDocShell_1_8 extends nsISupports {
- public static final int ENUMERATE_FORWARDS = 0;
- 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);
- }
-
-@@ -250,11 +250,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);
- }
-
-@@ -262,11 +262,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);
- }
-
-@@ -278,7 +278,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 18d308d..9b4856c 100644
--- a/org/eclipse/swt/internal/mozilla/nsIDownload.java
@@ -36049,112 +36245,112 @@ index b841fad..2d26548 100644
}
diff --git a/org/eclipse/swt/internal/mozilla/nsIFocusManager.java b/org/eclipse/swt/internal/mozilla/nsIFocusManager.java
-index 6c4bd5b..5efcace 100644
+index ae74cec..c909ca9 100644
--- a/org/eclipse/swt/internal/mozilla/nsIFocusManager.java
+++ b/org/eclipse/swt/internal/mozilla/nsIFocusManager.java
@@ -43,51 +43,51 @@ public class nsIFocusManager extends nsISupports {
- public static final nsID NS_IFOCUSMANAGER_10_IID =
- new nsID(NS_IFOCUSMANAGER_10_IID_STR);
-
-- public nsIFocusManager(int /*long*/ address) {
-+ public nsIFocusManager(long /*int*/ address) {
- super(address);
- }
-
-- public int GetActiveWindow(int /*long*/[] aActiveWindow) {
-+ public int GetActiveWindow(long /*int*/[] aActiveWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aActiveWindow);
- }
-
-- public int SetActiveWindow(int /*long*/ aActiveWindow) {
-+ public int SetActiveWindow(long /*int*/ aActiveWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aActiveWindow);
- }
-
-- public int GetFocusedWindow(int /*long*/[] aFocusedWindow) {
-+ public int GetFocusedWindow(long /*int*/[] aFocusedWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aFocusedWindow);
- }
-
-- public int SetFocusedWindow(int /*long*/ aFocusedWindow) {
-+ public int SetFocusedWindow(long /*int*/ aFocusedWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFocusedWindow);
- }
-
-- public int GetFocusedElement(int /*long*/[] aFocusedElement) {
-+ public int GetFocusedElement(long /*int*/[] aFocusedElement) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aFocusedElement);
- }
-
-- public int GetLastFocusMethod(int /*long*/ window, int[] _retval) {
-+ public int GetLastFocusMethod(long /*int*/ window, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), window, _retval);
- }
-
-- public int SetFocus(int /*long*/ aElement, int aFlags) {
-+ public int SetFocus(long /*int*/ aElement, int aFlags) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aElement, aFlags);
- }
-
-- public int MoveFocus(int /*long*/ aWindow, int /*long*/ aStartElement, int aType, int aFlags, int /*long*/[] _retval) {
-+ public int MoveFocus(long /*int*/ aWindow, long /*int*/ aStartElement, int aType, int aFlags, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aWindow, aStartElement, aType, aFlags, _retval);
- }
-
-- public int ClearFocus(int /*long*/ aWindow) {
-+ public int ClearFocus(long /*int*/ aWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aWindow);
- }
-
-- public int GetFocusedElementForWindow(int /*long*/ aWindow, int aDeep, int /*long*/[] aFocusedWindow, int /*long*/[] _retval) {
-+ public int GetFocusedElementForWindow(long /*int*/ aWindow, int aDeep, long /*int*/[] aFocusedWindow, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aWindow, aDeep, aFocusedWindow, _retval);
- }
-
-- public int MoveCaretToFocus(int /*long*/ aWindow) {
-+ public int MoveCaretToFocus(long /*int*/ aWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aWindow);
- }
-
+ public static final nsID NS_IFOCUSMANAGER_10_IID =
+ new nsID(NS_IFOCUSMANAGER_10_IID_STR);
+
+- public nsIFocusManager(int /*long*/ address) {
++ public nsIFocusManager(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetActiveWindow(int /*long*/[] aActiveWindow) {
++ public int GetActiveWindow(long /*int*/[] aActiveWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aActiveWindow);
+ }
+
+- public int SetActiveWindow(int /*long*/ aActiveWindow) {
++ public int SetActiveWindow(long /*int*/ aActiveWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aActiveWindow);
+ }
+
+- public int GetFocusedWindow(int /*long*/[] aFocusedWindow) {
++ public int GetFocusedWindow(long /*int*/[] aFocusedWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aFocusedWindow);
+ }
+
+- public int SetFocusedWindow(int /*long*/ aFocusedWindow) {
++ public int SetFocusedWindow(long /*int*/ aFocusedWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFocusedWindow);
+ }
+
+- public int GetFocusedElement(int /*long*/[] aFocusedElement) {
++ public int GetFocusedElement(long /*int*/[] aFocusedElement) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aFocusedElement);
+ }
+
+- public int GetLastFocusMethod(int /*long*/ window, int[] _retval) {
++ public int GetLastFocusMethod(long /*int*/ window, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), window, _retval);
+ }
+
+- public int SetFocus(int /*long*/ aElement, int aFlags) {
++ public int SetFocus(long /*int*/ aElement, int aFlags) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aElement, aFlags);
+ }
+
+- public int MoveFocus(int /*long*/ aWindow, int /*long*/ aStartElement, int aType, int aFlags, int /*long*/[] _retval) {
++ public int MoveFocus(long /*int*/ aWindow, long /*int*/ aStartElement, int aType, int aFlags, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aWindow, aStartElement, aType, aFlags, _retval);
+ }
+
+- public int ClearFocus(int /*long*/ aWindow) {
++ public int ClearFocus(long /*int*/ aWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aWindow);
+ }
+
+- public int GetFocusedElementForWindow(int /*long*/ aWindow, int aDeep, int /*long*/[] aFocusedWindow, int /*long*/[] _retval) {
++ public int GetFocusedElementForWindow(long /*int*/ aWindow, int aDeep, long /*int*/[] aFocusedWindow, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aWindow, aDeep, aFocusedWindow, _retval);
+ }
+
+- public int MoveCaretToFocus(int /*long*/ aWindow) {
++ public int MoveCaretToFocus(long /*int*/ aWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aWindow);
+ }
+
@@ -106,31 +106,31 @@ public class nsIFocusManager extends nsISupports {
- public static final int MOVEFOCUS_ROOT = 7;
- public static final int MOVEFOCUS_CARET = 8;
-
-- public int WindowRaised(int /*long*/ aWindow) {
-+ public int WindowRaised(long /*int*/ aWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aWindow);
- }
-
-- public int WindowLowered(int /*long*/ aWindow) {
-+ public int WindowLowered(long /*int*/ aWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aWindow);
- }
-
-- public int ContentRemoved(int /*long*/ aDocument, int /*long*/ aElement) {
-+ public int ContentRemoved(long /*int*/ aDocument, long /*int*/ aElement) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aDocument, aElement);
- }
-
-- public int WindowShown(int /*long*/ aWindow) {
-+ public int WindowShown(long /*int*/ aWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aWindow);
- }
-
-- public int WindowHidden(int /*long*/ aWindow) {
-+ public int WindowHidden(long /*int*/ aWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aWindow);
- }
-
-- public int FireDelayedEvents(int /*long*/ aDocument) {
-+ public int FireDelayedEvents(long /*int*/ aDocument) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocument);
- }
-
-- public int FocusPlugin(int /*long*/ aPlugin) {
-+ public int FocusPlugin(long /*int*/ aPlugin) {
- if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPlugin);
- }
+ public static final int MOVEFOCUS_ROOT = 7;
+ public static final int MOVEFOCUS_CARET = 8;
+
+- public int WindowRaised(int /*long*/ aWindow) {
++ public int WindowRaised(long /*int*/ aWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aWindow);
+ }
+
+- public int WindowLowered(int /*long*/ aWindow) {
++ public int WindowLowered(long /*int*/ aWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aWindow);
+ }
+
+- public int ContentRemoved(int /*long*/ aDocument, int /*long*/ aElement) {
++ public int ContentRemoved(long /*int*/ aDocument, long /*int*/ aElement) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aDocument, aElement);
+ }
+
+- public int WindowShown(int /*long*/ aWindow) {
++ public int WindowShown(long /*int*/ aWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aWindow);
+ }
+
+- public int WindowHidden(int /*long*/ aWindow) {
++ public int WindowHidden(long /*int*/ aWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aWindow);
+ }
+
+- public int FireDelayedEvents(int /*long*/ aDocument) {
++ public int FireDelayedEvents(long /*int*/ aDocument) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocument);
+ }
+
+- public int FocusPlugin(int /*long*/ aPlugin) {
++ public int FocusPlugin(long /*int*/ aPlugin) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPlugin);
+ }
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
@@ -36385,71 +36581,71 @@ index d277e75..bb3c6cf 100644
}
}
diff --git a/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_8.java b/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_8.java
-index ac10eea..f092400 100644
+index a593aa0..022162d 100644
--- a/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_8.java
+++ b/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_8.java
@@ -37,31 +37,31 @@ public class nsIHelperAppLauncher_8 extends nsICancelable {
- public static final nsID NS_IHELPERAPPLAUNCHER_IID =
- new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
-
-- public nsIHelperAppLauncher_8(int /*long*/ address) {
-+ public nsIHelperAppLauncher_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);
- }
-
+ public static final nsID NS_IHELPERAPPLAUNCHER_IID =
+ new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
+
+- public nsIHelperAppLauncher_8(int /*long*/ address) {
++ public nsIHelperAppLauncher_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,7 +69,7 @@ public class nsIHelperAppLauncher_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);
- }
-
+ 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,11 +77,11 @@ public class nsIHelperAppLauncher_8 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);
- }
-
-- public int GetContentLength(int /*long*/ aContentLength) {
-+ public int GetContentLength(long /*int*/ aContentLength) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 11, getAddress(), aContentLength);
- }
- }
+ 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);
+ }
+
+- public int GetContentLength(int /*long*/ aContentLength) {
++ public int GetContentLength(long /*int*/ aContentLength) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 11, getAddress(), aContentLength);
+ }
+ }
diff --git a/org/eclipse/swt/internal/mozilla/nsIHttpChannel.java b/org/eclipse/swt/internal/mozilla/nsIHttpChannel.java
index f72f1fd..26d0805 100644
--- a/org/eclipse/swt/internal/mozilla/nsIHttpChannel.java
@@ -37531,39 +37727,6 @@ index 7a36f9f..2ecc2c9 100644
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 27, getAddress(), cx);
}
-diff --git a/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java b/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java
-index 017ed67..04beac6 100644
---- a/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java
-+++ b/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java
-@@ -37,23 +37,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/nsISeekableStream.java b/org/eclipse/swt/internal/mozilla/nsISeekableStream.java
index 74ddd6e..af8d253 100644
--- a/org/eclipse/swt/internal/mozilla/nsISeekableStream.java
@@ -37962,19 +38125,19 @@ index 9a8dc98..582f637 100644
}
}
diff --git a/org/eclipse/swt/internal/mozilla/nsIVariant.java b/org/eclipse/swt/internal/mozilla/nsIVariant.java
-index 2de3baf..2026748 100644
+index 1d8df8e..e8b219a 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);
+@@ -43,7 +43,7 @@ public class nsIVariant extends nsISupports {
+ public static final nsID NS_IVARIANT_10_IID =
+ new nsID(NS_IVARIANT_10_IID_STR);
- public nsIVariant(int /*long*/ address) {
+ public nsIVariant(long /*int*/ address) {
super(address);
}
-@@ -45,11 +45,11 @@ public class nsIVariant extends nsISupports {
+@@ -51,11 +51,11 @@ public class nsIVariant extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aDataType);
}
@@ -37988,7 +38151,7 @@ index 2de3baf..2026748 100644
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
}
-@@ -61,7 +61,7 @@ public class nsIVariant extends nsISupports {
+@@ -67,7 +67,7 @@ public class nsIVariant extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);
}
@@ -37997,7 +38160,7 @@ index 2de3baf..2026748 100644
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval);
}
-@@ -73,7 +73,7 @@ public class nsIVariant extends nsISupports {
+@@ -79,7 +79,7 @@ public class nsIVariant extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), _retval);
}
@@ -38006,7 +38169,7 @@ index 2de3baf..2026748 100644
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
}
-@@ -81,7 +81,7 @@ public class nsIVariant extends nsISupports {
+@@ -87,7 +87,7 @@ public class nsIVariant extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval);
}
@@ -38015,7 +38178,7 @@ index 2de3baf..2026748 100644
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), _retval);
}
-@@ -97,51 +97,51 @@ public class nsIVariant extends nsISupports {
+@@ -103,56 +103,56 @@ public class nsIVariant extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), _retval);
}
@@ -38059,24 +38222,30 @@ index 2de3baf..2026748 100644
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);
}
+- public int GetAsJSVal(int /*long*/[] _retval) {
++ public int GetAsJSVal(long /*int*/[] _retval) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, 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);
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 24 : 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);
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 25 : 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);
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 26 : 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);
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 27 : 26), getAddress(), size, str);
}
}
diff --git a/org/eclipse/swt/internal/mozilla/nsIWeakReference.java b/org/eclipse/swt/internal/mozilla/nsIWeakReference.java
@@ -38844,6 +39013,29 @@ index 55eab38..b859636 100644
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aAction, aCallContext, aJSContext, aJSObject, aObj, aClassInfo, aName, aPolicy);
}
}
+diff --git a/org/eclipse/swt/internal/mozilla/nsIXPConnect.java b/org/eclipse/swt/internal/mozilla/nsIXPConnect.java
+index dc49321..4a22bff 100644
+--- a/org/eclipse/swt/internal/mozilla/nsIXPConnect.java
++++ b/org/eclipse/swt/internal/mozilla/nsIXPConnect.java
+@@ -37,15 +37,15 @@ public class nsIXPConnect extends nsISupports {
+ public static final nsID NS_IXPCONNECT_IID =
+ new nsID(NS_IXPCONNECT_IID_STR);
+
+- public nsIXPConnect(int /*long*/ address) {
++ public nsIXPConnect(long /*int*/ address) {
+ super(address);
+ }
+
+- public int JSValToVariant(int /*long*/ cx, int /*long*/ aJSVal, int /*long*/[] _retval) {
++ public int JSValToVariant(long /*int*/ cx, long /*int*/ aJSVal, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), cx, aJSVal, _retval);
+ }
+
+- public int VariantToJS(int /*long*/ ctx, int /*long*/ scope, int /*long*/ value, int /*long*/ _retval) {
++ public int VariantToJS(long /*int*/ ctx, long /*int*/ scope, long /*int*/ value, long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), ctx, scope, value, _retval);
+ }
+ }
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
@@ -39520,7 +39712,7 @@ index 1c81599..8b89a82 100644
public static final int sizeof = WebKitGTK.JSClassDefinition_sizeof();
}
diff --git a/org/eclipse/swt/internal/webkit/WebKitGTK.java b/org/eclipse/swt/internal/webkit/WebKitGTK.java
-index f6e83cb..6237f96 100644
+index 52ba697..b051d46 100644
--- a/org/eclipse/swt/internal/webkit/WebKitGTK.java
+++ b/org/eclipse/swt/internal/webkit/WebKitGTK.java
@@ -90,8 +90,8 @@ protected static byte [] ascii (String name) {
@@ -40528,6 +40720,17 @@ index f6e83cb..6237f96 100644
}
/** @method flags=dynamic */
+-public static final native int /*long*/ _webkit_web_view_get_type ();
+-public static final int /*long*/ webkit_web_view_get_type () {
++public static final native long /*int*/ _webkit_web_view_get_type ();
++public static final long /*int*/ webkit_web_view_get_type () {
+ lock.lock();
+ try {
+ return _webkit_web_view_get_type ();
+@@ -1139,8 +1139,8 @@ public static final int /*long*/ webkit_web_view_get_type () {
+ }
+
+ /** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_view_get_uri (int /*long*/ web_view);
-public static final int /*long*/ webkit_web_view_get_uri (int /*long*/ web_view) {
+public static final native long /*int*/ _webkit_web_view_get_uri (long /*int*/ web_view);
@@ -40535,7 +40738,7 @@ index f6e83cb..6237f96 100644
lock.lock();
try {
return _webkit_web_view_get_uri (web_view);
-@@ -1139,8 +1139,8 @@ public static final int /*long*/ webkit_web_view_get_uri (int /*long*/ web_view)
+@@ -1150,8 +1150,8 @@ public static final int /*long*/ webkit_web_view_get_uri (int /*long*/ web_view)
}
/** @method flags=dynamic */
@@ -40546,7 +40749,7 @@ index f6e83cb..6237f96 100644
lock.lock();
try {
return _webkit_web_view_get_window_features (web_view);
-@@ -1150,8 +1150,8 @@ public static final int /*long*/ webkit_web_view_get_window_features (int /*long
+@@ -1161,8 +1161,8 @@ public static final int /*long*/ webkit_web_view_get_window_features (int /*long
}
/** @method flags=dynamic */
@@ -40557,7 +40760,7 @@ index f6e83cb..6237f96 100644
lock.lock();
try {
_webkit_web_view_go_back (web_view);
-@@ -1161,8 +1161,8 @@ public static final void webkit_web_view_go_back (int /*long*/ web_view) {
+@@ -1172,8 +1172,8 @@ public static final void webkit_web_view_go_back (int /*long*/ web_view) {
}
/** @method flags=dynamic */
@@ -40568,7 +40771,7 @@ index f6e83cb..6237f96 100644
lock.lock();
try {
_webkit_web_view_go_forward (web_view);
-@@ -1172,8 +1172,8 @@ public static final void webkit_web_view_go_forward (int /*long*/ web_view) {
+@@ -1183,8 +1183,8 @@ public static final void webkit_web_view_go_forward (int /*long*/ web_view) {
}
/** @method flags=dynamic */
@@ -40579,7 +40782,7 @@ index f6e83cb..6237f96 100644
lock.lock();
try {
_webkit_web_view_load_string (web_view, content, mime_type, encoding, base_uri);
-@@ -1183,8 +1183,8 @@ public static final void webkit_web_view_load_string (int /*long*/ web_view, byt
+@@ -1194,8 +1194,8 @@ public static final void webkit_web_view_load_string (int /*long*/ web_view, byt
}
/** @method flags=dynamic */
@@ -40590,7 +40793,7 @@ index f6e83cb..6237f96 100644
lock.lock();
try {
_webkit_web_view_load_uri (web_view, uri);
-@@ -1194,8 +1194,8 @@ public static final void webkit_web_view_load_uri (int /*long*/ web_view, byte[]
+@@ -1205,8 +1205,8 @@ public static final void webkit_web_view_load_uri (int /*long*/ web_view, byte[]
}
/** @method flags=dynamic */
@@ -40601,7 +40804,7 @@ index f6e83cb..6237f96 100644
lock.lock();
try {
return _webkit_web_view_new ();
-@@ -1205,8 +1205,8 @@ public static final int /*long*/ webkit_web_view_new () {
+@@ -1216,8 +1216,8 @@ public static final int /*long*/ webkit_web_view_new () {
}
/** @method flags=dynamic */
@@ -40612,7 +40815,7 @@ index f6e83cb..6237f96 100644
lock.lock();
try {
_webkit_web_view_reload (web_view);
-@@ -1216,8 +1216,8 @@ public static final void webkit_web_view_reload (int /*long*/ web_view) {
+@@ -1227,8 +1227,8 @@ public static final void webkit_web_view_reload (int /*long*/ web_view) {
}
/** @method flags=dynamic */
@@ -40623,7 +40826,7 @@ index f6e83cb..6237f96 100644
lock.lock();
try {
_webkit_web_view_stop_loading (web_view);
-@@ -1235,14 +1235,14 @@ public static final native int JSClassDefinition_sizeof ();
+@@ -1246,14 +1246,14 @@ public static final native int JSClassDefinition_sizeof ();
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
@@ -40641,7 +40844,7 @@ index f6e83cb..6237f96 100644
lock.lock();
try {
return _SoupCookie_expires (cookie);
-@@ -1256,8 +1256,8 @@ public static final int /*long*/ SoupCookie_expires (int /*long*/ cookie) {
+@@ -1267,8 +1267,8 @@ public static final int /*long*/ SoupCookie_expires (int /*long*/ cookie) {
* @param message cast=(SoupMessage *)
* @param method cast=(const char *)
*/
@@ -40652,7 +40855,7 @@ index f6e83cb..6237f96 100644
lock.lock();
try {
_SoupMessage_method (message, method);
-@@ -1270,8 +1270,8 @@ public static final void SoupMessage_method (int /*long*/ message, int /*long*/
+@@ -1281,8 +1281,8 @@ public static final void SoupMessage_method (int /*long*/ message, int /*long*/
* @method flags=getter
* @param message cast=(SoupMessage *)
*/
@@ -40663,7 +40866,7 @@ index f6e83cb..6237f96 100644
lock.lock();
try {
return _SoupMessage_request_body (message);
-@@ -1284,8 +1284,8 @@ public static final int /*long*/ SoupMessage_request_body (int /*long*/ message)
+@@ -1295,8 +1295,8 @@ public static final int /*long*/ SoupMessage_request_body (int /*long*/ message)
* @method flags=getter
* @param message cast=(SoupMessage *)
*/
@@ -41715,7 +41918,7 @@ index 1799563..1109f1b 100644
GdkRectangle rect = new GdkRectangle ();
rect.x = caret.x;
diff --git a/org/eclipse/swt/widgets/Caret.java b/org/eclipse/swt/widgets/Caret.java
-index ddb8b1c..df6fc54 100644
+index d78ce6f..29ac4e6 100644
--- a/org/eclipse/swt/widgets/Caret.java
+++ b/org/eclipse/swt/widgets/Caret.java
@@ -97,14 +97,14 @@ void createWidget (int index) {
@@ -41727,7 +41930,7 @@ index ddb8b1c..df6fc54 100644
if (OS.USE_CAIRO) {
- int /*long*/ cairo = OS.gdk_cairo_create(window);
+ long /*int*/ cairo = OS.gdk_cairo_create(window);
- if (cairo == 0) SWT.error(SWT.ERROR_NO_HANDLES);
+ if (cairo == 0) error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_set_source_rgb(cairo, 1, 1, 1);
Cairo.cairo_set_operator(cairo, Cairo.CAIRO_OPERATOR_DIFFERENCE);
if (image != null && !image.isDisposed() && image.mask == 0) {
@@ -42267,7 +42470,7 @@ index c4b4978..b870bfc 100644
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
diff --git a/org/eclipse/swt/widgets/Composite.java b/org/eclipse/swt/widgets/Composite.java
-index 19189ad..39bd4f2 100644
+index 561dfa3..5cf6cb5 100644
--- a/org/eclipse/swt/widgets/Composite.java
+++ b/org/eclipse/swt/widgets/Composite.java
@@ -47,8 +47,8 @@ import org.eclipse.swt.graphics.*;
@@ -42321,7 +42524,7 @@ index 19189ad..39bd4f2 100644
+ long /*int*/ hadj = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10);
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);
+ if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES);
@@ -364,7 +364,7 @@ public void drawBackground (GC gc, int x, int y, int width, int height, int offs
Control control = findBackgroundControl ();
if (control != null) {
@@ -42625,7 +42828,7 @@ index 19189ad..39bd4f2 100644
Region newClip = new Region (gc.getDevice ());
gc.getClipping (oldClip);
diff --git a/org/eclipse/swt/widgets/Control.java b/org/eclipse/swt/widgets/Control.java
-index c6f013e..a8dee22 100644
+index 2d8e940..4db9360 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.*;
@@ -42921,14 +43124,14 @@ index c6f013e..a8dee22 100644
+ long /*int*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system());
+ long /*int*/ xDrawable = OS.GDK_PIXMAP_XID(real_drawable [0]);
+ long /*int*/ surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width [0], height [0]);
- if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
+ if (surface == 0) error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_save(cairo);
Cairo.cairo_rectangle(cairo, destX , destY, destWidth, destHeight);
Cairo.cairo_clip(cairo);
Cairo.cairo_translate(cairo, destX, destY);
- int /*long*/ pattern = Cairo.cairo_pattern_create_for_surface(surface);
+ long /*int*/ pattern = Cairo.cairo_pattern_create_for_surface(surface);
- if (pattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);
+ if (pattern == 0) error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_pattern_set_filter(pattern, Cairo.CAIRO_FILTER_BEST);
Cairo.cairo_set_source(cairo, pattern);
@@ -472,13 +472,13 @@ void printWindow (boolean first, Control control, GC gc, int /*long*/ drawable,
@@ -43510,7 +43713,7 @@ index c6f013e..a8dee22 100644
checkWidget ();
- int /*long*/ window = paintWindow ();
+ long /*int*/ window = paintWindow ();
- if (window == 0) SWT.error (SWT.ERROR_NO_HANDLES);
+ if (window == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ gc;
+ long /*int*/ gc;
if (OS.USE_CAIRO) {
@@ -43892,7 +44095,7 @@ index 020e8a9..9bce9ee 100644
* Feature in GTK. "month-changed" signal is emitted when the
* calendar is displayed though the day/month is not changed.
diff --git a/org/eclipse/swt/widgets/Decorations.java b/org/eclipse/swt/widgets/Decorations.java
-index 19fa5cf..959699f 100644
+index 1b13bef..e576f99 100644
--- a/org/eclipse/swt/widgets/Decorations.java
+++ b/org/eclipse/swt/widgets/Decorations.java
@@ -103,7 +103,7 @@ public class Decorations extends Canvas {
@@ -43928,7 +44131,7 @@ index 19fa5cf..959699f 100644
OS.g_object_unref (data [0]);
@@ -233,7 +233,7 @@ void createAccelGroup () {
accelGroup = OS.gtk_accel_group_new ();
- if (accelGroup == 0) SWT.error (SWT.ERROR_NO_HANDLES);
+ if (accelGroup == 0) error (SWT.ERROR_NO_HANDLES);
//FIXME - what should we do for Decorations
- int /*long*/ shellHandle = topHandle ();
+ long /*int*/ shellHandle = topHandle ();
@@ -44041,7 +44244,7 @@ index b6979e1..ef9c201 100644
if (utf16Ptr != 0) {
int clength = (int)/*64*/items_written [0];
diff --git a/org/eclipse/swt/widgets/Display.java b/org/eclipse/swt/widgets/Display.java
-index c63d83d..e7fb7cb 100644
+index 4db8812..936df98 100644
--- a/org/eclipse/swt/widgets/Display.java
+++ b/org/eclipse/swt/widgets/Display.java
@@ -99,30 +99,30 @@ public class Display extends Device {
@@ -44642,7 +44845,7 @@ index c63d83d..e7fb7cb 100644
/* Get Tooltip resources */
- int /*long*/ tooltipShellHandle = OS.gtk_window_new (OS.GTK_WINDOW_POPUP);
+ long /*int*/ tooltipShellHandle = OS.gtk_window_new (OS.GTK_WINDOW_POPUP);
- if (tooltipShellHandle == 0) SWT.error (SWT.ERROR_NO_HANDLES);
+ if (tooltipShellHandle == 0) error (SWT.ERROR_NO_HANDLES);
byte[] gtk_tooltips = Converter.wcsToMbcs (null, "gtk-tooltips", true); //$NON-NLS-1$
OS.gtk_widget_set_name (tooltipShellHandle, gtk_tooltips);
OS.gtk_widget_realize (tooltipShellHandle);
@@ -44702,7 +44905,7 @@ index c63d83d..e7fb7cb 100644
signalIds = new int [Widget.LAST_SIGNAL];
/* Cache signals for GtkWidget */
-@@ -2593,8 +2593,8 @@ void initializeCallbacks () {
+@@ -2594,8 +2594,8 @@ void initializeCallbacks () {
}
void initializeSubclasses () {
@@ -44713,7 +44916,7 @@ index c63d83d..e7fb7cb 100644
pangoLayoutNewProc = OS.G_OBJECT_CLASS_CONSTRUCTOR (pangoLayoutClass);
OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, OS.pangoLayoutNewProc_CALLBACK(pangoLayoutNewProc));
OS.g_type_class_unref (pangoLayoutClass);
-@@ -2612,10 +2612,10 @@ void initializeSystemSettings () {
+@@ -2613,10 +2613,10 @@ void initializeSystemSettings () {
* fix is to for the initializaion by creating
* a temporary GtkEntry.
*/
@@ -44726,7 +44929,7 @@ index c63d83d..e7fb7cb 100644
OS.g_object_get (settings, OS.gtk_entry_select_on_focus, buffer2, 0);
entrySelectOnFocus = buffer2 [0] != 0;
}
-@@ -2630,9 +2630,9 @@ void initializeWidgetTable () {
+@@ -2631,9 +2631,9 @@ void initializeWidgetTable () {
void initializeWindowManager () {
/* Get the window manager name */
windowManager = ""; //$NON-NLS-1$
@@ -44738,7 +44941,7 @@ index c63d83d..e7fb7cb 100644
if (ptr2 != 0) {
int length = OS.strlen (ptr2);
if (length > 0) {
-@@ -2659,8 +2659,8 @@ void initializeWindowManager () {
+@@ -2660,8 +2660,8 @@ void initializeWindowManager () {
*
* @noreference This method is not intended to be referenced by clients.
*/
@@ -44749,21 +44952,21 @@ index c63d83d..e7fb7cb 100644
if (OS.USE_CAIRO) {
Cairo.cairo_destroy (gc);
} else {
-@@ -2690,10 +2690,10 @@ public void internal_dispose_GC (int /*long*/ hDC, GCData data) {
+@@ -2691,10 +2691,10 @@ public void internal_dispose_GC (int /*long*/ hDC, GCData data) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public int /*long*/ internal_new_GC (GCData data) {
+public long /*int*/ internal_new_GC (GCData data) {
- if (isDisposed()) SWT.error(SWT.ERROR_DEVICE_DISPOSED);
+ if (isDisposed()) error(SWT.ERROR_DEVICE_DISPOSED);
- int /*long*/ root = OS.gdk_get_default_root_window();
- int /*long*/ gc;
+ long /*int*/ root = OS.gdk_get_default_root_window();
+ long /*int*/ gc;
if (OS.USE_CAIRO) {
gc = OS.gdk_cairo_create (root);
- if (gc == 0) SWT.error (SWT.ERROR_NO_HANDLES);
-@@ -2806,7 +2806,7 @@ public Point map (Control from, Control to, int x, int y) {
+ if (gc == 0) error (SWT.ERROR_NO_HANDLES);
+@@ -2807,7 +2807,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) {
@@ -44772,7 +44975,7 @@ index c63d83d..e7fb7cb 100644
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;
-@@ -2814,7 +2814,7 @@ public Point map (Control from, Control to, int x, int y) {
+@@ -2815,7 +2815,7 @@ public Point map (Control from, Control to, int x, int y) {
point.y += origin_y [0];
}
if (to != null) {
@@ -44781,7 +44984,7 @@ index c63d83d..e7fb7cb 100644
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];
-@@ -2883,7 +2883,7 @@ static char mbcsToWcs (char ch) {
+@@ -2884,7 +2884,7 @@ static char mbcsToWcs (char ch) {
return result [0];
}
@@ -44790,7 +44993,7 @@ index c63d83d..e7fb7cb 100644
Widget widget = getWidget (menu);
if (widget == null) return 0;
return widget.menuPositionProc (menu, x, y, push_in, user_data);
-@@ -2935,7 +2935,7 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei
+@@ -2936,7 +2936,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) {
@@ -44799,7 +45002,7 @@ index c63d83d..e7fb7cb 100644
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;
-@@ -2943,7 +2943,7 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei
+@@ -2944,7 +2944,7 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei
rect.y += origin_y [0];
}
if (to != null) {
@@ -44808,7 +45011,7 @@ index c63d83d..e7fb7cb 100644
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];
-@@ -2954,7 +2954,7 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei
+@@ -2955,7 +2955,7 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei
return rect;
}
@@ -44817,7 +45020,7 @@ index c63d83d..e7fb7cb 100644
Widget widget = getWidget (handle);
if (widget == null) return 0;
return widget.hoverProc (handle);
-@@ -3034,13 +3034,13 @@ public boolean post (Event event) {
+@@ -3035,13 +3035,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;
@@ -44833,7 +45036,7 @@ index c63d83d..e7fb7cb 100644
if (keysym != 0) keyCode = OS.XKeysymToKeycode (xDisplay, keysym);
if (keyCode == 0) {
char key = event.character;
-@@ -3122,7 +3122,7 @@ void postEvent (Event event) {
+@@ -3123,7 +3123,7 @@ void postEvent (Event event) {
void putGdkEvents () {
if (gdkEventCount != 0) {
for (int i = 0; i < gdkEventCount; i++) {
@@ -44842,7 +45045,7 @@ index c63d83d..e7fb7cb 100644
Widget widget = gdkEventWidgets [i];
if (widget == null || !widget.isDisposed ()) {
OS.gdk_event_put (event);
-@@ -3381,8 +3381,8 @@ void releaseDisplay () {
+@@ -3382,8 +3382,8 @@ void releaseDisplay () {
signalProc = 0;
/* Dispose subclass */
@@ -44853,7 +45056,7 @@ index c63d83d..e7fb7cb 100644
OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, pangoLayoutNewProc);
OS.g_type_class_unref (pangoLayoutClass);
pangoLayoutNewProc = 0;
-@@ -3441,9 +3441,9 @@ public void removeFilter (int eventType, Listener listener) {
+@@ -3442,9 +3442,9 @@ public void removeFilter (int eventType, Listener listener) {
if (filterTable.size () == 0) filterTable = null;
}
@@ -44865,7 +45068,7 @@ index c63d83d..e7fb7cb 100644
--gdkEventCount;
System.arraycopy (gdkEvents, 1, gdkEvents, 0, gdkEventCount);
System.arraycopy (gdkEventWidgets, 1, gdkEventWidgets, 0, gdkEventCount);
-@@ -3492,7 +3492,7 @@ public void removeListener (int eventType, Listener listener) {
+@@ -3493,7 +3493,7 @@ public void removeListener (int eventType, Listener listener) {
eventTable.unhook (eventType, listener);
}
@@ -44874,7 +45077,7 @@ index c63d83d..e7fb7cb 100644
if (handle != mouseHoverHandle) return;
if (mouseHoverId != 0) OS.g_source_remove (mouseHoverId);
mouseHoverId = 0;
-@@ -3509,7 +3509,7 @@ void removePopup (Menu menu) {
+@@ -3510,7 +3510,7 @@ void removePopup (Menu menu) {
}
}
@@ -44883,7 +45086,7 @@ index c63d83d..e7fb7cb 100644
if (handle == 0) return null;
lastWidget = null;
Widget widget = null;
-@@ -3713,8 +3713,8 @@ public static void setAppVersion (String version) {
+@@ -3714,8 +3714,8 @@ public static void setAppVersion (String version) {
public void setCursorLocation (int x, int y) {
checkDevice ();
if (OS.GDK_WINDOWING_X11 ()) {
@@ -44894,7 +45097,7 @@ index c63d83d..e7fb7cb 100644
OS.XWarpPointer (xDisplay, OS.None, xWindow, 0, 0, 0, 0, x, y);
}
}
-@@ -3782,7 +3782,7 @@ public void setData (String key, Object value) {
+@@ -3783,7 +3783,7 @@ public void setData (String key, Object value) {
}
if (key.equals (ADD_WIDGET_KEY)) {
Object [] data = (Object []) value;
@@ -44903,7 +45106,7 @@ index c63d83d..e7fb7cb 100644
Widget widget = (Widget) data [1];
if (widget != null) {
addWidget (handle, widget);
-@@ -3871,10 +3871,10 @@ public void setData (Object data) {
+@@ -3872,10 +3872,10 @@ public void setData (Object data) {
this.data = data;
}
@@ -44916,7 +45119,7 @@ index c63d83d..e7fb7cb 100644
if (submenu != 0) {
OS.gtk_widget_set_direction (submenu, (int)/*64*/ direction);
OS.gtk_container_forall (submenu, setDirectionProc, direction);
-@@ -3949,9 +3949,9 @@ void showIMWindow (Control control) {
+@@ -3950,9 +3950,9 @@ void showIMWindow (Control control) {
OS.gtk_container_add (preeditWindow, preeditLabel);
OS.gtk_widget_show (preeditLabel);
}
@@ -44929,7 +45132,7 @@ index c63d83d..e7fb7cb 100644
OS.gtk_im_context_get_preedit_string (imHandle, preeditString, pangoAttrs, null);
if (preeditString [0] != 0 && OS.strlen (preeditString [0]) > 0) {
Control widget = control.findBackgroundControl ();
-@@ -4005,7 +4005,7 @@ public boolean sleep () {
+@@ -4006,7 +4006,7 @@ public boolean sleep () {
fds = OS.g_malloc (OS.GPollFD_sizeof () * allocated_nfds);
}
max_priority [0] = timeout [0] = 0;
@@ -44938,7 +45141,7 @@ index c63d83d..e7fb7cb 100644
boolean result = false;
do {
if (OS.g_main_context_acquire (context)) {
-@@ -4016,7 +4016,7 @@ public boolean sleep () {
+@@ -4017,7 +4017,7 @@ public boolean sleep () {
allocated_nfds = nfds;
fds = OS.g_malloc (OS.GPollFD_sizeof() * allocated_nfds);
}
@@ -44947,7 +45150,7 @@ index c63d83d..e7fb7cb 100644
if (poll != 0) {
if (nfds > 0 || timeout [0] != 0) {
/*
-@@ -4110,7 +4110,7 @@ public void timerExec (int milliseconds, Runnable runnable) {
+@@ -4111,7 +4111,7 @@ public void timerExec (int milliseconds, Runnable runnable) {
}
}
@@ -44956,7 +45159,7 @@ index c63d83d..e7fb7cb 100644
if (timerList == null) return 0;
int index = (int)/*64*/i;
if (0 <= index && index < timerList.length) {
-@@ -4122,7 +4122,7 @@ int /*long*/ timerProc (int /*long*/ i) {
+@@ -4123,7 +4123,7 @@ int /*long*/ timerProc (int /*long*/ i) {
return 0;
}
@@ -44965,7 +45168,7 @@ index c63d83d..e7fb7cb 100644
caretId = 0;
if (currentCaret == null) {
return 0;
-@@ -4137,13 +4137,13 @@ int /*long*/ caretProc (int /*long*/ clientData) {
+@@ -4138,13 +4138,13 @@ int /*long*/ caretProc (int /*long*/ clientData) {
return 0;
}
@@ -44981,7 +45184,7 @@ index c63d83d..e7fb7cb 100644
Widget widget = getWidget (user_data);
if (widget == null) return 0;
return widget.sizeRequestProc (handle, arg0, user_data);
-@@ -4201,13 +4201,13 @@ void setCurrentCaret (Caret caret) {
+@@ -4202,13 +4202,13 @@ void setCurrentCaret (Caret caret) {
caretId = OS.g_timeout_add (blinkRate, caretProc, 0);
}
@@ -44997,7 +45200,7 @@ index c63d83d..e7fb7cb 100644
switch((int)/*64*/user_data) {
case STYLE_SET:
settingsChanged = true;
-@@ -4217,14 +4217,14 @@ int /*long*/ signalProc (int /*long*/ gobject, int /*long*/ arg1, int /*long*/ u
+@@ -4218,14 +4218,14 @@ int /*long*/ signalProc (int /*long*/ gobject, int /*long*/ arg1, int /*long*/ u
OS.memmove (gdkEvent, arg1);
if (gdkEvent.type == OS.GDK_PROPERTY_NOTIFY) {
byte[] name = Converter.wcsToMbcs (null, "org.eclipse.swt.filePath.message", true); //$NON-NLS-1$
@@ -45016,7 +45219,7 @@ index c63d83d..e7fb7cb 100644
OS.XGetWindowProperty (OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()), xWindow, atom, 0, -1, true, OS.AnyPropertyType,
type, format, nitems, bytes_after, data);
-@@ -4356,31 +4356,31 @@ static char wcsToMbcs (char ch) {
+@@ -4357,31 +4357,31 @@ static char wcsToMbcs (char ch) {
return 0;
}
@@ -45614,7 +45817,7 @@ index 9323ae3..eba16a0 100644
OS.gtk_widget_hide (labelHandle);
OS.gtk_widget_show (imageHandle);
diff --git a/org/eclipse/swt/widgets/Link.java b/org/eclipse/swt/widgets/Link.java
-index 8810331..edc714d 100644
+index 9d8a7f2..39b470f 100644
--- a/org/eclipse/swt/widgets/Link.java
+++ b/org/eclipse/swt/widgets/Link.java
@@ -281,8 +281,8 @@ public String getText () {
@@ -46544,7 +46747,7 @@ index dae7f61..4bb679f 100644
OS.gtk_widget_add_accelerator (handle, OS.activate, accelGroup, keysym, mask, OS.GTK_ACCEL_VISIBLE);
} else {
diff --git a/org/eclipse/swt/widgets/MessageBox.java b/org/eclipse/swt/widgets/MessageBox.java
-index 953fe2a..d2a8f5b 100644
+index e201230..264c60f 100644
--- a/org/eclipse/swt/widgets/MessageBox.java
+++ b/org/eclipse/swt/widgets/MessageBox.java
@@ -41,7 +41,7 @@ import org.eclipse.swt.internal.gtk.*;
@@ -46567,7 +46770,7 @@ index 953fe2a..d2a8f5b 100644
dialogFlags |= OS.GTK_DIALOG_MODAL;
@@ -154,7 +154,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 (handle == 0) error(SWT.ERROR_NO_HANDLES);
if (parentHandle != 0) {
- int /*long*/ pixbufs = OS.gtk_window_get_icon_list (parentHandle);
+ long /*int*/ pixbufs = OS.gtk_window_get_icon_list (parentHandle);
@@ -46639,7 +46842,7 @@ index 811cecd..4a59edf 100644
OS.gdk_flush ();
}
diff --git a/org/eclipse/swt/widgets/Sash.java b/org/eclipse/swt/widgets/Sash.java
-index f6cd115..80641f8 100644
+index 693b041..ac9d100 100644
--- a/org/eclipse/swt/widgets/Sash.java
+++ b/org/eclipse/swt/widgets/Sash.java
@@ -40,7 +40,7 @@ import org.eclipse.swt.events.*;
@@ -46992,7 +47195,7 @@ index 5eaf82f..7db8f17 100644
GtkRequisition requisition = new GtkRequisition();
OS.gtk_widget_size_request (vBarHandle, requisition);
diff --git a/org/eclipse/swt/widgets/Shell.java b/org/eclipse/swt/widgets/Shell.java
-index c6a1119..595b599 100644
+index e4f6baf..1f9a3ee 100644
--- a/org/eclipse/swt/widgets/Shell.java
+++ b/org/eclipse/swt/widgets/Shell.java
@@ -118,7 +118,7 @@ import org.eclipse.swt.events.*;
@@ -47231,7 +47434,7 @@ index c6a1119..595b599 100644
+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (shellHandle);
+ long /*int*/ cursor = OS.gdk_cursor_new (mode);
OS.gdk_window_set_cursor (window, cursor);
- OS.gdk_cursor_destroy (cursor);
+ OS.gdk_cursor_unref (cursor);
display.resizeMode = mode;
@@ -1344,7 +1344,7 @@ int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) {
return super.gtk_motion_notify_event (widget, event);
@@ -47629,7 +47832,7 @@ index 8b20f25..5b3b4f0 100644
OS.memmove (adjustment, hAdjustment);
adjustment.value = Math.min (Math.max (selection, minimum), maximum - thumb);
diff --git a/org/eclipse/swt/widgets/Spinner.java b/org/eclipse/swt/widgets/Spinner.java
-index 51315b5..81f8b7b 100644
+index 87b57f3..11b0a14 100644
--- a/org/eclipse/swt/widgets/Spinner.java
+++ b/org/eclipse/swt/widgets/Spinner.java
@@ -45,7 +45,7 @@ import org.eclipse.swt.events.*;
@@ -47956,7 +48159,7 @@ index 51315b5..81f8b7b 100644
+ long /*int*/ defaultCursor = 0;
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);
+ if (cursor == 0) OS.gdk_cursor_unref (defaultCursor);
}
-void setFontDescription (int /*long*/ font) {
@@ -49475,7 +49678,7 @@ index e1a78e1..85afb19 100644
if (userData[0] == buttonHandle) {
OS.gdk_window_lower (child);
diff --git a/org/eclipse/swt/widgets/TableItem.java b/org/eclipse/swt/widgets/TableItem.java
-index 105363b..3ffe9af 100644
+index 4217302..adee290 100644
--- a/org/eclipse/swt/widgets/TableItem.java
+++ b/org/eclipse/swt/widgets/TableItem.java
@@ -127,7 +127,7 @@ static Table checkNull (Table control) {
@@ -49765,7 +49968,7 @@ index 105363b..3ffe9af 100644
}
}
diff --git a/org/eclipse/swt/widgets/Text.java b/org/eclipse/swt/widgets/Text.java
-index 9997b89..db2f7ce 100644
+index 75646e9..8f43e11 100644
--- a/org/eclipse/swt/widgets/Text.java
+++ b/org/eclipse/swt/widgets/Text.java
@@ -57,9 +57,9 @@ import org.eclipse.swt.events.*;
@@ -50410,7 +50613,7 @@ index 9997b89..db2f7ce 100644
+ long /*int*/ defaultCursor = 0;
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);
+ if (cursor == 0) OS.gdk_cursor_unref (defaultCursor);
@@ -2071,7 +2071,7 @@ public void setEditable (boolean editable) {
}
}
@@ -50555,10 +50758,10 @@ index 9997b89..db2f7ce 100644
switch ((int)/*64*/user_data) {
case MOVE_CURSOR: {
diff --git a/org/eclipse/swt/widgets/ToolBar.java b/org/eclipse/swt/widgets/ToolBar.java
-index 3d30124..0b913ce 100644
+index e470cd5..f16ac9a 100644
--- a/org/eclipse/swt/widgets/ToolBar.java
+++ b/org/eclipse/swt/widgets/ToolBar.java
-@@ -192,11 +192,11 @@ Widget [] computeTabList () {
+@@ -197,11 +197,11 @@ Widget [] computeTabList () {
return result;
}
@@ -50572,16 +50775,20 @@ index 3d30124..0b913ce 100644
return handle;
}
-@@ -214,7 +214,7 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De
+@@ -219,10 +219,10 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De
}
}
-boolean forceFocus (int /*long*/ focusHandle) {
+boolean forceFocus (long /*int*/ focusHandle) {
- if (lastFocus != null && lastFocus.setFocus ()) return true;
- ToolItem [] items = getItems ();
- for (int i = 0; i < items.length; i++) {
-@@ -283,7 +283,7 @@ public ToolItem getItem (Point point) {
+ int dir = OS.GTK_DIR_TAB_FORWARD;
+ if ((style & SWT.MIRRORED) != 0) dir = OS.GTK_DIR_TAB_BACKWARD;
+- int /*long*/ childHandle = handle;
++ long /*int*/ childHandle = handle;
+ if (currentFocusItem != null) childHandle = currentFocusItem.handle;
+ /*
+ * Feature in GTK. GtkToolBar takes care of navigating through
+@@ -291,7 +291,7 @@ public ToolItem getItem (Point point) {
*/
public int getItemCount () {
checkWidget();
@@ -50590,7 +50797,7 @@ index 3d30124..0b913ce 100644
if (list == 0) return 0;
int itemCount = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -312,13 +312,13 @@ public ToolItem [] getItems () {
+@@ -320,13 +320,13 @@ public ToolItem [] getItems () {
}
ToolItem [] _getItems () {
@@ -50606,7 +50813,7 @@ index 3d30124..0b913ce 100644
Widget widget = display.getWidget (data);
if (widget != null) items [index++] = (ToolItem) widget;
}
-@@ -368,9 +368,9 @@ ToolItem [] _getTabItemList () {
+@@ -376,9 +376,9 @@ ToolItem [] _getTabItemList () {
return tabItemList;
}
@@ -50616,18 +50823,45 @@ index 3d30124..0b913ce 100644
- int /*long*/ result = super.gtk_key_press_event (widget, eventPtr);
+ long /*int*/ result = super.gtk_key_press_event (widget, eventPtr);
if (result != 0) return result;
- ToolItem [] items = getItems ();
- int length = items.length;
-@@ -391,7 +391,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;
-- int /*long*/ topHandle = item.topHandle ();
-+ long /*int*/ topHandle = item.topHandle ();
- 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;
-@@ -453,7 +453,7 @@ public int indexOf (ToolItem item) {
+ GdkEventKey gdkEvent = new GdkEventKey ();
+ OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
+@@ -387,7 +387,7 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
+ if (OS.GTK_VERSION < OS.VERSION (2, 6, 0) && (currentFocusItem != null) && (currentFocusItem.style & SWT.DROP_DOWN) != 0) {
+ Event event = new Event ();
+ event.detail = SWT.ARROW;
+- int /*long*/ topHandle = currentFocusItem.topHandle ();
++ long /*int*/ topHandle = currentFocusItem.topHandle ();
+ 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;
+@@ -403,7 +403,7 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
+ }
+ }
+
+-int /*long*/ gtk_focus (int /*long*/ widget, int /*long*/ directionType) {
++long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ directionType) {
+ return 0;
+ }
+
+@@ -440,7 +440,7 @@ public int indexOf (ToolItem item) {
+ return -1;
+ }
+
+-static int /*long*/ MenuItemSelectedProc (int /*long*/ widget, int /*long*/ user_data) {
++static long /*int*/ MenuItemSelectedProc (long /*int*/ widget, long /*int*/ user_data) {
+ Display display = Display.getCurrent ();
+ ToolItem item = (ToolItem) display.getWidget (user_data);
+ if (item != null) {
+@@ -449,7 +449,7 @@ static int /*long*/ MenuItemSelectedProc (int /*long*/ widget, int /*long*/ user
+ return 0;
+ }
+
+-int /*long*/ menuItemSelected (int /*long*/ widget, ToolItem item) {
++long /*int*/ menuItemSelected (long /*int*/ widget, ToolItem item) {
+ Event event = new Event ();
+ switch (item.style) {
+ case SWT.DROP_DOWN :
+@@ -479,7 +479,7 @@ int /*long*/ menuItemSelected (int /*long*/ widget, ToolItem item) {
boolean mnemonicHit (char key) {
ToolItem [] items = getItems ();
for (int i=0; i<items.length; i++) {
@@ -50636,7 +50870,7 @@ index 3d30124..0b913ce 100644
if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;
}
return false;
-@@ -462,7 +462,7 @@ boolean mnemonicHit (char key) {
+@@ -488,7 +488,7 @@ boolean mnemonicHit (char key) {
boolean mnemonicMatch (char key) {
ToolItem [] items = getItems ();
for (int i=0; i<items.length; i++) {
@@ -50645,7 +50879,7 @@ index 3d30124..0b913ce 100644
if (labelHandle != 0 && mnemonicMatch (labelHandle, key)) return true;
}
return false;
-@@ -519,7 +519,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
+@@ -565,7 +565,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
return result;
}
@@ -50655,43 +50889,41 @@ index 3d30124..0b913ce 100644
ToolItem [] items = getItems ();
for (int i = 0; i < items.length; i++) {
diff --git a/org/eclipse/swt/widgets/ToolItem.java b/org/eclipse/swt/widgets/ToolItem.java
-index ed86124..9e4f285 100644
+index 735b54c..153dc0d 100644
--- a/org/eclipse/swt/widgets/ToolItem.java
+++ b/org/eclipse/swt/widgets/ToolItem.java
-@@ -38,7 +38,7 @@ import org.eclipse.swt.events.*;
+@@ -38,8 +38,8 @@ import org.eclipse.swt.events.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class ToolItem extends Item {
-- int /*long*/ boxHandle, arrowHandle, arrowBoxHandle, separatorHandle, labelHandle, imageHandle;
-+ long /*int*/ boxHandle, arrowHandle, arrowBoxHandle, separatorHandle, labelHandle, imageHandle;
+- int /*long*/ arrowHandle, arrowBoxHandle, labelHandle, imageHandle;
+- int /*long*/ eventHandle, proxyMenuItem;
++ long /*int*/ arrowHandle, arrowBoxHandle, labelHandle, imageHandle;
++ long /*int*/ eventHandle, proxyMenuItem;
ToolBar parent;
Control control;
Image hotImage, disabledImage;
-@@ -252,11 +252,11 @@ void createHandle (int index) {
- }
- OS.GTK_WIDGET_UNSET_FLAGS (handle, OS.GTK_CAN_FOCUS);
- // This code is intentionally commented.
--// int /*long*/ fontHandle = parent.fontHandle ();
-+// long /*int*/ fontHandle = parent.fontHandle ();
- // GdkColor color = new GdkColor ();
--// int /*long*/ style = OS.gtk_widget_get_style (fontHandle);
-+// long /*int*/ style = OS.gtk_widget_get_style (fontHandle);
- // OS.gtk_style_get_fg (style, OS.GTK_STATE_NORMAL, color);
--// int /*long*/ font = OS.gtk_style_get_font_desc (style);
-+// long /*int*/ font = OS.gtk_style_get_font_desc (style);
- // setForegroundColor (color);
- // setFontDescription (font);
- if ((parent.state & FOREGROUND) != 0) {
-@@ -312,7 +312,7 @@ public void dispose () {
+@@ -200,8 +200,8 @@ void createHandle (int index) {
+ * disabled when it does not contain menu. The fix is to
+ * find the arrow button handle and enable it.
+ */
+- int /*long*/ child = OS.gtk_bin_get_child (handle);
+- int /*long*/ list = OS.gtk_container_get_children (child);
++ long /*int*/ child = OS.gtk_bin_get_child (handle);
++ long /*int*/ list = OS.gtk_container_get_children (child);
+ arrowHandle = OS.g_list_nth_data (list, 1);
+ OS.gtk_widget_set_sensitive (arrowHandle, true);
+ OS.gtk_widget_set_size_request(OS.gtk_bin_get_child(arrowHandle), 8, 6);
+@@ -315,7 +315,7 @@ public void dispose () {
public Rectangle getBounds () {
checkWidget();
parent.forceResize ();
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
int x, y, width, height;
- /*
- * Bug in GTK. Toolbar items are only allocated their minimum size
-@@ -401,7 +401,7 @@ public Image getDisabledImage () {
+ x = OS.GTK_WIDGET_X (topHandle);
+ y = OS.GTK_WIDGET_Y (topHandle);
+@@ -378,7 +378,7 @@ public Image getDisabledImage () {
*/
public boolean getEnabled () {
checkWidget();
@@ -50700,7 +50932,7 @@ index ed86124..9e4f285 100644
return OS.GTK_WIDGET_SENSITIVE (topHandle);
}
-@@ -491,11 +491,11 @@ public String getToolTipText () {
+@@ -468,11 +468,11 @@ public String getToolTipText () {
public int getWidth () {
checkWidget();
parent.forceResize ();
@@ -50714,7 +50946,7 @@ index ed86124..9e4f285 100644
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
double x = gdkEvent.x;
-@@ -503,14 +503,14 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
+@@ -480,14 +480,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);
@@ -50731,7 +50963,7 @@ index ed86124..9e4f285 100644
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
double x = gdkEvent.x;
-@@ -518,17 +518,17 @@ int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event)
+@@ -495,21 +495,21 @@ 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);
@@ -50752,16 +50984,50 @@ index ed86124..9e4f285 100644
if (eventPtr != 0) {
GdkEvent gdkEvent = new GdkEvent ();
OS.memmove (gdkEvent, eventPtr, GdkEvent.sizeof);
-@@ -544,7 +544,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;
-- int /*long*/ topHandle = topHandle ();
-+ long /*int*/ topHandle = topHandle ();
- 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);
-@@ -564,7 +564,7 @@ int /*long*/ gtk_clicked (int /*long*/ widget) {
+- int /*long*/ topHandle = topHandle();
++ long /*int*/ topHandle = topHandle();
+ switch (gdkEvent.type) {
+ case OS.GDK_KEY_RELEASE: //Fall Through..
+ case OS.GDK_BUTTON_PRESS:
+@@ -558,7 +558,7 @@ int /*long*/ gtk_clicked (int /*long*/ widget) {
+ return 0;
+ }
+
+-int /*long*/ gtk_create_menu_proxy (int /*long*/ widget) {
++long /*int*/ gtk_create_menu_proxy (long /*int*/ widget) {
+ /*
+ * Feature in GTK. If the item is a radio/check button
+ * with only image, then that image does not appear in
+@@ -582,7 +582,7 @@ int /*long*/ gtk_create_menu_proxy (int /*long*/ widget) {
+ if (imageList != null) {
+ int index = imageList.indexOf (image);
+ if (index != -1) {
+- int /*long*/ pixbuf = imageList.getPixbuf (index);
++ long /*int*/ pixbuf = imageList.getPixbuf (index);
+ byte[] label = null;
+ int [] showImages = new int [1];
+ /*
+@@ -590,7 +590,7 @@ int /*long*/ gtk_create_menu_proxy (int /*long*/ widget) {
+ * warnings to the console. If there is no text then the tooltip text
+ * will be used for overflow menu items.
+ */
+-// int /*long*/ settings = OS.gtk_settings_get_default();
++// long /*int*/ settings = OS.gtk_settings_get_default();
+ // if (settings != 0) {
+ // OS.g_object_get (settings, OS.gtk_menu_images, showImages, 0);
+ // }
+@@ -613,8 +613,8 @@ int /*long*/ gtk_create_menu_proxy (int /*long*/ widget) {
+ else {
+ label = Converter.wcsToMbcs(null, text, true);
+ }
+- int /*long*/ menuItem = OS.gtk_image_menu_item_new_with_label (label);
+- int /*long*/ menuImage = OS.gtk_image_new_from_pixbuf (pixbuf);
++ long /*int*/ menuItem = OS.gtk_image_menu_item_new_with_label (label);
++ long /*int*/ menuImage = OS.gtk_image_new_from_pixbuf (pixbuf);
+ OS.gtk_image_menu_item_set_image (menuItem, menuImage);
+ OS.gtk_tool_item_set_proxy_menu_item (widget, buffer, menuItem);
+ /*
+@@ -631,7 +631,7 @@ int /*long*/ gtk_create_menu_proxy (int /*long*/ widget) {
return 0;
}
@@ -50769,17 +51035,17 @@ index ed86124..9e4f285 100644
+long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) {
parent.gtk_enter_notify_event (widget, event);
drawHotImage = (parent.style & SWT.FLAT) != 0 && hotImage != null;
- if (drawHotImage && imageHandle != 0) {
-@@ -572,7 +572,7 @@ int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {
+ if (drawHotImage) {
+@@ -639,7 +639,7 @@ int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {
if (imageList != null) {
int index = imageList.indexOf (hotImage);
if (index != -1) {
- int /*long*/ pixbuf = imageList.getPixbuf (index);
+ long /*int*/ pixbuf = imageList.getPixbuf (index);
- OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
- }
- }
-@@ -580,7 +580,7 @@ int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {
+ imageHandle = OS.gtk_image_new_from_pixbuf (pixbuf);
+ OS.gtk_widget_show (imageHandle);
+ OS.gtk_tool_button_set_icon_widget (handle, imageHandle);
+@@ -649,7 +649,7 @@ int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {
return 0;
}
@@ -50788,14 +51054,20 @@ index ed86124..9e4f285 100644
GdkEvent event = new GdkEvent ();
OS.memmove (event, gdkEvent, GdkEvent.sizeof);
switch (event.type) {
-@@ -596,13 +596,13 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
+@@ -665,18 +665,18 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
+ return 0;
+ }
+
+-int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) {
++long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) {
+ parent.hasChildFocus = true;
+ parent.currentFocusItem = this;
return 0;
}
-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {
- OS.GTK_WIDGET_UNSET_FLAGS (handle, OS.GTK_CAN_FOCUS);
- parent.lastFocus = this;
+ parent.hasChildFocus = false;
return 0;
}
@@ -50804,16 +51076,16 @@ index ed86124..9e4f285 100644
parent.gtk_leave_notify_event (widget, event);
if (drawHotImage) {
drawHotImage = false;
-@@ -611,7 +611,7 @@ int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) {
+@@ -685,7 +685,7 @@ int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) {
if (imageList != null) {
int index = imageList.indexOf (image);
if (index != -1) {
- int /*long*/ pixbuf = imageList.getPixbuf (index);
+ long /*int*/ pixbuf = imageList.getPixbuf (index);
- OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
- }
- }
-@@ -620,12 +620,12 @@ int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) {
+ imageHandle = OS.gtk_image_new_from_pixbuf (pixbuf);
+ OS.gtk_widget_show (imageHandle);
+ OS.gtk_tool_button_set_icon_widget (handle, imageHandle);
+@@ -696,12 +696,12 @@ int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) {
return 0;
}
@@ -50828,16 +51100,25 @@ index ed86124..9e4f285 100644
return parent.gtk_mnemonic_activate (widget, arg1);
}
-@@ -662,7 +662,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);
+@@ -716,7 +716,7 @@ void hookEvents () {
+ */
+ eventHandle = OS.gtk_bin_get_child(handle);
+ if ((style & SWT.DROP_DOWN) != 0 && OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) {
+- int /*long*/ list = OS.gtk_container_get_children(eventHandle);
++ long /*int*/ list = OS.gtk_container_get_children(eventHandle);
+ eventHandle = OS.g_list_nth_data(list, 0);
+ if (arrowHandle != 0) OS.g_signal_connect_closure (arrowHandle, OS.clicked, display.closures [CLICKED], false);
+ }
+@@ -745,7 +745,7 @@ void hookEvents () {
+ OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [BUTTON_RELEASE_EVENT], 0, display.closures [BUTTON_RELEASE_EVENT], false);
+ OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [EVENT_AFTER], 0, display.closures[EVENT_AFTER], false);
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
OS.g_signal_connect_closure_by_id (topHandle, display.signalIds [MAP], 0, display.closures [MAP], true);
}
-@@ -846,7 +846,7 @@ public void setDisabledImage (Image image) {
+@@ -927,7 +927,7 @@ public void setDisabledImage (Image image) {
*/
public void setEnabled (boolean enabled) {
checkWidget();
@@ -50846,26 +51127,26 @@ index ed86124..9e4f285 100644
if (OS.GTK_WIDGET_SENSITIVE (topHandle) == enabled) return;
OS.gtk_widget_set_sensitive (topHandle, enabled);
if (enabled) {
-@@ -888,7 +888,7 @@ boolean setFocus () {
- return result;
+@@ -961,7 +961,7 @@ boolean setFocus () {
+ return OS.gtk_widget_child_focus (handle, OS.GTK_DIR_TAB_FORWARD);
}
-void setFontDescription (int /*long*/ font) {
+void setFontDescription (long /*int*/ font) {
- 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);
-@@ -947,7 +947,7 @@ public void setImage (Image image) {
+ }
+
+@@ -1015,7 +1015,7 @@ public void setImage (Image image) {
} else {
imageList.put (imageIndex, image);
}
- int /*long*/ pixbuf = imageList.getPixbuf (imageIndex);
+ long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
- OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
+ imageHandle = OS.gtk_image_new_from_pixbuf (pixbuf);
OS.gtk_widget_show (imageHandle);
} else {
diff --git a/org/eclipse/swt/widgets/ToolTip.java b/org/eclipse/swt/widgets/ToolTip.java
-index 50e2191..bff595b 100644
+index 725ba5a..7153dbb 100644
--- a/org/eclipse/swt/widgets/ToolTip.java
+++ b/org/eclipse/swt/widgets/ToolTip.java
@@ -46,7 +46,7 @@ public class ToolTip extends Widget {
@@ -51183,7 +51464,7 @@ index f24b0b0..b12c59f 100644
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 --git a/org/eclipse/swt/widgets/TrayItem.java b/org/eclipse/swt/widgets/TrayItem.java
-index 3c465a5..d116a16 100644
+index ae1774b..e16ca7e 100644
--- a/org/eclipse/swt/widgets/TrayItem.java
+++ b/org/eclipse/swt/widgets/TrayItem.java
@@ -40,8 +40,8 @@ public class TrayItem extends Item {
@@ -51279,7 +51560,7 @@ index 3c465a5..d116a16 100644
Rectangle b = image.getBounds();
- int /*long*/ gdkImagePtr = OS.gdk_drawable_get_image (image.mask, 0, 0, b.width, b.height);
+ long /*int*/ gdkImagePtr = OS.gdk_drawable_get_image (image.mask, 0, 0, b.width, b.height);
- if (gdkImagePtr == 0) SWT.error(SWT.ERROR_NO_HANDLES);
+ if (gdkImagePtr == 0) error(SWT.ERROR_NO_HANDLES);
GdkImage gdkImage = new GdkImage();
OS.memmove (gdkImage, gdkImagePtr);
@@ -326,7 +326,7 @@ int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
@@ -52610,7 +52891,7 @@ index 8e835e8..e2b2a22 100644
if (userData[0] == buttonHandle) {
OS.gdk_window_lower (child);
diff --git a/org/eclipse/swt/widgets/TreeItem.java b/org/eclipse/swt/widgets/TreeItem.java
-index 6c6ad36..8da5d1b 100644
+index f495ce1..8979727 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) {
@@ -52985,7 +53266,7 @@ index 6c6ad36..8da5d1b 100644
}
}
diff --git a/org/eclipse/swt/widgets/Widget.java b/org/eclipse/swt/widgets/Widget.java
-index 9d223ba..e0bb667 100644
+index 6d1b2cb..d7cabed 100644
--- a/org/eclipse/swt/widgets/Widget.java
+++ b/org/eclipse/swt/widgets/Widget.java
@@ -56,7 +56,7 @@ public abstract class Widget {
@@ -52997,7 +53278,7 @@ index 9d223ba..e0bb667 100644
int style, state;
Display display;
EventTable eventTable;
-@@ -297,7 +297,7 @@ public void addDisposeListener (DisposeListener listener) {
+@@ -298,7 +298,7 @@ public void addDisposeListener (DisposeListener listener) {
addListener (SWT.Dispose, typedListener);
}
@@ -53006,7 +53287,7 @@ index 9d223ba..e0bb667 100644
return 0;
}
-@@ -313,7 +313,7 @@ static int checkBits (int style, int int0, int int1, int int2, int int3, int int
+@@ -314,7 +314,7 @@ static int checkBits (int style, int int0, int int1, int int2, int int3, int int
return style;
}
@@ -53015,7 +53296,7 @@ index 9d223ba..e0bb667 100644
return 0;
}
-@@ -434,7 +434,7 @@ void deregister () {
+@@ -435,7 +435,7 @@ void deregister () {
}
void destroyWidget () {
@@ -53024,7 +53305,7 @@ index 9d223ba..e0bb667 100644
releaseHandle ();
if (topHandle != 0 && (state & HANDLE) != 0) {
OS.gtk_widget_destroy (topHandle);
-@@ -633,281 +633,281 @@ public int getStyle () {
+@@ -634,285 +634,285 @@ public int getStyle () {
}
@@ -53068,6 +53349,11 @@ index 9d223ba..e0bb667 100644
return 0;
}
+-int /*long*/ gtk_create_menu_proxy (int /*long*/ widget) {
++long /*int*/ gtk_create_menu_proxy (long /*int*/ widget) {
+ return 0;
+ }
+
-int /*long*/ gtk_day_selected (int /*long*/ widget) {
+long /*int*/ gtk_day_selected (long /*int*/ widget) {
return 0;
@@ -53376,7 +53662,7 @@ index 9d223ba..e0bb667 100644
return 0;
}
-@@ -915,11 +915,11 @@ boolean filters (int eventType) {
+@@ -920,11 +920,11 @@ boolean filters (int eventType) {
return display.filters (eventType);
}
@@ -53390,7 +53676,7 @@ index 9d223ba..e0bb667 100644
return OS.Call (Display.oldFixedSizeAllocateProc, widget, allocationPtr);
}
-@@ -1022,15 +1022,15 @@ boolean hooks (int eventType) {
+@@ -1027,15 +1027,15 @@ boolean hooks (int eventType) {
return eventTable.hooks (eventType);
}
@@ -53409,7 +53695,7 @@ index 9d223ba..e0bb667 100644
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);
-@@ -1038,13 +1038,13 @@ boolean mnemonicHit (int /*long*/ mnemonicHandle, char key) {
+@@ -1043,13 +1043,13 @@ boolean mnemonicHit (int /*long*/ mnemonicHandle, char key) {
return result;
}
@@ -53425,7 +53711,7 @@ index 9d223ba..e0bb667 100644
OS.gtk_widget_modify_style (handle, style);
}
-@@ -1189,11 +1189,11 @@ protected void removeListener (int eventType, SWTEventListener handler) {
+@@ -1194,11 +1194,11 @@ protected void removeListener (int eventType, SWTEventListener handler) {
eventTable.unhook (eventType, handler);
}
@@ -53439,7 +53725,7 @@ index 9d223ba..e0bb667 100644
return 0;
}
-@@ -1324,7 +1324,7 @@ boolean sendKeyEvent (int type, GdkEventKey keyEvent) {
+@@ -1329,7 +1329,7 @@ boolean sendKeyEvent (int type, GdkEventKey keyEvent) {
char [] sendIMKeyEvent (int type, GdkEventKey keyEvent, char [] chars) {
int index = 0, count = 0, state = 0;
@@ -53448,7 +53734,7 @@ index 9d223ba..e0bb667 100644
if (keyEvent == null) {
ptr = OS.gtk_get_current_event ();
if (ptr != 0) {
-@@ -1388,7 +1388,7 @@ void sendSelectionEvent (int eventType, Event event, boolean send) {
+@@ -1393,7 +1393,7 @@ void sendSelectionEvent (int eventType, Event event, boolean send) {
return;
}
if (event == null) event = new Event ();
@@ -53457,7 +53743,7 @@ index 9d223ba..e0bb667 100644
if (ptr != 0) {
GdkEvent gdkEvent = new GdkEvent ();
OS.memmove (gdkEvent, ptr, GdkEvent.sizeof);
-@@ -1522,8 +1522,8 @@ public void setData (String key, Object value) {
+@@ -1527,8 +1527,8 @@ public void setData (String key, Object value) {
if (key.equals(SWT.SKIN_CLASS) || key.equals(SWT.SKIN_ID)) this.reskin(SWT.ALL);
}
@@ -53468,7 +53754,7 @@ index 9d223ba..e0bb667 100644
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);
-@@ -1657,15 +1657,15 @@ boolean setTabItemFocus (boolean next) {
+@@ -1662,15 +1662,15 @@ boolean setTabItemFocus (boolean next) {
return false;
}
@@ -53487,7 +53773,7 @@ index 9d223ba..e0bb667 100644
return 0;
}
-@@ -1684,11 +1684,11 @@ public String toString () {
+@@ -1689,11 +1689,11 @@ public String toString () {
return getName () + " {" + string + "}";
}
@@ -53501,7 +53787,7 @@ index 9d223ba..e0bb667 100644
return 0;
}
-@@ -1696,7 +1696,7 @@ boolean translateTraversal (int event) {
+@@ -1701,7 +1701,7 @@ boolean translateTraversal (int event) {
return false;
}
@@ -53510,7 +53796,7 @@ index 9d223ba..e0bb667 100644
switch ((int)/*64*/user_data) {
case ACTIVATE: return gtk_activate (handle);
case CHANGED: return gtk_changed (handle);
-@@ -1722,13 +1722,13 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) {
+@@ -1728,13 +1728,13 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) {
}
}
@@ -53527,7 +53813,7 @@ index 9d223ba..e0bb667 100644
if (window != paintWindow) return 0;
return (state & OBSCURED) != 0 ? 1 : 0;
}
-@@ -1771,7 +1771,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ us
+@@ -1777,7 +1777,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ us
}
}
@@ -53536,7 +53822,7 @@ index 9d223ba..e0bb667 100644
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);
-@@ -1787,7 +1787,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ ar
+@@ -1793,7 +1793,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ ar
}
}
@@ -53546,5 +53832,5 @@ index 9d223ba..e0bb667 100644
case CHANGE_VALUE: return gtk_change_value (handle, arg0, arg1, arg2);
case EXPAND_COLLAPSE_CURSOR_ROW: return gtk_expand_collapse_cursor_row (handle, arg0, arg1, arg2);
--
-1.7.9.1
+1.7.10
--
Debian packaging for swt-gtk.
More information about the pkg-java-commits
mailing list