[SCM] Debian packaging for swt-gtk. branch, master, updated. debian/3.8.0_rc4-1-10-gffe7b54
Jakub Adam
jakub.adam at ktknet.cz
Thu Apr 4 17:51:38 UTC 2013
The following commit has been merged in the master branch:
commit c2ab4a86fe7fdf85ec5b05a76da13bef51f9a5e7
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Thu Apr 4 17:42:13 2013 +0200
Updated arch64.diff for new upstream release
diff --git a/debian/changelog b/debian/changelog
index d1d30a8..f4d1f02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ swt-gtk (3.8.2-1) UNRELEASED; urgency=low
* New upstream release.
* Add fix for compatibility with libwebkitgtk-1.0-0 1.11.91-1
(Closes: #704516).
+ * Updated arch64.diff patch for new upstream release.
-- Jakub Adam <jakub.adam at ktknet.cz> Thu, 04 Apr 2013 17:40:20 +0200
diff --git a/debian/patches/64/arch64.diff b/debian/patches/64/arch64.diff
index c3e4b11..300132f 100644
--- a/debian/patches/64/arch64.diff
+++ b/debian/patches/64/arch64.diff
@@ -1,7 +1,7 @@
-From 2db7f03b66da4805dfd4b737b3ea5e038b847bb0 Mon Sep 17 00:00:00 2001
+From 40ca684f2e41541516c4fb861e1615f9ad042658 Mon Sep 17 00:00:00 2001
From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Tue, 2 Apr 2013 22:59:01 +0200
-Subject: [PATCH 2/2] arch64
+Date: Thu, 4 Apr 2013 17:28:50 +0200
+Subject: [PATCH] arch64.diff
---
org/eclipse/swt/accessibility/Accessible.java | 10 +-
@@ -24,7 +24,7 @@ Subject: [PATCH 2/2] arch64
.../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 | 524 +--
+ 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 +-
@@ -116,7 +116,7 @@ Subject: [PATCH 2/2] arch64
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 | 4974 ++++++++++----------
+ org/eclipse/swt/internal/gtk/OS.java | 4986 ++++++++++----------
org/eclipse/swt/internal/gtk/PangoAttribute.java | 2 +-
org/eclipse/swt/internal/gtk/PangoItem.java | 10 +-
org/eclipse/swt/internal/gtk/PangoLayoutLine.java | 4 +-
@@ -262,7 +262,7 @@ Subject: [PATCH 2/2] arch64
org/eclipse/swt/widgets/Canvas.java | 36 +-
org/eclipse/swt/widgets/Caret.java | 10 +-
org/eclipse/swt/widgets/ColorDialog.java | 20 +-
- org/eclipse/swt/widgets/Combo.java | 128 +-
+ org/eclipse/swt/widgets/Combo.java | 134 +-
org/eclipse/swt/widgets/Composite.java | 128 +-
org/eclipse/swt/widgets/Control.java | 364 +-
org/eclipse/swt/widgets/DateTime.java | 8 +-
@@ -292,21 +292,21 @@ Subject: [PATCH 2/2] arch64
org/eclipse/swt/widgets/Spinner.java | 114 +-
org/eclipse/swt/widgets/TabFolder.java | 42 +-
org/eclipse/swt/widgets/TabItem.java | 10 +-
- org/eclipse/swt/widgets/Table.java | 342 +-
+ org/eclipse/swt/widgets/Table.java | 356 +-
org/eclipse/swt/widgets/TableColumn.java | 28 +-
- org/eclipse/swt/widgets/TableItem.java | 94 +-
+ org/eclipse/swt/widgets/TableItem.java | 92 +-
org/eclipse/swt/widgets/Text.java | 214 +-
org/eclipse/swt/widgets/ToolBar.java | 32 +-
- org/eclipse/swt/widgets/ToolItem.java | 68 +-
+ org/eclipse/swt/widgets/ToolItem.java | 72 +-
org/eclipse/swt/widgets/ToolTip.java | 54 +-
org/eclipse/swt/widgets/TouchSource.java | 4 +-
org/eclipse/swt/widgets/Tracker.java | 26 +-
org/eclipse/swt/widgets/TrayItem.java | 40 +-
- org/eclipse/swt/widgets/Tree.java | 360 +-
+ org/eclipse/swt/widgets/Tree.java | 374 +-
org/eclipse/swt/widgets/TreeColumn.java | 28 +-
- org/eclipse/swt/widgets/TreeItem.java | 118 +-
- org/eclipse/swt/widgets/Widget.java | 198 +-
- 302 files changed, 9018 insertions(+), 9018 deletions(-)
+ org/eclipse/swt/widgets/TreeItem.java | 116 +-
+ org/eclipse/swt/widgets/Widget.java | 200 +-
+ 302 files changed, 9042 insertions(+), 9042 deletions(-)
diff --git a/org/eclipse/swt/accessibility/Accessible.java b/org/eclipse/swt/accessibility/Accessible.java
index 9c2821c..2b8fcc0 100644
@@ -4622,7 +4622,7 @@ index cc0f34d..1f4a55a 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 2218d1b..3890e09 100644
+index 5fb1177..40f2af1 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.*;
@@ -4641,7 +4641,7 @@ index 2218d1b..3890e09 100644
- int /*long*/ request, badCertRequest;
+ long /*int*/ request, badCertRequest;
Point location, size;
- boolean visible, isChild, ignoreDispose, isRetrievingBadCert, isViewingErrorPage, ignoreAllMessages, untrustedText;
+ boolean visible, isActive, isChild, ignoreDispose, isRetrievingBadCert, isViewingErrorPage, ignoreAllMessages, untrustedText;
boolean updateLastNavigateUrl;
@@ -124,7 +124,7 @@ class Mozilla extends WebBrowser {
public void handleEvent (Event event) {
@@ -4998,7 +4998,7 @@ index 2218d1b..3890e09 100644
if (!IsPre_1_9) {
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -1332,13 +1332,13 @@ public boolean execute (String script) {
+@@ -1336,13 +1336,13 @@ public boolean execute (String script) {
interfaceRequestor.Release ();
if (rc == XPCOM.NS_OK && result[0] != 0) {
@@ -5014,7 +5014,7 @@ index 2218d1b..3890e09 100644
new nsISupports (scriptGlobalObject).Release ();
if (scriptContext != 0) {
-@@ -1361,7 +1361,7 @@ public boolean execute (String script) {
+@@ -1365,7 +1365,7 @@ public boolean execute (String script) {
new nsISupports (result[0]).Release ();
result[0] = 0;
@@ -5023,7 +5023,7 @@ index 2218d1b..3890e09 100644
if (nativeContext != 0) {
int length = script.length ();
char[] scriptChars = new char[length];
-@@ -1369,11 +1369,11 @@ public boolean execute (String script) {
+@@ -1373,11 +1373,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) {
@@ -5037,7 +5037,7 @@ index 2218d1b..3890e09 100644
if (globalJSObject != 0) {
aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_CONTEXTSTACK_CONTRACTID, true);
rc = serviceManager.GetServiceByContractID (aContractID, nsIJSContextStack.NS_IJSCONTEXTSTACK_IID, result);
-@@ -1423,12 +1423,12 @@ public boolean execute (String script) {
+@@ -1427,12 +1427,12 @@ public boolean execute (String script) {
return rc == XPCOM.NS_OK;
}
@@ -5053,7 +5053,7 @@ index 2218d1b..3890e09 100644
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-@@ -1448,7 +1448,7 @@ static Browser getBrowser (int /*long*/ aDOMWindow) {
+@@ -1452,7 +1452,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);
@@ -5062,7 +5062,7 @@ index 2218d1b..3890e09 100644
result[0] = 0;
rc = windowWatcher.GetChromeForWindow (topDOMWindow, result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-@@ -1478,7 +1478,7 @@ static Browser getBrowser (int /*long*/ aDOMWindow) {
+@@ -1482,7 +1482,7 @@ static Browser getBrowser (int /*long*/ aDOMWindow) {
public boolean forward () {
htmlBytes = null;
@@ -5071,7 +5071,7 @@ index 2218d1b..3890e09 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);
-@@ -1511,7 +1511,7 @@ static String getMozillaPath () {
+@@ -1515,7 +1515,7 @@ static String getMozillaPath () {
if (LocationProvider != null) return LocationProvider.mozillaPath;
if (!Initialized) return "";
@@ -5080,7 +5080,7 @@ index 2218d1b..3890e09 100644
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -1541,11 +1541,11 @@ static String getMozillaPath () {
+@@ -1545,11 +1545,11 @@ static String getMozillaPath () {
nsIFile mozillaDir = new nsIFile (result[0]);
result[0] = 0;
@@ -5094,7 +5094,7 @@ index 2218d1b..3890e09 100644
char[] chars = new char[length];
XPCOM.memmove (chars, ptr, length * 2);
XPCOM.nsEmbedString_delete (path);
-@@ -1559,7 +1559,7 @@ int getNextFunctionIndex () {
+@@ -1563,7 +1563,7 @@ int getNextFunctionIndex () {
}
public String getText () {
@@ -5103,7 +5103,7 @@ index 2218d1b..3890e09 100644
int rc = webBrowser.GetContentDOMWindow (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -1571,7 +1571,7 @@ public String getText () {
+@@ -1575,7 +1575,7 @@ public String getText () {
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
window.Release ();
@@ -5112,7 +5112,7 @@ index 2218d1b..3890e09 100644
result[0] = 0;
rc = XPCOM.NS_GetComponentManager (result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -1588,12 +1588,12 @@ public String getText () {
+@@ -1592,12 +1592,12 @@ public String getText () {
nsIDOMSerializer_1_7 serializer = new nsIDOMSerializer_1_7 (result[0]);
result[0] = 0;
@@ -5127,7 +5127,7 @@ index 2218d1b..3890e09 100644
chars = new char[length];
XPCOM.memmove (chars, buffer, length * 2);
XPCOM.nsEmbedString_delete (string);
-@@ -1618,13 +1618,13 @@ public String getText () {
+@@ -1622,13 +1622,13 @@ public String getText () {
}
public String getUrl () {
@@ -5143,7 +5143,7 @@ index 2218d1b..3890e09 100644
rc = webNavigation.GetCurrentURI (aCurrentURI);
if (rc != XPCOM.NS_OK) error (rc);
webNavigation.Release ();
-@@ -1632,11 +1632,11 @@ public String getUrl () {
+@@ -1636,11 +1636,11 @@ public String getUrl () {
byte[] dest = null;
if (aCurrentURI[0] != 0) {
nsIURI uri = new nsIURI (aCurrentURI[0]);
@@ -5157,7 +5157,7 @@ index 2218d1b..3890e09 100644
dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
XPCOM.nsEmbedCString_delete (aSpec);
-@@ -1699,29 +1699,29 @@ static String InitDiscoverXULRunner () {
+@@ -1703,29 +1703,29 @@ static String InitDiscoverXULRunner () {
GREVersionRange range = new GREVersionRange ();
byte[] bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_LOWER, true);
@@ -5192,7 +5192,7 @@ index 2218d1b..3890e09 100644
int rc = XPCOMInit.GRE_GetGREPathWithProperties (range, 1, property, 1, greBuffer, length);
if (rc != XPCOM.NS_OK) {
-@@ -1787,7 +1787,7 @@ void initExternal (String profilePath) {
+@@ -1784,7 +1784,7 @@ void initExternal (String profilePath) {
}
void initFactories (nsIServiceManager serviceManager, nsIComponentManager componentManager, boolean isXULRunner) {
@@ -5201,7 +5201,7 @@ index 2218d1b..3890e09 100644
int rc = componentManager.QueryInterface (nsIComponentRegistrar.NS_ICOMPONENTREGISTRAR_IID, result);
if (rc != XPCOM.NS_OK) {
-@@ -1921,7 +1921,7 @@ void initJavaXPCOM (String mozillaPath) {
+@@ -1918,7 +1918,7 @@ void initJavaXPCOM (String mozillaPath) {
String initMozilla (String mozillaPath) {
/* attempt to use the GRE pointed at by MOZILLA_FIVE_HOME */
@@ -5210,7 +5210,7 @@ index 2218d1b..3890e09 100644
if (ptr != 0) {
int length = C.strlen (ptr);
byte[] buffer = new byte[length];
-@@ -1975,7 +1975,7 @@ String initMozilla (String mozillaPath) {
+@@ -1972,7 +1972,7 @@ String initMozilla (String mozillaPath) {
}
void initXPCOM (String mozillaPath, boolean isXULRunner) {
@@ -5219,7 +5219,7 @@ index 2218d1b..3890e09 100644
nsEmbedString pathString = new nsEmbedString (mozillaPath);
int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
-@@ -1994,7 +1994,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
+@@ -1991,7 +1991,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 */
@@ -5228,7 +5228,7 @@ index 2218d1b..3890e09 100644
C.memset (ptr, 0, size * 2);
nsDynamicFunctionLoad functionLoad = new nsDynamicFunctionLoad ();
-@@ -2006,7 +2006,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
+@@ -2003,7 +2003,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);
@@ -5237,7 +5237,7 @@ index 2218d1b..3890e09 100644
XPCOM.memmove (ptr, functionLoad, XPCOM.nsDynamicFunctionLoad_sizeof ());
rc = XPCOM.XPCOMGlueLoadXULFunctions (ptr);
if (rc == XPCOM.NS_OK) {
-@@ -2029,7 +2029,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
+@@ -2026,7 +2026,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
}
C.memmove (result, functionLoad.function, C.PTR_SIZEOF);
@@ -5246,7 +5246,7 @@ index 2218d1b..3890e09 100644
result[0] = 0;
C.free (functionLoad.function);
C.free (functionLoad.functionName);
-@@ -2058,7 +2058,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
+@@ -2055,7 +2055,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
}
void initPreferences (nsIServiceManager serviceManager, nsIComponentManager componentManager) {
@@ -5255,7 +5255,7 @@ index 2218d1b..3890e09 100644
/*
* As a result of using a common profile the user cannot change their locale
-@@ -2417,7 +2417,7 @@ void initPreferences (nsIServiceManager serviceManager, nsIComponentManager comp
+@@ -2414,7 +2414,7 @@ void initPreferences (nsIServiceManager serviceManager, nsIComponentManager comp
}
void initProfile (nsIServiceManager serviceManager, boolean isXULRunner) {
@@ -5264,7 +5264,7 @@ index 2218d1b..3890e09 100644
byte[] buffer = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_OBSERVER_CONTRACTID, true);
int rc = serviceManager.GetServiceByContractID (buffer, nsIObserverService.NS_IOBSERVERSERVICE_IID, result);
-@@ -2452,18 +2452,18 @@ void initProfile (nsIServiceManager serviceManager, boolean isXULRunner) {
+@@ -2449,18 +2449,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 */
@@ -5286,7 +5286,7 @@ index 2218d1b..3890e09 100644
result[0] = 0;
C.free (functionLoad.function);
C.free (functionLoad.functionName);
-@@ -2481,7 +2481,7 @@ void initProfile (nsIServiceManager serviceManager, boolean isXULRunner) {
+@@ -2478,7 +2478,7 @@ void initProfile (nsIServiceManager serviceManager, boolean isXULRunner) {
void initSpinup (nsIComponentManager componentManager) {
if (MozillaDelegate.needsSpinup ()) {
@@ -5295,7 +5295,7 @@ index 2218d1b..3890e09 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);
-@@ -2518,7 +2518,7 @@ void initWebBrowserWindows () {
+@@ -2515,7 +2515,7 @@ void initWebBrowserWindows () {
error (rc);
}
@@ -5304,7 +5304,7 @@ index 2218d1b..3890e09 100644
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
if (rc != XPCOM.NS_OK) {
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
-@@ -2564,7 +2564,7 @@ void initWindowCreator (nsIServiceManager serviceManager) {
+@@ -2561,7 +2561,7 @@ void initWindowCreator (nsIServiceManager serviceManager) {
WindowCreator = new WindowCreator2 ();
WindowCreator.AddRef ();
@@ -5313,7 +5313,7 @@ index 2218d1b..3890e09 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) {
-@@ -2613,7 +2613,7 @@ String initXULRunner (String mozillaPath) {
+@@ -2610,7 +2610,7 @@ String initXULRunner (String mozillaPath) {
}
public boolean isBackEnabled () {
@@ -5322,7 +5322,7 @@ index 2218d1b..3890e09 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);
-@@ -2626,7 +2626,7 @@ public boolean isBackEnabled () {
+@@ -2623,7 +2623,7 @@ public boolean isBackEnabled () {
}
public boolean isForwardEnabled () {
@@ -5331,7 +5331,7 @@ index 2218d1b..3890e09 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);
-@@ -2668,7 +2668,7 @@ void onDispose (Display display) {
+@@ -2665,7 +2665,7 @@ void onDispose (Display display) {
unhookDOMListeners ();
@@ -5340,25 +5340,25 @@ index 2218d1b..3890e09 100644
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
if (rc != XPCOM.NS_OK) {
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
-@@ -2716,7 +2716,7 @@ void onDispose (Display display) {
- }
+@@ -2714,7 +2714,7 @@ void onDispose (Display display) {
void Activate () {
+ isActive = true;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
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);
-@@ -2728,7 +2728,7 @@ void Activate () {
- }
+@@ -2727,7 +2727,7 @@ void Activate () {
void Deactivate () {
+ isActive = false;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
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);
-@@ -2739,11 +2739,11 @@ void Deactivate () {
+@@ -2738,11 +2738,11 @@ void Deactivate () {
webBrowserFocus.Release ();
}
@@ -5372,7 +5372,7 @@ index 2218d1b..3890e09 100644
byte[] postData = null;
final Vector headers = new Vector ();
int rc = request.QueryInterface (nsIUploadChannel.NS_IUPLOADCHANNEL_IID, result);
-@@ -2803,37 +2803,37 @@ void navigate (int /*long*/ requestHandle) {
+@@ -2802,37 +2802,37 @@ void navigate (int /*long*/ requestHandle) {
/* get the request headers */
XPCOMObject visitor = new XPCOMObject (new int[] {2, 0, 0, 2}) {
int refCount = 0;
@@ -5421,7 +5421,7 @@ index 2218d1b..3890e09 100644
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
String header = new String (dest);
-@@ -2868,11 +2868,11 @@ void navigate (int /*long*/ requestHandle) {
+@@ -2867,11 +2867,11 @@ void navigate (int /*long*/ requestHandle) {
/* a request's name often (but not always) is its url */
String url = lastNavigateURL;
@@ -5435,7 +5435,7 @@ index 2218d1b..3890e09 100644
byte[] bytes = new byte[length];
XPCOM.memmove (bytes, buffer, length);
String value = new String (bytes);
-@@ -2888,7 +2888,7 @@ void onResize () {
+@@ -2887,7 +2887,7 @@ void onResize () {
int width = Math.max (1, rect.width);
int height = Math.max (1, rect.height);
@@ -5444,7 +5444,7 @@ index 2218d1b..3890e09 100644
int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
if (rc != XPCOM.NS_OK) {
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
-@@ -2906,7 +2906,7 @@ void onResize () {
+@@ -2905,7 +2905,7 @@ void onResize () {
public void refresh () {
htmlBytes = null;
@@ -5453,7 +5453,7 @@ index 2218d1b..3890e09 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);
-@@ -2976,7 +2976,7 @@ public boolean setText (String html, boolean trusted) {
+@@ -2975,7 +2975,7 @@ public boolean setText (String html, boolean trusted) {
*/
delegate.removeWindowSubclass ();
@@ -5462,7 +5462,7 @@ index 2218d1b..3890e09 100644
int rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
if (rc == XPCOM.NS_OK && result[0] != 0) {
/*
-@@ -3010,9 +3010,9 @@ public boolean setText (String html, boolean trusted) {
+@@ -3009,9 +3009,9 @@ public boolean setText (String html, boolean trusted) {
webNavigation.Release ();
} else {
byte[] contentCharsetBuffer = MozillaDelegate.wcsToMbcs (null, "UTF-8", false); //$NON-NLS-1$
@@ -5474,7 +5474,7 @@ index 2218d1b..3890e09 100644
rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -3032,7 +3032,7 @@ public boolean setText (String html, boolean trusted) {
+@@ -3031,7 +3031,7 @@ public boolean setText (String html, boolean trusted) {
} else {
aString = MozillaDelegate.wcsToMbcs (null, ABOUT_BLANK, false);
}
@@ -5483,7 +5483,7 @@ index 2218d1b..3890e09 100644
rc = ioService.NewURI (aSpec, null, 0, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -3085,7 +3085,7 @@ public boolean setUrl (String url, String postData, String[] headers) {
+@@ -3084,7 +3084,7 @@ public boolean setUrl (String url, String postData, String[] headers) {
boolean setUrl (String url, byte[] postData, String[] headers) {
htmlBytes = null;
@@ -5492,7 +5492,7 @@ index 2218d1b..3890e09 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);
-@@ -3187,7 +3187,7 @@ boolean setUrl (String url, byte[] postData, String[] headers) {
+@@ -3186,7 +3186,7 @@ boolean setUrl (String url, byte[] postData, String[] headers) {
public void stop () {
htmlBytes = null;
@@ -5501,7 +5501,7 @@ index 2218d1b..3890e09 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);
-@@ -3246,7 +3246,7 @@ void hookDOMListeners (nsIDOMEventTarget target, boolean isTop) {
+@@ -3245,7 +3245,7 @@ void hookDOMListeners (nsIDOMEventTarget target, boolean isTop) {
}
void unhookDOMListeners () {
@@ -5510,7 +5510,7 @@ index 2218d1b..3890e09 100644
int rc = webBrowser.GetContentDOMWindow (result);
if (rc != XPCOM.NS_OK || result[0] == 0) return;
-@@ -3335,73 +3335,73 @@ void unhookDOMListeners (nsIDOMEventTarget target) {
+@@ -3334,73 +3334,73 @@ void unhookDOMListeners (nsIDOMEventTarget target) {
/* nsISupports */
@@ -5598,7 +5598,7 @@ index 2218d1b..3890e09 100644
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -3418,18 +3418,18 @@ int Release () {
+@@ -3417,18 +3417,18 @@ int Release () {
/* nsIWeakReference */
@@ -5620,7 +5620,7 @@ index 2218d1b..3890e09 100644
int rc = webBrowser.GetContentDOMWindow (aContentDOMWindow);
if (rc != XPCOM.NS_OK) error (rc);
if (aContentDOMWindow[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -3439,15 +3439,15 @@ int GetInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+@@ -3438,15 +3438,15 @@ int GetInterface (int /*long*/ riid, int /*long*/ ppvObject) {
return QueryInterface (riid, ppvObject);
}
@@ -5639,7 +5639,7 @@ index 2218d1b..3890e09 100644
if (registerFunctionsOnState != 0 && ((aStateFlags & registerFunctionsOnState) == registerFunctionsOnState)) {
registerFunctionsOnState = 0;
Enumeration elements = functions.elements ();
-@@ -3478,11 +3478,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3477,11 +3477,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);
@@ -5653,7 +5653,7 @@ index 2218d1b..3890e09 100644
byte[] bytes = new byte[length];
XPCOM.memmove (bytes, buffer, length);
String value = new String (bytes);
-@@ -3493,7 +3493,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3492,7 +3492,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) {
@@ -5662,7 +5662,7 @@ index 2218d1b..3890e09 100644
/*
* When navigating to a site that is known to have a bad certificate, request notification
-@@ -3573,13 +3573,13 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3572,13 +3572,13 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
* are typically added.
*/
@@ -5678,7 +5678,7 @@ index 2218d1b..3890e09 100644
nsIWebProgress progress = new nsIWebProgress (aWebProgress);
rc = progress.GetDOMWindow (window);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -3618,11 +3618,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3617,11 +3617,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
*/
if (htmlBytes != null) {
nsIRequest req = new nsIRequest (aRequest);
@@ -5692,7 +5692,7 @@ index 2218d1b..3890e09 100644
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
String url = new String (dest);
-@@ -3655,7 +3655,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3654,7 +3654,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
} else {
aString = MozillaDelegate.wcsToMbcs (null, URI_FILEROOT, false);
}
@@ -5701,7 +5701,7 @@ index 2218d1b..3890e09 100644
rc = ioService.NewURI (aSpec, null, 0, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -3673,7 +3673,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3672,7 +3672,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$
@@ -5710,7 +5710,7 @@ index 2218d1b..3890e09 100644
rc = stream.OpenStream (uri.getAddress (), aContentType);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -3697,11 +3697,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3696,11 +3696,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
*/
registerFunctionsOnState = nsIWebProgressListener.STATE_IS_REQUEST | nsIWebProgressListener.STATE_START;
@@ -5724,7 +5724,7 @@ index 2218d1b..3890e09 100644
for (int i = 0; i < pageCount; i++) {
length = i == pageCount - 1 ? htmlBytes.length % pageSize : pageSize;
if (length > 0) {
-@@ -3725,7 +3725,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3724,7 +3724,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
*/
deferCompleted = true;
@@ -5733,7 +5733,7 @@ index 2218d1b..3890e09 100644
nsIWebProgress progress = new nsIWebProgress (aWebProgress);
rc = progress.GetDOMWindow (window);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -3799,7 +3799,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3798,7 +3798,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
updateLastNavigateUrl = false;
nsIRequest request = new nsIRequest (aRequest);
@@ -5742,7 +5742,7 @@ index 2218d1b..3890e09 100644
int rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_10_IID, result);
if (rc != XPCOM.NS_OK) {
rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_IID, result);
-@@ -3814,11 +3814,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3813,11 +3813,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
nsIURI uri = new nsIURI (result[0]);
result[0] = 0;
@@ -5756,7 +5756,7 @@ index 2218d1b..3890e09 100644
byte[] bytes = new byte[length];
XPCOM.memmove (bytes, buffer, length);
lastNavigateURL = new String (bytes);
-@@ -3831,7 +3831,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3830,7 +3830,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.
*/
@@ -5765,7 +5765,7 @@ index 2218d1b..3890e09 100644
nsIWebProgress progress = new nsIWebProgress (aWebProgress);
int rc = progress.GetDOMWindow (result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -3870,7 +3870,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
+@@ -3869,7 +3869,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
return XPCOM.NS_OK;
}
@@ -5774,7 +5774,7 @@ index 2218d1b..3890e09 100644
if (progressListeners.length == 0) return XPCOM.NS_OK;
ProgressEvent event = new ProgressEvent (browser);
event.display = browser.getDisplay ();
-@@ -3883,7 +3883,7 @@ int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCur
+@@ -3882,7 +3882,7 @@ int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCur
return XPCOM.NS_OK;
}
@@ -5783,7 +5783,7 @@ index 2218d1b..3890e09 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
-@@ -3898,12 +3898,12 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
+@@ -3897,12 +3897,12 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
if (locationListeners.length == 0) return XPCOM.NS_OK;
nsIWebProgress webProgress = new nsIWebProgress (aWebProgress);
@@ -5798,7 +5798,7 @@ index 2218d1b..3890e09 100644
nsIDOMWindow domWindow = new nsIDOMWindow (aDOMWindow[0]);
rc = domWindow.GetTop (aTop);
domWindow.Release ();
-@@ -3913,10 +3913,10 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
+@@ -3912,10 +3912,10 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
topWindow.Release ();
nsIURI location = new nsIURI (aLocation);
@@ -5811,7 +5811,7 @@ index 2218d1b..3890e09 100644
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
XPCOM.nsEmbedCString_delete (aSpec);
-@@ -3953,7 +3953,7 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
+@@ -3952,7 +3952,7 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
return XPCOM.NS_OK;
}
@@ -5820,7 +5820,7 @@ index 2218d1b..3890e09 100644
if (statusTextListeners.length == 0) return XPCOM.NS_OK;
StatusTextEvent event = new StatusTextEvent (browser);
event.display = browser.getDisplay ();
-@@ -3968,13 +3968,13 @@ int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatu
+@@ -3967,13 +3967,13 @@ int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatu
return XPCOM.NS_OK;
}
@@ -5836,7 +5836,7 @@ index 2218d1b..3890e09 100644
if (statusTextListeners.length == 0) return XPCOM.NS_OK;
StatusTextEvent event = new StatusTextEvent (browser);
event.display = browser.getDisplay ();
-@@ -3990,8 +3990,8 @@ int SetStatus (int statusType, int /*long*/ status) {
+@@ -3989,8 +3989,8 @@ int SetStatus (int statusType, int /*long*/ status) {
return XPCOM.NS_OK;
}
@@ -5847,7 +5847,7 @@ index 2218d1b..3890e09 100644
if (webBrowser != null) {
webBrowser.AddRef ();
ret[0] = webBrowser.getAddress ();
-@@ -4000,13 +4000,13 @@ int GetWebBrowser (int /*long*/ aWebBrowser) {
+@@ -3999,13 +3999,13 @@ int GetWebBrowser (int /*long*/ aWebBrowser) {
return XPCOM.NS_OK;
}
@@ -5863,7 +5863,7 @@ index 2218d1b..3890e09 100644
int[] ret = new int[1];
ret[0] = chromeFlags;
XPCOM.memmove (aChromeFlags, ret, 4); /* PRUint32 */
-@@ -4046,7 +4046,7 @@ int SizeBrowserTo (int aCX, int aCY) {
+@@ -4045,7 +4045,7 @@ int SizeBrowserTo (int aCX, int aCY) {
}
int ShowAsModal () {
@@ -5872,7 +5872,7 @@ index 2218d1b..3890e09 100644
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -4076,7 +4076,7 @@ int ShowAsModal () {
+@@ -4075,7 +4075,7 @@ int ShowAsModal () {
return XPCOM.NS_OK;
}
@@ -5881,7 +5881,7 @@ index 2218d1b..3890e09 100644
boolean result = (chromeFlags & nsIWebBrowserChrome.CHROME_MODAL) != 0;
XPCOM.memmove (retval, new boolean[] {result});
return XPCOM.NS_OK;
-@@ -4110,7 +4110,7 @@ int SetDimensions (int flags, int x, int y, int cx, int cy) {
+@@ -4109,7 +4109,7 @@ int SetDimensions (int flags, int x, int y, int cx, int cy) {
return XPCOM.NS_OK;
}
@@ -5890,7 +5890,7 @@ index 2218d1b..3890e09 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 */
-@@ -4130,7 +4130,7 @@ int GetDimensions (int flags, int /*long*/ x, int /*long*/ y, int /*long*/ cx, i
+@@ -4129,7 +4129,7 @@ int GetDimensions (int flags, int /*long*/ x, int /*long*/ y, int /*long*/ cx, i
}
int SetFocus () {
@@ -5899,7 +5899,7 @@ index 2218d1b..3890e09 100644
int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
if (rc != XPCOM.NS_OK) {
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
-@@ -4151,7 +4151,7 @@ int SetFocus () {
+@@ -4150,7 +4150,7 @@ int SetFocus () {
return XPCOM.NS_OK;
}
@@ -5908,7 +5908,7 @@ index 2218d1b..3890e09 100644
boolean visible = browser.isVisible () && !browser.getShell ().getMinimized ();
XPCOM.memmove (aVisibility, new boolean[] {visible});
return XPCOM.NS_OK;
-@@ -4194,11 +4194,11 @@ int SetVisibility (int aVisibility) {
+@@ -4193,11 +4193,11 @@ int SetVisibility (int aVisibility) {
return XPCOM.NS_OK;
}
@@ -5922,7 +5922,7 @@ index 2218d1b..3890e09 100644
if (titleListeners.length == 0) return XPCOM.NS_OK;
TitleEvent event = new TitleEvent (browser);
event.display = browser.getDisplay ();
-@@ -4222,7 +4222,7 @@ int SetTitle (int /*long*/ aTitle) {
+@@ -4221,7 +4221,7 @@ int SetTitle (int /*long*/ aTitle) {
return XPCOM.NS_OK;
}
@@ -5931,7 +5931,7 @@ index 2218d1b..3890e09 100644
/*
* 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) {
+@@ -4229,8 +4229,8 @@ int GetSiteWindow (int /*long*/ aSiteWindow) {
* dialog is shown with XULRunner versions < 4.
*/
@@ -5942,7 +5942,7 @@ index 2218d1b..3890e09 100644
return XPCOM.NS_OK;
}
-@@ -4271,9 +4271,9 @@ int FocusPrevElement () {
+@@ -4270,9 +4270,9 @@ int FocusPrevElement () {
/* nsIContextMenuListener */
@@ -5954,7 +5954,7 @@ index 2218d1b..3890e09 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);
-@@ -4303,15 +4303,15 @@ int OnShowContextMenu (int aContextFlags, int /*long*/ aEvent, int /*long*/ aNod
+@@ -4302,15 +4302,15 @@ int OnShowContextMenu (int aContextFlags, int /*long*/ aEvent, int /*long*/ aNod
/* nsIURIContentListener */
@@ -5973,7 +5973,7 @@ index 2218d1b..3890e09 100644
buffer = XPCOM.nsEmbedCString_get (aSpec);
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
-@@ -4366,7 +4366,7 @@ int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
+@@ -4365,7 +4365,7 @@ int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
if (doit) {
if (jsEnabled != jsEnabledOnNextPage) {
jsEnabled = jsEnabledOnNextPage;
@@ -5982,7 +5982,7 @@ index 2218d1b..3890e09 100644
int rc = webBrowser.QueryInterface (nsIWebBrowserSetup.NS_IWEBBROWSERSETUP_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -4385,11 +4385,11 @@ int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
+@@ -4384,11 +4384,11 @@ int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
return XPCOM.NS_OK;
}
@@ -5996,7 +5996,7 @@ index 2218d1b..3890e09 100644
boolean preferred = false;
int size = XPCOM.strlen (aContentType);
if (size > 0) {
-@@ -4400,7 +4400,7 @@ int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, in
+@@ -4399,7 +4399,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 */
@@ -6005,7 +6005,7 @@ index 2218d1b..3890e09 100644
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -4412,7 +4412,7 @@ int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, in
+@@ -4411,7 +4411,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);
@@ -6014,7 +6014,7 @@ index 2218d1b..3890e09 100644
nsIWebNavigationInfo info = new nsIWebNavigationInfo (result[0]);
result[0] = 0;
int[] isSupportedResult = new int[1]; /* PRUint32 */
-@@ -4442,34 +4442,34 @@ int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, in
+@@ -4441,34 +4441,34 @@ int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, in
XPCOM.memmove(retval, new boolean[] {preferred});
if (preferred) {
@@ -6056,7 +6056,7 @@ index 2218d1b..3890e09 100644
int length = XPCOM.strlen_PRUnichar (aTipText);
char[] dest = new char[length];
XPCOM.memmove (dest, aTipText, length * 2);
-@@ -4505,20 +4505,20 @@ int OnHideTooltip () {
+@@ -4504,20 +4504,20 @@ int OnHideTooltip () {
return XPCOM.NS_OK;
}
@@ -6081,7 +6081,7 @@ index 2218d1b..3890e09 100644
rc = domEvent.GetCurrentTarget (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -4535,7 +4535,7 @@ int HandleEvent (int /*long*/ event) {
+@@ -4534,7 +4534,7 @@ int HandleEvent (int /*long*/ event) {
}
if (XPCOM.DOMEVENT_KEYDOWN.equals (typeString)) {
@@ -6090,7 +6090,7 @@ index 2218d1b..3890e09 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);
-@@ -4643,7 +4643,7 @@ int HandleEvent (int /*long*/ event) {
+@@ -4642,7 +4642,7 @@ int HandleEvent (int /*long*/ event) {
case SWT.SCROLL_LOCK: return XPCOM.NS_OK;
}
@@ -6099,7 +6099,7 @@ index 2218d1b..3890e09 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);
-@@ -4699,7 +4699,7 @@ int HandleEvent (int /*long*/ event) {
+@@ -4698,7 +4698,7 @@ int HandleEvent (int /*long*/ event) {
}
if (XPCOM.DOMEVENT_KEYUP.equals (typeString)) {
@@ -6108,7 +6108,7 @@ index 2218d1b..3890e09 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);
-@@ -4756,7 +4756,7 @@ int HandleEvent (int /*long*/ event) {
+@@ -4755,7 +4755,7 @@ int HandleEvent (int /*long*/ event) {
/* mouse event */
@@ -6117,7 +6117,7 @@ index 2218d1b..3890e09 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);
-@@ -4874,10 +4874,10 @@ int HandleEvent (int /*long*/ event) {
+@@ -4873,10 +4873,10 @@ int HandleEvent (int /*long*/ event) {
/* nsIBadCertListener2 */
@@ -6130,7 +6130,7 @@ index 2218d1b..3890e09 100644
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
final String urlPort = new String (dest);
-@@ -4887,7 +4887,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
+@@ -4886,7 +4886,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
/* create text descriptions of the certificate problem(s) */
@@ -6139,7 +6139,7 @@ index 2218d1b..3890e09 100644
nsISupports supports = new nsISupports (status);
int rc = supports.QueryInterface (nsISSLStatus.NS_ISSLSTATUS_10_IID, result);
if (rc != XPCOM.NS_OK) {
-@@ -4910,7 +4910,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
+@@ -4909,7 +4909,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
rc = sslStatus.GetIsDomainMismatch (intResult);
if (intResult[0] != 0) {
@@ -6148,7 +6148,7 @@ index 2218d1b..3890e09 100644
rc = cert.GetCommonName (ptr);
if (rc != XPCOM.NS_OK) SWT.error (rc);
length = XPCOM.nsEmbedString_Length (ptr);
-@@ -4933,7 +4933,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
+@@ -4932,7 +4932,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
nsIX509CertValidity validity = new nsIX509CertValidity(result[0]);
result[0] = 0;
@@ -6157,7 +6157,7 @@ index 2218d1b..3890e09 100644
rc = validity.GetNotBeforeGMT (ptr);
if (rc != XPCOM.NS_OK) SWT.error (rc);
length = XPCOM.nsEmbedString_Length (ptr);
-@@ -4962,7 +4962,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
+@@ -4961,7 +4961,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
rc = sslStatus.GetIsUntrusted (intResult);
if (intResult[0] != 0) {
@@ -6166,7 +6166,7 @@ index 2218d1b..3890e09 100644
rc = cert.GetIssuerCommonName (ptr);
if (rc != XPCOM.NS_OK) SWT.error (rc);
length = XPCOM.nsEmbedString_Length (ptr);
-@@ -4991,7 +4991,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
+@@ -4990,7 +4990,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)) {
@@ -6175,7 +6175,7 @@ index 2218d1b..3890e09 100644
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -5007,7 +5007,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
+@@ -5006,7 +5006,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);
@@ -6185,7 +6185,7 @@ index 2218d1b..3890e09 100644
navigate (badCertRequest);
XPCOM.nsEmbedCString_delete (hostString);
diff --git a/org/eclipse/swt/browser/MozillaDelegate.java b/org/eclipse/swt/browser/MozillaDelegate.java
-index 3a92ce3..b04f572 100644
+index 3b1a5d7..0146715 100644
--- a/org/eclipse/swt/browser/MozillaDelegate.java
+++ b/org/eclipse/swt/browser/MozillaDelegate.java
@@ -22,11 +22,11 @@ import org.eclipse.swt.widgets.*;
@@ -6237,7 +6237,7 @@ index 3a92ce3..b04f572 100644
if (ptr != 0) {
int length = C.strlen (ptr);
byte[] bytes = new byte[length];
-@@ -166,7 +166,7 @@ int createBaseWindow (nsIBaseWindow baseWindow) {
+@@ -167,7 +167,7 @@ int createBaseWindow (nsIBaseWindow baseWindow) {
return baseWindow.Create ();
}
@@ -6246,7 +6246,7 @@ index 3a92ce3..b04f572 100644
/*
* Bug in Mozilla Linux GTK. Embedding Mozilla into a GtkFixed
* handle causes problems with some Mozilla plug-ins. For some
-@@ -183,11 +183,11 @@ int /*long*/ getHandle () {
+@@ -184,11 +184,11 @@ int /*long*/ getHandle () {
return embedHandle;
}
@@ -6260,7 +6260,7 @@ index 3a92ce3..b04f572 100644
GdkEvent event = new GdkEvent ();
OS.memmove (event, gdkEvent, GdkEvent.sizeof);
if (event.type == OS.GDK_BUTTON_PRESS) {
-@@ -259,7 +259,7 @@ void init () {
+@@ -260,7 +260,7 @@ void init () {
* forward the event to the parent embedder before Mozilla received and consumed
* them.
*/
@@ -6269,7 +6269,7 @@ index 3a92ce3..b04f572 100644
if (list != 0) {
mozillaHandle = OS.g_list_data (list);
OS.g_list_free (list);
-@@ -281,7 +281,7 @@ void init () {
+@@ -282,7 +282,7 @@ void init () {
}
}
@@ -6278,7 +6278,7 @@ index 3a92ce3..b04f572 100644
if (listener != null) {
eventShell.getDisplay ().removeFilter (SWT.FocusIn, listener);
eventShell.removeListener (SWT.Deactivate, listener);
-@@ -299,7 +299,7 @@ boolean sendTraverse () {
+@@ -300,7 +300,7 @@ boolean sendTraverse () {
return true;
}
@@ -7309,7 +7309,7 @@ index 9b09794..d39b512 100644
}
}
diff --git a/org/eclipse/swt/browser/WebKit.java b/org/eclipse/swt/browser/WebKit.java
-index 34852d5..92640d7 100644
+index 6c84b88..1b21766 100644
--- a/org/eclipse/swt/browser/WebKit.java
+++ b/org/eclipse/swt/browser/WebKit.java
@@ -24,7 +24,7 @@ import org.eclipse.swt.layout.*;
@@ -7627,8 +7627,8 @@ index 34852d5..92640d7 100644
if (uri != 0) {
OS.g_object_set (session, WebKitGTK.SOUP_SESSION_PROXY_URI, uri, 0);
WebKitGTK.soup_uri_free (uri);
-@@ -650,7 +650,7 @@ public void create (Composite parent, int style) {
- browser.setData (KEY_CHECK_SUBWINDOW, Boolean.FALSE);
+@@ -665,7 +665,7 @@ public void create (Composite parent, int style) {
+ }
}
-void addEventHandlers (int /*long*/ web_view, boolean top) {
@@ -7636,7 +7636,7 @@ index 34852d5..92640d7 100644
/*
* 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.
-@@ -658,7 +658,7 @@ void addEventHandlers (int /*long*/ web_view, boolean top) {
+@@ -673,7 +673,7 @@ void addEventHandlers (int /*long*/ web_view, boolean top) {
if (!jsEnabled) return;
if (top && IsWebKit14orNewer) {
@@ -7645,7 +7645,7 @@ index 34852d5..92640d7 100644
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);
-@@ -770,8 +770,8 @@ boolean close (boolean showPrompters) {
+@@ -785,8 +785,8 @@ boolean close (boolean showPrompters) {
}
public boolean execute (String script) {
@@ -7656,7 +7656,7 @@ index 34852d5..92640d7 100644
byte[] bytes = null;
try {
-@@ -779,16 +779,16 @@ public boolean execute (String script) {
+@@ -794,16 +794,16 @@ public boolean execute (String script) {
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, script, true);
}
@@ -7676,7 +7676,7 @@ index 34852d5..92640d7 100644
WebKitGTK.JSStringRelease (urlString);
WebKitGTK.JSStringRelease (scriptString);
return result != 0;
-@@ -805,13 +805,13 @@ public String getBrowserType () {
+@@ -820,13 +820,13 @@ public String getBrowserType () {
}
public String getText () {
@@ -7694,7 +7694,7 @@ index 34852d5..92640d7 100644
int length = OS.strlen (encoding);
byte[] bytes = new byte [length];
OS.memmove (bytes, encoding, length);
-@@ -819,7 +819,7 @@ public String getText () {
+@@ -834,7 +834,7 @@ public String getText () {
length = OS.GString_len (data);
bytes = new byte[length];
@@ -7703,7 +7703,7 @@ index 34852d5..92640d7 100644
C.memmove (bytes, string, length);
try {
-@@ -830,7 +830,7 @@ public String getText () {
+@@ -845,7 +845,7 @@ public String getText () {
}
public String getUrl () {
@@ -7712,7 +7712,7 @@ index 34852d5..92640d7 100644
/* WebKit auto-navigates to about:blank at startup */
if (uri == 0) return ABOUT_BLANK;
-@@ -855,7 +855,7 @@ public String getUrl () {
+@@ -870,7 +870,7 @@ public String getUrl () {
return url;
}
@@ -7721,7 +7721,7 @@ index 34852d5..92640d7 100644
/*
* This method handles JS events that are received through the DOM
* listener API that was introduced in WebKitGTK 1.4.
-@@ -1210,7 +1210,7 @@ boolean handleMouseEvent (String type, int screenX, int screenY, int detail, int
+@@ -1225,7 +1225,7 @@ boolean handleMouseEvent (String type, int screenX, int screenY, int detail, int
return true;
}
@@ -7730,7 +7730,7 @@ index 34852d5..92640d7 100644
int length = OS.strlen (uri);
byte[] bytes = new byte[length];
OS.memmove (bytes, uri, length);
-@@ -1248,7 +1248,7 @@ int /*long*/ handleLoadCommitted (int /*long*/ uri, boolean top) {
+@@ -1263,7 +1263,7 @@ int /*long*/ handleLoadCommitted (int /*long*/ uri, boolean top) {
return 0;
}
@@ -7739,7 +7739,7 @@ index 34852d5..92640d7 100644
int length = OS.strlen (uri);
byte[] bytes = new byte[length];
OS.memmove (bytes, uri, length);
-@@ -1300,8 +1300,8 @@ int /*long*/ handleLoadFinished (int /*long*/ uri, boolean top) {
+@@ -1315,8 +1315,8 @@ int /*long*/ handleLoadFinished (int /*long*/ uri, boolean top) {
* the event here with the page's url as the title.
*/
if (top) {
@@ -7750,7 +7750,7 @@ index 34852d5..92640d7 100644
if (title == 0) {
TitleEvent newEvent = new TitleEvent (browser);
newEvent.display = browser.getDisplay ();
-@@ -1367,7 +1367,7 @@ void onResize (Event e) {
+@@ -1382,7 +1382,7 @@ void onResize (Event e) {
OS.gtk_widget_set_size_request (scrolledWindow, rect.width, rect.height);
}
@@ -7759,7 +7759,7 @@ index 34852d5..92640d7 100644
final Shell shell = new Shell ();
String msg = Compatibility.getMessage ("SWT_FileDownload"); //$NON-NLS-1$
shell.setText (msg);
-@@ -1377,12 +1377,12 @@ void openDownloadWindow (final int /*long*/ webkitDownload) {
+@@ -1392,12 +1392,12 @@ void openDownloadWindow (final int /*long*/ webkitDownload) {
gridLayout.verticalSpacing = 20;
shell.setLayout (gridLayout);
@@ -7774,7 +7774,7 @@ index 34852d5..92640d7 100644
length = OS.strlen (url);
bytes = new byte[length];
OS.memmove (bytes, url, length);
-@@ -1514,7 +1514,7 @@ public boolean setUrl (String url, String postData, String[] headers) {
+@@ -1529,7 +1529,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.
*/
@@ -7783,7 +7783,7 @@ index 34852d5..92640d7 100644
if (headers != null) {
for (int i = 0; i < headers.length; i++) {
String current = headers[i];
-@@ -1543,11 +1543,11 @@ public void stop () {
+@@ -1558,11 +1558,11 @@ public void stop () {
WebKitGTK.webkit_web_view_stop_loading (webView);
}
@@ -7797,7 +7797,7 @@ index 34852d5..92640d7 100644
return handleLoadCommitted (uri, false);
}
case WebKitGTK.WEBKIT_LOAD_FINISHED: {
-@@ -1557,9 +1557,9 @@ int /*long*/ webframe_notify_load_status (int /*long*/ web_frame, int /*long*/ p
+@@ -1572,9 +1572,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.
*/
@@ -7809,7 +7809,7 @@ index 34852d5..92640d7 100644
return handleLoadFinished (uri, false);
}
}
-@@ -1567,7 +1567,7 @@ int /*long*/ webframe_notify_load_status (int /*long*/ web_frame, int /*long*/ p
+@@ -1582,7 +1582,7 @@ int /*long*/ webframe_notify_load_status (int /*long*/ web_frame, int /*long*/ p
return 0;
}
@@ -7818,7 +7818,7 @@ index 34852d5..92640d7 100644
WindowEvent newEvent = new WindowEvent (browser);
newEvent.display = browser.getDisplay ();
newEvent.widget = browser;
-@@ -1578,11 +1578,11 @@ int /*long*/ webkit_close_web_view (int /*long*/ web_view) {
+@@ -1593,11 +1593,11 @@ int /*long*/ webkit_close_web_view (int /*long*/ web_view) {
return 0;
}
@@ -7832,7 +7832,7 @@ index 34852d5..92640d7 100644
WindowEvent newEvent = new WindowEvent (browser);
newEvent.display = browser.getDisplay ();
newEvent.widget = browser;
-@@ -1602,14 +1602,14 @@ int /*long*/ webkit_create_web_view (int /*long*/ web_view, int /*long*/ frame)
+@@ -1617,14 +1617,14 @@ int /*long*/ webkit_create_web_view (int /*long*/ web_view, int /*long*/ frame)
return 0;
}
@@ -7850,7 +7850,7 @@ index 34852d5..92640d7 100644
OS.g_object_ref (request);
/*
-@@ -1626,7 +1626,7 @@ int /*long*/ webkit_download_requested (int /*long*/ web_view, int /*long*/ down
+@@ -1641,7 +1641,7 @@ int /*long*/ webkit_download_requested (int /*long*/ web_view, int /*long*/ down
String path = dialog.open ();
if (path != null) {
path = URI_FILEROOT + path;
@@ -7859,7 +7859,7 @@ index 34852d5..92640d7 100644
byte[] uriBytes = Converter.wcsToMbcs (null, path, true);
WebKitGTK.webkit_download_set_destination_uri (newDownload, uriBytes);
openDownloadWindow (newDownload);
-@@ -1641,7 +1641,7 @@ int /*long*/ webkit_download_requested (int /*long*/ web_view, int /*long*/ down
+@@ -1656,7 +1656,7 @@ int /*long*/ webkit_download_requested (int /*long*/ web_view, int /*long*/ down
return 1;
}
@@ -7868,7 +7868,7 @@ index 34852d5..92640d7 100644
if (uri != 0) {
int length = OS.strlen (uri);
byte[] bytes = new byte[length];
-@@ -1658,7 +1658,7 @@ int /*long*/ webkit_hovering_over_link (int /*long*/ web_view, int /*long*/ titl
+@@ -1673,7 +1673,7 @@ int /*long*/ webkit_hovering_over_link (int /*long*/ web_view, int /*long*/ titl
return 0;
}
@@ -7877,7 +7877,7 @@ index 34852d5..92640d7 100644
boolean canShow = WebKitGTK.webkit_web_view_can_show_mime_type (webView, mimetype) != 0;
if (!canShow) {
WebKitGTK.webkit_web_policy_decision_download (policy_decision);
-@@ -1667,7 +1667,7 @@ int /*long*/ webkit_mime_type_policy_decision_requested (int /*long*/ web_view,
+@@ -1682,7 +1682,7 @@ int /*long*/ webkit_mime_type_policy_decision_requested (int /*long*/ web_view,
return 0;
}
@@ -7886,7 +7886,7 @@ index 34852d5..92640d7 100644
if (loadingText) {
/*
* WebKit is auto-navigating to about:blank in response to a
-@@ -1678,7 +1678,7 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
+@@ -1693,7 +1693,7 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
return 0;
}
@@ -7895,7 +7895,7 @@ index 34852d5..92640d7 100644
int length = OS.strlen (uri);
byte[] bytes = new byte[length];
OS.memmove (bytes, uri, length);
-@@ -1711,12 +1711,12 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
+@@ -1726,12 +1726,12 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
if (jsEnabled != jsEnabledOnNextPage) {
jsEnabled = jsEnabledOnNextPage;
DisabledJSCount += !jsEnabled ? 1 : -1;
@@ -7910,7 +7910,7 @@ index 34852d5..92640d7 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) {
-@@ -1739,22 +1739,22 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
+@@ -1754,22 +1754,22 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
return 0;
}
@@ -7937,7 +7937,7 @@ index 34852d5..92640d7 100644
ProgressEvent event = new ProgressEvent (browser);
event.display = browser.getDisplay ();
event.widget = browser;
-@@ -1766,8 +1766,8 @@ int /*long*/ webkit_notify_progress (int /*long*/ web_view, int /*long*/ pspec)
+@@ -1781,8 +1781,8 @@ int /*long*/ webkit_notify_progress (int /*long*/ web_view, int /*long*/ pspec)
return 0;
}
@@ -7948,7 +7948,7 @@ index 34852d5..92640d7 100644
String titleString;
if (title == 0) {
titleString = ""; //$NON-NLS-1$
-@@ -1787,7 +1787,7 @@ int /*long*/ webkit_notify_title (int /*long*/ web_view, int /*long*/ pspec) {
+@@ -1802,7 +1802,7 @@ int /*long*/ webkit_notify_title (int /*long*/ web_view, int /*long*/ pspec) {
return 0;
}
@@ -7957,7 +7957,7 @@ index 34852d5..92640d7 100644
Point pt = browser.getDisplay ().getCursorLocation ();
Event event = new Event ();
event.x = pt.x;
-@@ -1795,10 +1795,10 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m
+@@ -1810,10 +1810,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 */
@@ -7971,7 +7971,7 @@ index 34852d5..92640d7 100644
OS.gtk_container_remove (webkit_menu, item);
current = OS.g_list_next (current);
}
-@@ -1812,10 +1812,10 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m
+@@ -1827,10 +1827,10 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m
}
menu.setVisible (true);
/* clear the menu */
@@ -7985,7 +7985,7 @@ index 34852d5..92640d7 100644
OS.gtk_container_remove (webkit_menu, item);
current = OS.g_list_next (current);
}
-@@ -1824,18 +1824,18 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m
+@@ -1839,18 +1839,18 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m
return 0;
}
@@ -8008,7 +8008,7 @@ index 34852d5..92640d7 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);
-@@ -1862,7 +1862,7 @@ int /*long*/ webkit_resource_request_starting (int /*long*/ web_view, int /*long
+@@ -1877,7 +1877,7 @@ int /*long*/ webkit_resource_request_starting (int /*long*/ web_view, int /*long
}
/* headers */
@@ -8017,7 +8017,7 @@ index 34852d5..92640d7 100644
for (int i = 0; i < headers.length; i++) {
String current = headers[i];
if (current != null) {
-@@ -1885,7 +1885,7 @@ int /*long*/ webkit_resource_request_starting (int /*long*/ web_view, int /*long
+@@ -1900,7 +1900,7 @@ int /*long*/ webkit_resource_request_starting (int /*long*/ web_view, int /*long
return 0;
}
@@ -8026,7 +8026,7 @@ index 34852d5..92640d7 100644
int length = OS.strlen (text);
byte[] bytes = new byte[length];
OS.memmove (bytes, text, length);
-@@ -1899,12 +1899,12 @@ int /*long*/ webkit_status_bar_text_changed (int /*long*/ web_view, int /*long*/
+@@ -1914,12 +1914,12 @@ int /*long*/ webkit_status_bar_text_changed (int /*long*/ web_view, int /*long*/
return 0;
}
@@ -8041,7 +8041,7 @@ index 34852d5..92640d7 100644
int[] result = new int[1];
OS.g_object_get (settings, WebKitGTK.locationbar_visible, result, 0);
newEvent.addressBar = result[0] != 0;
-@@ -1942,16 +1942,16 @@ int /*long*/ webkit_web_view_ready (int /*long*/ web_view) {
+@@ -1957,16 +1957,16 @@ int /*long*/ webkit_web_view_ready (int /*long*/ web_view) {
return 0;
}
@@ -8062,7 +8062,7 @@ index 34852d5..92640d7 100644
WebKitGTK.JSObjectSetProperty (context, globalObject, name, externalObject, 0, null);
WebKitGTK.JSStringRelease (name);
Enumeration elements = functions.elements ();
-@@ -1959,16 +1959,16 @@ int /*long*/ webkit_window_object_cleared (int /*long*/ web_view, int /*long*/ f
+@@ -1974,16 +1974,16 @@ int /*long*/ webkit_window_object_cleared (int /*long*/ web_view, int /*long*/ f
BrowserFunction current = (BrowserFunction)elements.nextElement ();
execute (current.functionString);
}
@@ -8082,7 +8082,7 @@ index 34852d5..92640d7 100644
C.memmove (result, arguments, C.PTR_SIZEOF);
int type = WebKitGTK.JSValueGetType (ctx, result[0]);
if (type == WebKitGTK.kJSTypeNumber) {
-@@ -2008,7 +2008,7 @@ int /*long*/ callJava (int /*long*/ ctx, int /*long*/ func, int /*long*/ thisObj
+@@ -2023,7 +2023,7 @@ int /*long*/ callJava (int /*long*/ ctx, int /*long*/ func, int /*long*/ thisObj
return convertToJS (ctx, returnValue);
}
@@ -8091,7 +8091,7 @@ index 34852d5..92640d7 100644
if (value == null) {
return WebKitGTK.JSValueMakeUndefined (ctx);
}
-@@ -2019,8 +2019,8 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
+@@ -2034,8 +2034,8 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, (String)value, true);
}
@@ -8102,7 +8102,7 @@ index 34852d5..92640d7 100644
WebKitGTK.JSStringRelease (stringRef);
return result;
}
-@@ -2033,10 +2033,10 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
+@@ -2048,10 +2048,10 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
if (value instanceof Object[]) {
Object[] arrayValue = (Object[]) value;
int length = arrayValue.length;
@@ -8115,7 +8115,7 @@ index 34852d5..92640d7 100644
arguments[i] = jsObject;
}
return WebKitGTK.JSObjectMakeArray (ctx, length, arguments, null);
-@@ -2045,7 +2045,7 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
+@@ -2060,7 +2060,7 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
return 0;
}
@@ -8124,7 +8124,7 @@ index 34852d5..92640d7 100644
int type = WebKitGTK.JSValueGetType (ctx, value);
switch (type) {
case WebKitGTK.kJSTypeBoolean: {
-@@ -2057,9 +2057,9 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) {
+@@ -2072,9 +2072,9 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) {
return new Double(result);
}
case WebKitGTK.kJSTypeString: {
@@ -8136,7 +8136,7 @@ index 34852d5..92640d7 100644
byte[] bytes = new byte[(int)/*64*/length];
length = WebKitGTK.JSStringGetUTF8CString (string, bytes, length);
WebKitGTK.JSStringRelease (string);
-@@ -2080,15 +2080,15 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) {
+@@ -2095,15 +2095,15 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) {
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, PROPERTY_LENGTH, true);
}
@@ -8686,7 +8686,7 @@ index c9cc25a..1f5166d 100644
OS.gdk_window_get_origin(window, origin_x, origin_y);
Point coordinates = new Point(origin_x[0] + x, origin_y[0] + y);
diff --git a/org/eclipse/swt/dnd/FileTransfer.java b/org/eclipse/swt/dnd/FileTransfer.java
-index 8b0338f..f02ac24 100644
+index 5795831..c8d716f 100644
--- a/org/eclipse/swt/dnd/FileTransfer.java
+++ b/org/eclipse/swt/dnd/FileTransfer.java
@@ -85,13 +85,13 @@ public void javaToNative(Object object, TransferData transferData) {
@@ -8739,7 +8739,7 @@ index 8b0338f..f02ac24 100644
System.arraycopy(files, 0, newFiles, 0, files.length);
newFiles[files.length] = file;
files = newFiles;
-@@ -159,26 +159,26 @@ public Object nativeToJava(TransferData transferData) {
+@@ -159,27 +159,27 @@ public Object nativeToJava(TransferData transferData) {
}
if (offset < temp.length - sepLength) {
int size = temp.length - offset;
@@ -8762,29 +8762,30 @@ index 8b0338f..f02ac24 100644
+ long /*int*/ localePtr = OS.g_filename_from_uri(files[i], null, error);
OS.g_free(files[i]);
if (error[0] != 0 || localePtr == 0) continue;
-- int /*long*/ utf8Ptr = OS.g_filename_to_utf8(localePtr, -1, null, null, error);
-+ long /*int*/ utf8Ptr = OS.g_filename_to_utf8(localePtr, -1, null, null, error);
- OS.g_free(localePtr);
- if (error[0] != 0 || utf8Ptr == 0) continue;
+- int /*long*/ utf8Ptr = OS.g_filename_to_utf8(localePtr, -1, null, null, null);
++ long /*int*/ utf8Ptr = OS.g_filename_to_utf8(localePtr, -1, null, null, null);
+ if (utf8Ptr == 0) utf8Ptr = OS.g_filename_display_name (localePtr);
+ if (localePtr != utf8Ptr) OS.g_free (localePtr);
+ if (utf8Ptr == 0) continue;
- int /*long*/[] items_written = new int /*long*/[1];
- int /*long*/ utf16Ptr = OS.g_utf8_to_utf16(utf8Ptr, -1, null, items_written, null);
+ long /*int*/[] items_written = new long /*int*/[1];
+ long /*int*/ utf16Ptr = OS.g_utf8_to_utf16(utf8Ptr, -1, null, items_written, null);
OS.g_free(utf8Ptr);
+ if (utf16Ptr == 0) continue;
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 d91873d..70846a1 100644
+index cd7465f..0fa1abf 100644
--- a/org/eclipse/swt/dnd/HTMLTransfer.java
+++ b/org/eclipse/swt/dnd/HTMLTransfer.java
-@@ -65,7 +65,7 @@ public void javaToNative (Object object, TransferData transferData){
- char [] chars = new char[charCount +1];
- string.getChars(0, charCount , chars, 0);
- int byteCount = chars.length*2;
+@@ -64,7 +64,7 @@ public void javaToNative (Object object, TransferData transferData){
+ String string = (String)object;
+ byte[] utf8 = Converter.wcsToMbcs(null, string, true);
+ int byteCount = utf8.length;
- int /*long*/ pValue = OS.g_malloc(byteCount);
+ long /*int*/ pValue = OS.g_malloc(byteCount);
if (pValue == 0) return;
- OS.memmove(pValue, chars, byteCount);
+ OS.memmove(pValue, utf8, byteCount);
transferData.length = byteCount;
diff --git a/org/eclipse/swt/dnd/ImageTransfer.java b/org/eclipse/swt/dnd/ImageTransfer.java
index ffc92bb..ffa0b07 100644
@@ -9049,7 +9050,7 @@ index 78e4cd1..09e8fbc 100644
color.pixel = 0;
OS.gdk_gc_set_foreground(gcMask, color);
diff --git a/org/eclipse/swt/dnd/TreeDropTargetEffect.java b/org/eclipse/swt/dnd/TreeDropTargetEffect.java
-index c7c5fd0..b48787f 100644
+index f064492..722763a 100644
--- a/org/eclipse/swt/dnd/TreeDropTargetEffect.java
+++ b/org/eclipse/swt/dnd/TreeDropTargetEffect.java
@@ -111,7 +111,7 @@ public class TreeDropTargetEffect extends DropTargetEffect {
@@ -9383,7 +9384,7 @@ index 70a7b7d..62a2cba 100644
font.handle = handle;
return font;
diff --git a/org/eclipse/swt/graphics/GC.java b/org/eclipse/swt/graphics/GC.java
-index 6c45c0f..497d1dc 100644
+index fb6d761..92413e2 100644
--- a/org/eclipse/swt/graphics/GC.java
+++ b/org/eclipse/swt/graphics/GC.java
@@ -69,7 +69,7 @@ public final class GC extends Resource {
@@ -9484,8 +9485,8 @@ index 6c45c0f..497d1dc 100644
+ long /*int*/ cairo = Cairo.cairo_create(image.surface);
if (cairo == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_translate(cairo, -x, -y);
- if (data.image != null) {
-@@ -461,10 +461,10 @@ public void copyArea(Image image, int x, int y) {
+ Cairo.cairo_push_group(cairo);
+@@ -462,10 +462,10 @@ public void copyArea(Image image, int x, int y) {
int[] w = new int[1], h = new int[1];
OS.gdk_drawable_get_size(data.drawable, w, h);
int width = w[0], height = h[0];
@@ -9500,7 +9501,7 @@ index 6c45c0f..497d1dc 100644
Cairo.cairo_set_source_surface(cairo, srcSurface, 0, 0);
}
} else {
-@@ -476,7 +476,7 @@ public void copyArea(Image image, int x, int y) {
+@@ -480,7 +480,7 @@ public void copyArea(Image image, int x, int y) {
return;
}
Rectangle rect = image.getBounds();
@@ -9509,7 +9510,7 @@ index 6c45c0f..497d1dc 100644
if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.gdk_gc_set_subwindow(gdkGC, OS.GDK_INCLUDE_INFERIORS);
OS.gdk_draw_drawable(image.pixmap, gdkGC, data.drawable, x, y, 0, 0, rect.width, rect.height);
-@@ -524,7 +524,7 @@ public void copyArea(int srcX, int srcY, int width, int height, int destX, int d
+@@ -528,7 +528,7 @@ public void copyArea(int srcX, int srcY, int width, int height, int destX, int d
if (width <= 0 || height <= 0) return;
int deltaX = destX - srcX, deltaY = destY - srcY;
if (deltaX == 0 && deltaY == 0) return;
@@ -9518,7 +9519,7 @@ index 6c45c0f..497d1dc 100644
if (OS.USE_CAIRO) {
if (data.image != null) {
Cairo.cairo_set_source_surface(handle, data.image.surface, deltaX, deltaY);
-@@ -546,15 +546,15 @@ public void copyArea(int srcX, int srcY, int width, int height, int destX, int d
+@@ -550,15 +550,15 @@ public void copyArea(int srcX, int srcY, int width, int height, int destX, int d
Cairo.cairo_paint(handle);
Cairo.cairo_restore(handle);
if (paint) {
@@ -9537,7 +9538,7 @@ index 6c45c0f..497d1dc 100644
OS.gdk_region_subtract (invalidateRegion, visibleRegion);
OS.gdk_region_offset (invalidateRegion, deltaX, deltaY);
OS.gdk_window_invalidate_region(drawable, invalidateRegion, false);
-@@ -604,10 +604,10 @@ public void copyArea(int srcX, int srcY, int width, int height, int destX, int d
+@@ -608,10 +608,10 @@ public void copyArea(int srcX, int srcY, int width, int height, int destX, int d
}
void createLayout() {
@@ -9550,7 +9551,7 @@ index 6c45c0f..497d1dc 100644
if (layout == 0) SWT.error(SWT.ERROR_NO_HANDLES);
data.layout = layout;
OS.pango_context_set_language(context, OS.gtk_get_default_language());
-@@ -632,13 +632,13 @@ void disposeLayout() {
+@@ -636,13 +636,13 @@ void disposeLayout() {
void destroy() {
if (data.disposeCairo) {
@@ -9566,7 +9567,7 @@ index 6c45c0f..497d1dc 100644
if (clipRgn != 0) OS.gdk_region_destroy(clipRgn);
Image image = data.image;
if (image != null) {
-@@ -701,7 +701,7 @@ public void drawArc(int x, int y, int width, int height, int startAngle, int arc
+@@ -705,7 +705,7 @@ public void drawArc(int x, int y, int width, int height, int startAngle, int arc
height = -height;
}
if (width == 0 || height == 0 || arcAngle == 0) return;
@@ -9575,7 +9576,7 @@ index 6c45c0f..497d1dc 100644
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
if (width == height) {
-@@ -752,8 +752,8 @@ public void drawFocus(int x, int y, int width, int height) {
+@@ -756,8 +756,8 @@ public void drawFocus(int x, int y, int width, int height) {
* are not valid in the default style. The fix is to use a style
* from a widget.
*/
@@ -9586,7 +9587,7 @@ index 6c45c0f..497d1dc 100644
if (cairo != 0) {
checkGC(FOREGROUND);
int[] lineWidth = new int[1];
-@@ -864,7 +864,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
+@@ -868,7 +868,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
}
@@ -9595,7 +9596,7 @@ index 6c45c0f..497d1dc 100644
if (cairo != 0) {
if (data.alpha != 0) {
srcImage.createSurface();
-@@ -886,7 +886,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
+@@ -890,7 +890,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
case SWT.LOW: filter = Cairo.CAIRO_FILTER_FAST; break;
case SWT.HIGH: filter = Cairo.CAIRO_FILTER_BEST; break;
}
@@ -9604,7 +9605,7 @@ index 6c45c0f..497d1dc 100644
if (pattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);
if (srcWidth != destWidth || srcHeight != destHeight) {
/*
-@@ -908,8 +908,8 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
+@@ -912,8 +912,8 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
*/
int version = Cairo.cairo_version ();
if (version >= Cairo.CAIRO_VERSION_ENCODE(1, 4, 0) && version < Cairo.CAIRO_VERSION_ENCODE(1, 8, 0)) {
@@ -9615,7 +9616,7 @@ index 6c45c0f..497d1dc 100644
Cairo.cairo_set_source_surface(cr, srcImage.surface, imgWidth, imgHeight);
Cairo.cairo_paint(cr);
Cairo.cairo_scale(cr, -1, -1);
-@@ -932,7 +932,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
+@@ -936,7 +936,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
Cairo.cairo_set_source_surface(cr, srcImage.surface, imgWidth, -imgHeight * 3);
Cairo.cairo_paint(cr);
Cairo.cairo_destroy(cr);
@@ -9624,7 +9625,7 @@ index 6c45c0f..497d1dc 100644
Cairo.cairo_surface_destroy(surface);
if (newPattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_pattern_destroy(pattern);
-@@ -973,7 +973,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
+@@ -977,7 +977,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
drawImageXRender(srcImage, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, simple, imgWidth, imgHeight, 0, -1);
return;
}
@@ -9633,7 +9634,7 @@ index 6c45c0f..497d1dc 100644
if (pixbuf != 0) {
OS.gdk_pixbuf_render_to_drawable(pixbuf, data.drawable, handle, 0, 0, destX, destY, destWidth, destHeight, OS.GDK_RGB_DITHER_NORMAL, 0, 0);
OS.g_object_unref(pixbuf);
-@@ -990,12 +990,12 @@ void drawImageAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHei
+@@ -994,12 +994,12 @@ void drawImageAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHei
drawImageXRender(srcImage, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, simple, imgWidth, imgHeight, srcImage.mask, OS.PictStandardA8);
return;
}
@@ -9649,7 +9650,7 @@ index 6c45c0f..497d1dc 100644
byte[] line = new byte[stride];
byte alpha = (byte)srcImage.alpha;
byte[] alphaData = srcImage.alphaData;
-@@ -1008,7 +1008,7 @@ void drawImageAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHei
+@@ -1012,7 +1012,7 @@ void drawImageAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHei
OS.memmove(pixels + (y * stride), line, stride);
}
if (srcWidth != destWidth || srcHeight != destHeight) {
@@ -9658,7 +9659,7 @@ index 6c45c0f..497d1dc 100644
OS.g_object_unref(pixbuf);
if (scaledPixbuf == 0) return;
pixbuf = scaledPixbuf;
-@@ -1017,33 +1017,33 @@ void drawImageAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHei
+@@ -1021,33 +1021,33 @@ void drawImageAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHei
OS.g_object_unref(pixbuf);
}
void drawImageMask(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, boolean simple, int imgWidth, int imgHeight) {
@@ -9702,7 +9703,7 @@ index 6c45c0f..497d1dc 100644
OS.memmove(maskLine, maskOffset, maskStride);
for (int x=0; x<srcWidth; x++) {
if (maskLine[x * 3] == 0) {
-@@ -1053,10 +1053,10 @@ void drawImageMask(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeig
+@@ -1057,10 +1057,10 @@ void drawImageMask(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeig
OS.memmove(offset, line, stride);
}
OS.g_object_unref(maskPixbuf);
@@ -9716,7 +9717,7 @@ index 6c45c0f..497d1dc 100644
OS.gdk_pixbuf_render_pixmap_and_mask(scaledPixbuf, colorBuffer, maskBuffer, 128);
colorPixmap = colorBuffer[0];
maskPixmap = maskBuffer[0];
-@@ -1077,9 +1077,9 @@ void drawImageMask(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeig
+@@ -1081,9 +1081,9 @@ void drawImageMask(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeig
int newHeight = srcY + srcHeight;
int bytesPerLine = (newWidth + 7) / 8;
byte[] maskData = new byte[bytesPerLine * newHeight];
@@ -9728,7 +9729,7 @@ index 6c45c0f..497d1dc 100644
OS.gdk_region_offset(data.clipRgn, -destX + srcX, -destY + srcY);
OS.gdk_gc_set_clip_region(gc, data.clipRgn);
OS.gdk_region_offset(data.clipRgn, destX - srcX, destY - srcY);
-@@ -1111,19 +1111,19 @@ void drawImageMask(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeig
+@@ -1115,19 +1115,19 @@ void drawImageMask(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeig
/* Destroy the image mask if the there is a GC created on the image */
if (srcImage.transparentPixel != -1 && srcImage.memGC != null) srcImage.destroyMask();
}
@@ -9753,7 +9754,7 @@ index 6c45c0f..497d1dc 100644
if (maskPixmap != 0) {
int attribCount = 0;
XRenderPictureAttributes attrib = null;
-@@ -1135,10 +1135,10 @@ void drawImageXRender(Image srcImage, int srcX, int srcY, int srcWidth, int srcH
+@@ -1139,10 +1139,10 @@ void drawImageXRender(Image srcImage, int srcX, int srcY, int srcWidth, int srcH
maskPict = OS.XRenderCreatePicture(xDisplay, OS.gdk_x11_drawable_get_xid(maskPixmap), OS.XRenderFindStandardFormat(xDisplay, maskType), attribCount, attrib);
if (maskPict == 0) SWT.error(SWT.ERROR_NO_HANDLES);
}
@@ -9767,7 +9768,7 @@ index 6c45c0f..497d1dc 100644
if (srcPict == 0) SWT.error(SWT.ERROR_NO_HANDLES);
if (srcWidth != destWidth || srcHeight != destHeight) {
int[] transform = new int[]{(int)(((float)srcWidth / destWidth) * 65536), 0, 0, 0, (int)(((float)srcHeight / destHeight) * 65536), 0, 0, 0, 65536};
-@@ -1147,7 +1147,7 @@ void drawImageXRender(Image srcImage, int srcX, int srcY, int srcWidth, int srcH
+@@ -1151,7 +1151,7 @@ void drawImageXRender(Image srcImage, int srcX, int srcY, int srcWidth, int srcH
srcX *= destWidth / (float)srcWidth;
srcY *= destHeight / (float)srcHeight;
}
@@ -9776,7 +9777,7 @@ index 6c45c0f..497d1dc 100644
if (data.damageRgn != 0) {
if (clipping == 0) {
clipping = data.damageRgn;
-@@ -1159,7 +1159,7 @@ void drawImageXRender(Image srcImage, int srcX, int srcY, int srcWidth, int srcH
+@@ -1163,7 +1163,7 @@ void drawImageXRender(Image srcImage, int srcX, int srcY, int srcWidth, int srcH
}
if (clipping != 0) {
int[] nRects = new int[1];
@@ -9785,7 +9786,7 @@ index 6c45c0f..497d1dc 100644
OS.gdk_region_get_rectangles(clipping, rects, nRects);
GdkRectangle rect = new GdkRectangle();
short[] xRects = new short[nRects[0] * 4];
-@@ -1181,12 +1181,12 @@ void drawImageXRender(Image srcImage, int srcX, int srcY, int srcWidth, int srcH
+@@ -1185,12 +1185,12 @@ void drawImageXRender(Image srcImage, int srcX, int srcY, int srcWidth, int srcH
OS.XRenderFreePicture(xDisplay, srcPict);
if (maskPict != 0) OS.XRenderFreePicture(xDisplay, maskPict);
}
@@ -9802,7 +9803,7 @@ index 6c45c0f..497d1dc 100644
OS.g_object_unref(pixbuf);
return scaledPixbuf;
}
-@@ -1207,7 +1207,7 @@ int /*long*/ scale(int /*long*/ src, int srcX, int srcY, int srcWidth, int srcHe
+@@ -1211,7 +1211,7 @@ int /*long*/ scale(int /*long*/ src, int srcX, int srcY, int srcWidth, int srcHe
public void drawLine(int x1, int y1, int x2, int y2) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
checkGC(DRAW);
@@ -9811,7 +9812,7 @@ index 6c45c0f..497d1dc 100644
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
Cairo.cairo_move_to(cairo, x1 + xOffset, y1 + yOffset);
-@@ -1250,7 +1250,7 @@ public void drawOval(int x, int y, int width, int height) {
+@@ -1254,7 +1254,7 @@ public void drawOval(int x, int y, int width, int height) {
y = y + height;
height = -height;
}
@@ -9820,7 +9821,7 @@ index 6c45c0f..497d1dc 100644
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
if (width == height) {
-@@ -1297,11 +1297,11 @@ public void drawPath(Path path) {
+@@ -1301,11 +1301,11 @@ public void drawPath(Path path) {
if (path.handle == 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
initCairo();
checkGC(DRAW);
@@ -9834,7 +9835,7 @@ index 6c45c0f..497d1dc 100644
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(cairo, copy);
Cairo.cairo_path_destroy(copy);
-@@ -1329,7 +1329,7 @@ public void drawPath(Path path) {
+@@ -1333,7 +1333,7 @@ public void drawPath(Path path) {
public void drawPoint (int x, int y) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
checkGC(DRAW);
@@ -9843,7 +9844,7 @@ index 6c45c0f..497d1dc 100644
if (cairo != 0) {
Cairo.cairo_rectangle(cairo, x, y, 1, 1);
Cairo.cairo_fill(cairo);
-@@ -1359,7 +1359,7 @@ public void drawPolygon(int[] pointArray) {
+@@ -1363,7 +1363,7 @@ public void drawPolygon(int[] pointArray) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
checkGC(DRAW);
@@ -9852,7 +9853,7 @@ index 6c45c0f..497d1dc 100644
if (cairo != 0) {
drawPolyline(cairo, pointArray, true);
Cairo.cairo_stroke(cairo);
-@@ -1389,7 +1389,7 @@ public void drawPolyline(int[] pointArray) {
+@@ -1393,7 +1393,7 @@ public void drawPolyline(int[] pointArray) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
checkGC(DRAW);
@@ -9861,7 +9862,7 @@ index 6c45c0f..497d1dc 100644
if (cairo != 0) {
drawPolyline(cairo, pointArray, false);
Cairo.cairo_stroke(cairo);
-@@ -1398,7 +1398,7 @@ public void drawPolyline(int[] pointArray) {
+@@ -1402,7 +1402,7 @@ public void drawPolyline(int[] pointArray) {
OS.gdk_draw_lines(data.drawable, handle, pointArray, pointArray.length / 2);
}
@@ -9870,7 +9871,7 @@ index 6c45c0f..497d1dc 100644
int count = pointArray.length / 2;
if (count == 0) return;
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
-@@ -1435,7 +1435,7 @@ public void drawRectangle(int x, int y, int width, int height) {
+@@ -1439,7 +1439,7 @@ public void drawRectangle(int x, int y, int width, int height) {
y = y + height;
height = -height;
}
@@ -9879,7 +9880,7 @@ index 6c45c0f..497d1dc 100644
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
Cairo.cairo_rectangle(cairo, x + xOffset, y + yOffset, width, height);
-@@ -1505,7 +1505,7 @@ public void drawRoundRectangle(int x, int y, int width, int height, int arcWidth
+@@ -1509,7 +1509,7 @@ public void drawRoundRectangle(int x, int y, int width, int height, int arcWidth
}
if (naw < 0) naw = 0 - naw;
if (nah < 0) nah = 0 - nah;
@@ -9888,7 +9889,7 @@ index 6c45c0f..497d1dc 100644
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
if (naw == 0 || nah == 0) {
-@@ -1531,7 +1531,7 @@ public void drawRoundRectangle(int x, int y, int width, int height, int arcWidth
+@@ -1535,7 +1535,7 @@ public void drawRoundRectangle(int x, int y, int width, int height, int arcWidth
}
int naw2 = naw / 2;
int nah2 = nah / 2;
@@ -9897,7 +9898,7 @@ index 6c45c0f..497d1dc 100644
if (nw > naw) {
if (nh > nah) {
OS.gdk_draw_arc(drawable, handle, 0, nx, ny, naw, nah, 5760, 5760);
-@@ -1691,7 +1691,7 @@ public void drawText (String string, int x, int y, int flags) {
+@@ -1695,7 +1695,7 @@ public void drawText (String string, int x, int y, int flags) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (string.length() == 0) return;
@@ -9906,7 +9907,7 @@ index 6c45c0f..497d1dc 100644
if (cairo != 0) {
if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {
//TODO - honor flags
-@@ -1740,13 +1740,13 @@ public void drawText (String string, int x, int y, int flags) {
+@@ -1744,13 +1744,13 @@ public void drawText (String string, int x, int y, int flags) {
if (!data.xorMode) {
OS.gdk_draw_layout_with_colors(data.drawable, handle, x, y, data.layout, null, background);
} else {
@@ -9923,7 +9924,7 @@ index 6c45c0f..497d1dc 100644
if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);
GdkColor black = new GdkColor();
OS.gdk_gc_set_foreground(gdkGC, black);
-@@ -1819,7 +1819,7 @@ public void fillArc(int x, int y, int width, int height, int startAngle, int arc
+@@ -1823,7 +1823,7 @@ public void fillArc(int x, int y, int width, int height, int startAngle, int arc
height = -height;
}
if (width == 0 || height == 0 || arcAngle == 0) return;
@@ -9932,7 +9933,7 @@ index 6c45c0f..497d1dc 100644
if (cairo != 0) {
if (width == height) {
if (arcAngle >= 0) {
-@@ -1896,9 +1896,9 @@ public void fillGradientRectangle(int x, int y, int width, int height, boolean v
+@@ -1900,9 +1900,9 @@ public void fillGradientRectangle(int x, int y, int width, int height, boolean v
fillRectangle(x, y, width, height);
return;
}
@@ -9944,7 +9945,7 @@ index 6c45c0f..497d1dc 100644
if (vertical) {
pattern = Cairo.cairo_pattern_create_linear (0.0, 0.0, 0.0, 1.0);
} else {
-@@ -1948,7 +1948,7 @@ public void fillOval(int x, int y, int width, int height) {
+@@ -1952,7 +1952,7 @@ public void fillOval(int x, int y, int width, int height) {
y = y + height;
height = -height;
}
@@ -9953,7 +9954,7 @@ index 6c45c0f..497d1dc 100644
if (cairo != 0) {
if (width == height) {
Cairo.cairo_arc_negative(cairo, x + width / 2f, y + height / 2f, width / 2f, 0, 2 * (float)Compatibility.PI);
-@@ -1994,8 +1994,8 @@ public void fillPath (Path path) {
+@@ -1998,8 +1998,8 @@ public void fillPath (Path path) {
if (path.handle == 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
initCairo();
checkGC(FILL);
@@ -9964,7 +9965,7 @@ index 6c45c0f..497d1dc 100644
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(cairo, copy);
Cairo.cairo_path_destroy(copy);
-@@ -2025,7 +2025,7 @@ public void fillPolygon(int[] pointArray) {
+@@ -2029,7 +2029,7 @@ public void fillPolygon(int[] pointArray) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
checkGC(FILL);
@@ -9973,7 +9974,7 @@ index 6c45c0f..497d1dc 100644
if (cairo != 0) {
drawPolyline(cairo, pointArray, true);
Cairo.cairo_fill(cairo);
-@@ -2060,7 +2060,7 @@ public void fillRectangle(int x, int y, int width, int height) {
+@@ -2064,7 +2064,7 @@ public void fillRectangle(int x, int y, int width, int height) {
y = y + height;
height = -height;
}
@@ -9982,7 +9983,7 @@ index 6c45c0f..497d1dc 100644
if (cairo != 0) {
Cairo.cairo_rectangle(cairo, x, y, width, height);
Cairo.cairo_fill(cairo);
-@@ -2126,7 +2126,7 @@ public void fillRoundRectangle(int x, int y, int width, int height, int arcWidth
+@@ -2130,7 +2130,7 @@ public void fillRoundRectangle(int x, int y, int width, int height, int arcWidth
}
if (naw < 0) naw = 0 - naw;
if (nah < 0) nah = 0 - nah;
@@ -9991,7 +9992,7 @@ index 6c45c0f..497d1dc 100644
if (cairo != 0) {
if (naw == 0 || nah == 0) {
Cairo.cairo_rectangle(cairo, x, y, width, height);
-@@ -2151,7 +2151,7 @@ public void fillRoundRectangle(int x, int y, int width, int height, int arcWidth
+@@ -2155,7 +2155,7 @@ public void fillRoundRectangle(int x, int y, int width, int height, int arcWidth
}
int naw2 = naw / 2;
int nah2 = nah / 2;
@@ -10000,7 +10001,7 @@ index 6c45c0f..497d1dc 100644
if (nw > naw) {
if (nh > nah) {
OS.gdk_draw_arc(drawable, handle, 1, nx, ny, naw, nah, 5760, 5760);
-@@ -2365,11 +2365,11 @@ public Rectangle getClipping() {
+@@ -2369,11 +2369,11 @@ public Rectangle getClipping() {
width = w[0];
height = h[0];
/* Intersect visible bounds with clipping in device space and then convert then to user space */
@@ -10016,7 +10017,7 @@ index 6c45c0f..497d1dc 100644
GdkRectangle rect = new GdkRectangle();
rect.width = width;
rect.height = height;
-@@ -2425,10 +2425,10 @@ public void getClipping(Region region) {
+@@ -2429,10 +2429,10 @@ public void getClipping(Region region) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (region == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (region.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
@@ -10030,7 +10031,7 @@ index 6c45c0f..497d1dc 100644
if (clipRgn == 0) {
GdkRectangle rect = new GdkRectangle();
int[] width = new int[1], height = new int[1];
-@@ -2439,7 +2439,7 @@ public void getClipping(Region region) {
+@@ -2443,7 +2443,7 @@ public void getClipping(Region region) {
} else {
/* Convert clipping to device space if needed */
if (data.clippingTransform != null) {
@@ -10039,7 +10040,7 @@ index 6c45c0f..497d1dc 100644
OS.gdk_region_union(clipping, rgn);
OS.gdk_region_destroy(rgn);
} else {
-@@ -2454,7 +2454,7 @@ public void getClipping(Region region) {
+@@ -2458,7 +2458,7 @@ public void getClipping(Region region) {
double[] matrix = new double[6];
Cairo.cairo_get_matrix(cairo, matrix);
Cairo.cairo_matrix_invert(matrix);
@@ -10048,7 +10049,7 @@ index 6c45c0f..497d1dc 100644
OS.gdk_region_subtract(clipping, clipping);
OS.gdk_region_union(clipping, rgn);
OS.gdk_region_destroy(rgn);
-@@ -2475,7 +2475,7 @@ public void getClipping(Region region) {
+@@ -2479,7 +2479,7 @@ public void getClipping(Region region) {
*/
public int getFillRule() {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -10057,7 +10058,7 @@ index 6c45c0f..497d1dc 100644
if (cairo == 0) return SWT.FILL_EVEN_ODD;
return Cairo.cairo_get_fill_rule(cairo) == Cairo.CAIRO_FILL_RULE_WINDING ? SWT.FILL_WINDING : SWT.FILL_EVEN_ODD;
}
-@@ -2511,9 +2511,9 @@ public FontMetrics getFontMetrics() {
+@@ -2515,9 +2515,9 @@ public FontMetrics getFontMetrics() {
if (data.context == 0) createLayout();
checkGC(FONT);
Font font = data.font;
@@ -10070,7 +10071,7 @@ index 6c45c0f..497d1dc 100644
FontMetrics fm = new FontMetrics();
fm.ascent = OS.PANGO_PIXELS(OS.pango_font_metrics_get_ascent(metrics));
fm.descent = OS.PANGO_PIXELS(OS.pango_font_metrics_get_descent(metrics));
-@@ -2748,7 +2748,7 @@ void getSize(int[] width, int[] height) {
+@@ -2752,7 +2752,7 @@ void getSize(int[] width, int[] height) {
return;
}
if (OS.USE_CAIRO) {
@@ -10079,7 +10080,7 @@ index 6c45c0f..497d1dc 100644
switch (Cairo.cairo_surface_get_type(surface)) {
case Cairo.CAIRO_SURFACE_TYPE_IMAGE:
width[0] = Cairo.cairo_image_surface_get_width(surface);
-@@ -2783,13 +2783,13 @@ public int getTextAntialias() {
+@@ -2787,13 +2787,13 @@ public int getTextAntialias() {
if (data.cairo == 0) return SWT.DEFAULT;
int antialias = Cairo.CAIRO_ANTIALIAS_DEFAULT;
if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {
@@ -10095,7 +10096,7 @@ index 6c45c0f..497d1dc 100644
if (options != 0) antialias = Cairo.cairo_font_options_get_antialias(options);
}
}
-@@ -2824,7 +2824,7 @@ public void getTransform(Transform transform) {
+@@ -2828,7 +2828,7 @@ public void getTransform(Transform transform) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (transform == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
@@ -10104,7 +10105,7 @@ index 6c45c0f..497d1dc 100644
if (cairo != 0) {
Cairo.cairo_get_matrix(cairo, transform.handle);
double[] identity = identity();
-@@ -2887,7 +2887,7 @@ double[] identity() {
+@@ -2891,7 +2891,7 @@ double[] identity() {
return identity;
}
@@ -10113,7 +10114,7 @@ index 6c45c0f..497d1dc 100644
if (data.foreground != null) data.state &= ~FOREGROUND;
if (data.background != null) data.state &= ~(BACKGROUND | BACKGROUND_BG);
if (data.font != null) data.state &= ~FONT;
-@@ -2906,7 +2906,7 @@ void init(Drawable drawable, GCData data, int /*long*/ gdkGC) {
+@@ -2910,7 +2910,7 @@ void init(Drawable drawable, GCData data, int /*long*/ gdkGC) {
this.data = data;
handle = gdkGC;
if (OS.USE_CAIRO) {
@@ -10122,7 +10123,7 @@ index 6c45c0f..497d1dc 100644
Cairo.cairo_set_fill_rule(cairo, Cairo.CAIRO_FILL_RULE_EVEN_ODD);
data.state &= ~(BACKGROUND | FOREGROUND | FONT | LINE_WIDTH | LINE_CAP | LINE_JOIN | LINE_STYLE | DRAW_OFFSET);
} else if (OS.INIT_CAIRO) {
-@@ -2915,27 +2915,27 @@ void init(Drawable drawable, GCData data, int /*long*/ gdkGC) {
+@@ -2919,27 +2919,27 @@ void init(Drawable drawable, GCData data, int /*long*/ gdkGC) {
setClipping(data.clipRgn);
if ((data.style & SWT.MIRRORED) != 0) {
initCairo();
@@ -10157,7 +10158,7 @@ index 6c45c0f..497d1dc 100644
OS.gdk_window_get_internal_paint_info(drawable, real_drawable, x, y);
xDrawable = OS.gdk_x11_drawable_get_xid(real_drawable[0]);
translateX = -x[0];
-@@ -2945,7 +2945,7 @@ void initCairo() {
+@@ -2949,7 +2949,7 @@ void initCairo() {
int[] w = new int[1], h = new int[1];
OS.gdk_drawable_get_size(drawable, w, h);
int width = w[0], height = h[0];
@@ -10166,7 +10167,7 @@ index 6c45c0f..497d1dc 100644
if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_surface_set_device_offset(surface, translateX, translateY);
data.cairo = cairo = Cairo.cairo_create(surface);
-@@ -3069,7 +3069,7 @@ public void setAdvanced(boolean advanced) {
+@@ -3073,7 +3073,7 @@ public void setAdvanced(boolean advanced) {
} catch (SWTException e) {}
} else {
if (!data.disposeCairo) return;
@@ -10175,7 +10176,7 @@ index 6c45c0f..497d1dc 100644
if (cairo != 0) Cairo.cairo_destroy(cairo);
data.cairo = 0;
data.interpolation = SWT.DEFAULT;
-@@ -3149,7 +3149,7 @@ public void setAntialias(int antialias) {
+@@ -3153,7 +3153,7 @@ public void setAntialias(int antialias) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
initCairo();
@@ -10184,7 +10185,7 @@ index 6c45c0f..497d1dc 100644
Cairo.cairo_set_antialias(cairo, mode);
}
-@@ -3211,12 +3211,12 @@ public void setBackgroundPattern(Pattern pattern) {
+@@ -3215,12 +3215,12 @@ public void setBackgroundPattern(Pattern pattern) {
data.state &= ~BACKGROUND;
}
@@ -10200,7 +10201,7 @@ index 6c45c0f..497d1dc 100644
int length = OS.strlen(family);
byte[] buffer = new byte[length + 1];
OS.memmove(buffer, family, length);
-@@ -3233,12 +3233,12 @@ static void setCairoFont(int /*long*/ cairo, int /*long*/ font) {
+@@ -3237,12 +3237,12 @@ static void setCairoFont(int /*long*/ cairo, int /*long*/ font) {
Cairo.cairo_set_font_size(cairo, height);
}
@@ -10215,7 +10216,7 @@ index 6c45c0f..497d1dc 100644
OS.gdk_region_get_rectangles(rgn, rects, nRects);
GdkRectangle rect = new GdkRectangle();
for (int i=0; i<nRects[0]; i++) {
-@@ -3249,7 +3249,7 @@ static void setCairoRegion(int /*long*/ cairo, int /*long*/ rgn) {
+@@ -3253,7 +3253,7 @@ static void setCairoRegion(int /*long*/ cairo, int /*long*/ rgn) {
}
}
@@ -10224,7 +10225,7 @@ index 6c45c0f..497d1dc 100644
GdkColor color = c.handle;
double aa = (alpha & 0xFF) / (double)0xFF;
double red = ((color.red & 0xFFFF) / (double)0xFFFF);
-@@ -3258,8 +3258,8 @@ static void setCairoPatternColor(int /*long*/ pattern, int offset, Color c, int
+@@ -3262,8 +3262,8 @@ static void setCairoPatternColor(int /*long*/ pattern, int offset, Color c, int
Cairo.cairo_pattern_add_color_stop_rgba(pattern, offset, red, green, blue, aa);
}
@@ -10235,7 +10236,7 @@ index 6c45c0f..497d1dc 100644
if (OS.GTK_VERSION >= OS.VERSION(2,18,0) && data.drawable != 0) {
OS.gdk_cairo_reset_clip(cairo, data.drawable);
} else {
-@@ -3281,8 +3281,8 @@ void setCairoClip(int /*long*/ damageRgn, int /*long*/ clipRgn) {
+@@ -3285,8 +3285,8 @@ void setCairoClip(int /*long*/ damageRgn, int /*long*/ clipRgn) {
}
}
@@ -10246,7 +10247,7 @@ index 6c45c0f..497d1dc 100644
if (clipRgn == 0) {
if (data.clipRgn != 0) {
OS.gdk_region_destroy(data.clipRgn);
-@@ -3292,7 +3292,7 @@ void setClipping(int /*long*/ clipRgn) {
+@@ -3296,7 +3296,7 @@ void setClipping(int /*long*/ clipRgn) {
data.clippingTransform = null;
setCairoClip(data.damageRgn, 0);
} else {
@@ -10255,7 +10256,7 @@ index 6c45c0f..497d1dc 100644
OS.gdk_gc_set_clip_region(handle, clipping);
}
} else {
-@@ -3304,7 +3304,7 @@ void setClipping(int /*long*/ clipRgn) {
+@@ -3308,7 +3308,7 @@ void setClipping(int /*long*/ clipRgn) {
Cairo.cairo_get_matrix(cairo, data.clippingTransform);
setCairoClip(data.damageRgn, clipRgn);
} else {
@@ -10264,7 +10265,7 @@ index 6c45c0f..497d1dc 100644
if (data.damageRgn != 0) {
clipping = OS.gdk_region_new();
OS.gdk_region_union(clipping, clipRgn);
-@@ -3345,7 +3345,7 @@ public void setClipping(int x, int y, int width, int height) {
+@@ -3349,7 +3349,7 @@ public void setClipping(int x, int y, int width, int height) {
rect.y = y;
rect.width = width;
rect.height = height;
@@ -10273,7 +10274,7 @@ index 6c45c0f..497d1dc 100644
OS.gdk_region_union_with_rect(clipRgn, rect);
setClipping(clipRgn);
OS.gdk_region_destroy(clipRgn);
-@@ -3383,8 +3383,8 @@ public void setClipping(Path path) {
+@@ -3387,8 +3387,8 @@ public void setClipping(Path path) {
setClipping(0);
if (path != null) {
initCairo();
@@ -10284,7 +10285,7 @@ index 6c45c0f..497d1dc 100644
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(cairo, copy);
Cairo.cairo_path_destroy(copy);
-@@ -3487,7 +3487,7 @@ public void setFillRule(int rule) {
+@@ -3491,7 +3491,7 @@ public void setFillRule(int rule) {
}
//TODO - need fill rule in X, GDK has no API
initCairo();
@@ -10293,7 +10294,7 @@ index 6c45c0f..497d1dc 100644
if (cairo != 0) {
Cairo.cairo_set_fill_rule(cairo, cairo_mode);
}
-@@ -3878,7 +3878,7 @@ void setString(String string, int flags) {
+@@ -3882,7 +3882,7 @@ void setString(String string, int flags) {
}
byte[] buffer;
int mnemonic, length = string.length ();
@@ -10302,7 +10303,7 @@ index 6c45c0f..497d1dc 100644
char[] text = new char[length];
string.getChars(0, length, text, 0);
if ((flags & SWT.DRAW_MNEMONIC) != 0 && (mnemonic = fixMnemonic(text)) != -1) {
-@@ -3891,8 +3891,8 @@ void setString(String string, int flags) {
+@@ -3895,8 +3895,8 @@ void setString(String string, int flags) {
buffer = new byte[buffer1.length + buffer2.length];
System.arraycopy(buffer1, 0, buffer, 0, buffer1.length);
System.arraycopy(buffer2, 0, buffer, buffer1.length, buffer2.length);
@@ -10313,7 +10314,7 @@ index 6c45c0f..497d1dc 100644
PangoAttribute attribute = new PangoAttribute();
OS.memmove(attribute, attr, PangoAttribute.sizeof);
attribute.start_index = buffer1.length;
-@@ -3954,7 +3954,7 @@ public void setTextAntialias(int antialias) {
+@@ -3958,7 +3958,7 @@ public void setTextAntialias(int antialias) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
initCairo();
@@ -10322,7 +10323,7 @@ index 6c45c0f..497d1dc 100644
Cairo.cairo_font_options_set_antialias(options, mode);
if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {
Cairo.cairo_set_font_options(data.cairo, options);
-@@ -3996,7 +3996,7 @@ public void setTransform(Transform transform) {
+@@ -4000,7 +4000,7 @@ public void setTransform(Transform transform) {
if (transform != null && transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
if (data.cairo == 0 && transform == null) return;
initCairo();
@@ -10331,7 +10332,7 @@ index 6c45c0f..497d1dc 100644
double[] identity = identity();
if (transform != null) {
Cairo.cairo_matrix_multiply(identity, transform.handle, identity);
-@@ -4028,7 +4028,7 @@ public void setTransform(Transform transform) {
+@@ -4032,7 +4032,7 @@ public void setTransform(Transform transform) {
*/
public void setXORMode(boolean xor) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -10340,7 +10341,7 @@ index 6c45c0f..497d1dc 100644
if (cairo != 0) {
if (Cairo.cairo_version() >= Cairo.CAIRO_VERSION_ENCODE(1, 10, 0)) {
Cairo.cairo_set_operator(handle, xor ? Cairo.CAIRO_OPERATOR_DIFFERENCE : Cairo.CAIRO_OPERATOR_OVER);
-@@ -4120,7 +4120,7 @@ public Point textExtent(String string) {
+@@ -4124,7 +4124,7 @@ public Point textExtent(String string) {
public Point textExtent(String string, int flags) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
@@ -10978,7 +10979,7 @@ index a2b8995..2c4cae5 100644
OS.gdk_region_destroy(rectRgn);
}
diff --git a/org/eclipse/swt/graphics/TextLayout.java b/org/eclipse/swt/graphics/TextLayout.java
-index c0f4ff3..90f892a 100644
+index 67695a3..c61fadb 100644
--- a/org/eclipse/swt/graphics/TextLayout.java
+++ b/org/eclipse/swt/graphics/TextLayout.java
@@ -54,7 +54,7 @@ public final class TextLayout extends Resource {
@@ -11041,7 +11042,7 @@ index c0f4ff3..90f892a 100644
OS.memmove(attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -249,7 +249,7 @@ void computeRuns () {
+@@ -251,7 +251,7 @@ void computeRuns () {
}
}
if (style.strikeout) {
@@ -11050,7 +11051,7 @@ index c0f4ff3..90f892a 100644
OS.memmove(attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -270,7 +270,7 @@ void computeRuns () {
+@@ -274,7 +274,7 @@ void computeRuns () {
Color foreground = style.foreground;
if (foreground != null && !foreground.isDisposed()) {
GdkColor fg = foreground.handle;
@@ -11059,7 +11060,7 @@ index c0f4ff3..90f892a 100644
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -280,7 +280,7 @@ void computeRuns () {
+@@ -284,7 +284,7 @@ void computeRuns () {
Color background = style.background;
if (background != null && !background.isDisposed()) {
GdkColor bg = background.handle;
@@ -11068,7 +11069,7 @@ index c0f4ff3..90f892a 100644
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -293,7 +293,7 @@ void computeRuns () {
+@@ -297,7 +297,7 @@ void computeRuns () {
rect.y = -(metrics.ascent * OS.PANGO_SCALE);
rect.height = (metrics.ascent + metrics.descent) * OS.PANGO_SCALE;
rect.width = metrics.width * OS.PANGO_SCALE;
@@ -11077,7 +11078,7 @@ index c0f4ff3..90f892a 100644
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -303,7 +303,7 @@ void computeRuns () {
+@@ -307,7 +307,7 @@ void computeRuns () {
}
int rise = style.rise;
if (rise != 0) {
@@ -11086,7 +11087,7 @@ index c0f4ff3..90f892a 100644
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -432,15 +432,15 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
+@@ -436,15 +436,15 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
x += Math.min (indent, wrapIndent);
boolean hasSelection = selectionStart <= selectionEnd && selectionStart != -1 && selectionEnd != -1;
GCData data = gc.data;
@@ -11106,7 +11107,7 @@ index c0f4ff3..90f892a 100644
if (selectionBackground == null) selectionBackground = device.getSystemColor(SWT.COLOR_LIST_SELECTION);
if (cairo != 0) {
Cairo.cairo_save(cairo);
-@@ -527,7 +527,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
+@@ -531,7 +531,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
boolean fullSelection = selectionStart == 0 && selectionEnd == length - 1;
if (fullSelection) {
if (cairo != 0) {
@@ -11115,7 +11116,7 @@ index c0f4ff3..90f892a 100644
if ((data.style & SWT.MIRRORED) != 0) {
Cairo.cairo_save(cairo);
Cairo.cairo_scale(cairo, -1, 1);
-@@ -542,7 +542,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
+@@ -546,7 +546,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
drawBorder(gc, x, y, selectionForeground.handle);
}
} else {
@@ -11124,7 +11125,7 @@ index c0f4ff3..90f892a 100644
int byteSelStart = (int)/*64*/(OS.g_utf16_offset_to_pointer(ptr, selectionStart) - ptr);
int byteSelEnd = (int)/*64*/(OS.g_utf16_offset_to_pointer(ptr, selectionEnd + 1) - ptr);
int strlen = OS.strlen(ptr);
-@@ -564,7 +564,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
+@@ -568,7 +568,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
OS.gdk_draw_layout(data.drawable, gc.handle, x, y, layout);
drawBorder(gc, x, y, null);
int[] ranges = new int[]{byteSelStart, byteSelEnd};
@@ -11133,7 +11134,7 @@ index c0f4ff3..90f892a 100644
if (rgn != 0) {
OS.gdk_gc_set_clip_region(gc.handle, rgn);
OS.gdk_region_destroy(rgn);
-@@ -583,7 +583,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
+@@ -587,7 +587,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
void drawWithCairo(GC gc, int x, int y, int start, int end, boolean fullSelection, GdkColor fg, GdkColor bg) {
GCData data = gc.data;
@@ -11142,7 +11143,7 @@ index c0f4ff3..90f892a 100644
Cairo.cairo_save(cairo);
if (!fullSelection) {
Cairo.cairo_move_to(cairo, x, y);
-@@ -591,7 +591,7 @@ void drawWithCairo(GC gc, int x, int y, int start, int end, boolean fullSelectio
+@@ -595,7 +595,7 @@ void drawWithCairo(GC gc, int x, int y, int start, int end, boolean fullSelectio
drawBorder(gc, x, y, null);
}
int[] ranges = new int[]{start, end};
@@ -11151,7 +11152,7 @@ index c0f4ff3..90f892a 100644
if (rgn != 0) {
OS.gdk_cairo_region(cairo, rgn);
Cairo.cairo_clip(cairo);
-@@ -610,9 +610,9 @@ void drawWithCairo(GC gc, int x, int y, int start, int end, boolean fullSelectio
+@@ -614,9 +614,9 @@ void drawWithCairo(GC gc, int x, int y, int start, int end, boolean fullSelectio
void drawBorder(GC gc, int x, int y, GdkColor selectionColor) {
GCData data = gc.data;
@@ -11164,7 +11165,7 @@ index c0f4ff3..90f892a 100644
GdkGCValues gcValues = null;
if (cairo != 0) {
Cairo.cairo_save(cairo);
-@@ -632,10 +632,10 @@ void drawBorder(GC gc, int x, int y, GdkColor selectionColor) {
+@@ -636,10 +636,10 @@ void drawBorder(GC gc, int x, int y, GdkColor selectionColor) {
int byteStart = (int)/*64*/(OS.g_utf16_offset_to_pointer(ptr, start) - ptr);
int byteEnd = (int)/*64*/(OS.g_utf16_offset_to_pointer(ptr, end + 1) - ptr);
int[] ranges = new int[]{byteStart, byteEnd};
@@ -11177,7 +11178,7 @@ index c0f4ff3..90f892a 100644
OS.gdk_region_get_rectangles(rgn, rects, nRects);
GdkRectangle rect = new GdkRectangle();
GdkColor color = null;
-@@ -814,14 +814,14 @@ public Rectangle getBounds(int start, int end) {
+@@ -818,14 +818,14 @@ public Rectangle getBounds(int start, int end) {
end = Math.min(Math.max(0, end), length - 1);
start = translateOffset(start);
end = translateOffset(end);
@@ -11194,7 +11195,7 @@ index c0f4ff3..90f892a 100644
if (clipRegion == 0) return new Rectangle(0, 0, 0, 0);
GdkRectangle rect = new GdkRectangle();
-@@ -831,9 +831,9 @@ public Rectangle getBounds(int start, int end) {
+@@ -835,9 +835,9 @@ public Rectangle getBounds(int start, int end) {
* is to subtract these areas from the clip region.
*/
PangoRectangle pangoRect = new PangoRectangle();
@@ -11206,7 +11207,7 @@ index c0f4ff3..90f892a 100644
if (linesRegion == 0) SWT.error(SWT.ERROR_NO_HANDLES);
int lineEnd = 0;
do {
-@@ -949,17 +949,17 @@ public int getLevel(int offset) {
+@@ -953,17 +953,17 @@ public int getLevel(int offset) {
int length = text.length();
if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_RANGE);
offset = translateOffset(offset);
@@ -11228,7 +11229,7 @@ index c0f4ff3..90f892a 100644
if (runPtr != 0) {
OS.memmove(run, runPtr, PangoLayoutRun.sizeof);
OS.memmove(item, run.item, PangoItem.sizeof);
-@@ -991,7 +991,7 @@ public Rectangle getLineBounds(int lineIndex) {
+@@ -995,7 +995,7 @@ public Rectangle getLineBounds(int lineIndex) {
computeRuns();
int lineCount = OS.pango_layout_get_line_count(layout);
if (!(0 <= lineIndex && lineIndex < lineCount)) SWT.error(SWT.ERROR_INVALID_RANGE);
@@ -11237,7 +11238,7 @@ index c0f4ff3..90f892a 100644
if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES);
for (int i = 0; i < lineIndex; i++) OS.pango_layout_iter_next_line(iter);
PangoRectangle rect = new PangoRectangle();
-@@ -1048,11 +1048,11 @@ public int getLineIndex(int offset) {
+@@ -1052,11 +1052,11 @@ public int getLineIndex(int offset) {
if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
offset = translateOffset(offset);
int line = 0;
@@ -11252,7 +11253,7 @@ index c0f4ff3..90f892a 100644
if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES);
while (OS.pango_layout_iter_next_line(iter)) {
if (OS.pango_layout_iter_get_index(iter) > byteOffset) break;
-@@ -1084,9 +1084,9 @@ public FontMetrics getLineMetrics (int lineIndex) {
+@@ -1088,9 +1088,9 @@ public FontMetrics getLineMetrics (int lineIndex) {
PangoLayoutLine line = new PangoLayoutLine();
OS.memmove(line, OS.pango_layout_get_line(layout, lineIndex), PangoLayoutLine.sizeof);
if (line.runs == 0) {
@@ -11265,7 +11266,7 @@ index c0f4ff3..90f892a 100644
ascent = OS.pango_font_metrics_get_ascent(metrics);
descent = OS.pango_font_metrics_get_descent(metrics);
OS.pango_font_metrics_unref(metrics);
-@@ -1117,10 +1117,10 @@ public int[] getLineOffsets() {
+@@ -1121,10 +1121,10 @@ public int[] getLineOffsets() {
computeRuns();
int lineCount = OS.pango_layout_get_line_count(layout);
int[] offsets = new int [lineCount + 1];
@@ -11278,7 +11279,7 @@ index c0f4ff3..90f892a 100644
OS.memmove(line, linePtr, PangoLayoutLine.sizeof);
int pos = (int)/*64*/OS.g_utf16_pointer_to_offset(ptr, ptr + line.start_index);
offsets[i] = untranslateOffset(pos);
-@@ -1151,7 +1151,7 @@ public Point getLocation(int offset, boolean trailing) {
+@@ -1155,7 +1155,7 @@ public Point getLocation(int offset, boolean trailing) {
int length = text.length();
if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_RANGE);
offset = translateOffset(offset);
@@ -11287,7 +11288,7 @@ index c0f4ff3..90f892a 100644
int byteOffset = (int)/*64*/(OS.g_utf16_offset_to_pointer(ptr, offset) - ptr);
int strlen = OS.strlen(ptr);
byteOffset = Math.min(byteOffset, strlen);
-@@ -1202,12 +1202,12 @@ int _getOffset (int offset, int movement, boolean forward) {
+@@ -1206,12 +1206,12 @@ int _getOffset (int offset, int movement, boolean forward) {
}
int step = forward ? 1 : -1;
if ((movement & SWT.MOVEMENT_CHAR) != 0) return offset + step;
@@ -11302,7 +11303,7 @@ index c0f4ff3..90f892a 100644
int utf8Offset = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, translateOffset(offset));
int utf8Length = (int)/*64*/OS.g_utf8_strlen(ptr, -1);
utf8Offset += step;
-@@ -1325,7 +1325,7 @@ public int getOffset(int x, int y, int[] trailing) {
+@@ -1329,7 +1329,7 @@ public int getOffset(int x, int y, int[] trailing) {
* visual offset. The fix is to clamp the coordinates inside the
* line bounds.
*/
@@ -11311,7 +11312,7 @@ index c0f4ff3..90f892a 100644
if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES);
PangoRectangle rect = new PangoRectangle();
do {
-@@ -1345,7 +1345,7 @@ public int getOffset(int x, int y, int[] trailing) {
+@@ -1349,7 +1349,7 @@ public int getOffset(int x, int y, int[] trailing) {
int[] index = new int[1];
int[] piTrailing = new int[1];
OS.pango_layout_xy_to_index(layout, x * OS.PANGO_SCALE, y * OS.PANGO_SCALE, index, piTrailing);
@@ -11320,7 +11321,7 @@ index c0f4ff3..90f892a 100644
int offset = (int)/*64*/OS.g_utf16_pointer_to_offset(ptr, ptr + index[0]);
if (trailing != null) {
trailing[0] = piTrailing[0];
-@@ -2045,7 +2045,7 @@ public void setTabs(int[] tabs) {
+@@ -2049,7 +2049,7 @@ public void setTabs(int[] tabs) {
if (tabs == null) {
OS.pango_layout_set_tabs(layout, device.emptyTab);
} else {
@@ -11753,7 +11754,7 @@ index 91f0a09..60a6882 100644
}
diff --git a/org/eclipse/swt/internal/Library.java b/org/eclipse/swt/internal/Library.java
-index d2c5523..b2b17d6 100644
+index 510b413..1c6c829 100644
--- a/org/eclipse/swt/internal/Library.java
+++ b/org/eclipse/swt/internal/Library.java
@@ -42,7 +42,7 @@ public class Library {
@@ -15409,7 +15410,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 ea39bc8..d687398 100644
+index f55aeff..4493e70 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 {
@@ -15592,7 +15593,18 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _call(function, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -812,8 +812,8 @@ public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0,
+@@ -810,8 +810,8 @@ public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0,
+ }
+ }
+ /** @method flags=no_gen */
+-public static final native void _call_get_size (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, int /*long*/ arg5, int /*long*/ arg6);
+-public static final void call_get_size (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, int /*long*/ arg5, int /*long*/ arg6) {
++public static final native void _call_get_size (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5, long /*int*/ arg6);
++public static final void call_get_size (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5, long /*int*/ arg6) {
+ lock.lock();
+ try {
+ _call_get_size(function, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+@@ -822,8 +822,8 @@ public static final void call_get_size (int /*long*/ function, int /*long*/ arg0
/** @method flags=no_gen */
public static final native boolean GDK_WINDOWING_X11();
/** @param pixmap cast=(GdkPixmap *) */
@@ -15603,7 +15615,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GDK_PIXMAP_XID(pixmap);
-@@ -826,8 +826,8 @@ public static final int /*long*/ GDK_PIXMAP_XID(int /*long*/ pixmap) {
+@@ -836,8 +836,8 @@ public static final int /*long*/ GDK_PIXMAP_XID(int /*long*/ pixmap) {
* @param event_mask cast=(long)
* @param event_return cast=(XEvent *)
*/
@@ -15614,7 +15626,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XCheckMaskEvent(display, event_mask, event_return);
-@@ -841,8 +841,8 @@ public static final boolean XCheckMaskEvent(int /*long*/ display, int /*long*/ e
+@@ -851,8 +851,8 @@ public static final boolean XCheckMaskEvent(int /*long*/ display, int /*long*/ e
* @param event_mask cast=(long)
* @param event_return cast=(XEvent *)
*/
@@ -15625,7 +15637,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XCheckWindowEvent(display, window, event_mask, event_return);
-@@ -856,8 +856,8 @@ public static final boolean XCheckWindowEvent(int /*long*/ display, int /*long*/
+@@ -866,8 +866,8 @@ public static final boolean XCheckWindowEvent(int /*long*/ display, int /*long*/
* @param predicate cast=(Bool (*)())
* @param arg cast=(XPointer)
*/
@@ -15636,7 +15648,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XCheckIfEvent(display, event_return, predicate, arg);
-@@ -866,8 +866,8 @@ public static final boolean XCheckIfEvent(int /*long*/ display, int /*long*/ eve
+@@ -876,8 +876,8 @@ public static final boolean XCheckIfEvent(int /*long*/ display, int /*long*/ eve
}
}
/** @param display cast=(Display *) */
@@ -15647,7 +15659,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XDefaultScreen(display);
-@@ -876,8 +876,8 @@ public static final int XDefaultScreen(int /*long*/ display) {
+@@ -886,8 +886,8 @@ public static final int XDefaultScreen(int /*long*/ display) {
}
}
/** @param display cast=(Display *) */
@@ -15658,7 +15670,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XDefaultRootWindow(display);
-@@ -886,8 +886,8 @@ public static final int /*long*/ XDefaultRootWindow(int /*long*/ display) {
+@@ -896,8 +896,8 @@ public static final int /*long*/ XDefaultRootWindow(int /*long*/ display) {
}
}
/** @param display cast=(Display *) */
@@ -15669,7 +15681,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_XFlush(display);
-@@ -896,8 +896,8 @@ public static final void XFlush(int /*long*/ display) {
+@@ -906,8 +906,8 @@ public static final void XFlush(int /*long*/ display) {
}
}
/** @param address cast=(void *) */
@@ -15680,7 +15692,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_XFree(address);
-@@ -911,8 +911,8 @@ public static final void XFree(int /*long*/ address) {
+@@ -921,8 +921,8 @@ public static final void XFree(int /*long*/ address) {
* @param window cast=(Window)
* @param time cast=(Time)
*/
@@ -15691,7 +15703,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XSetSelectionOwner(display, selection, window, time);
-@@ -924,8 +924,8 @@ public static final int /*long*/ XSetSelectionOwner(int /*long*/ display, int /*
+@@ -934,8 +934,8 @@ public static final int /*long*/ XSetSelectionOwner(int /*long*/ display, int /*
* @param display cast=(Display *)
* @param selection cast=(Atom)
*/
@@ -15702,7 +15714,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XGetSelectionOwner(display, selection);
-@@ -945,8 +945,8 @@ public static final int /*long*/ XGetSelectionOwner(int /*long*/ display, int /*
+@@ -955,8 +955,8 @@ public static final int /*long*/ XGetSelectionOwner(int /*long*/ display, int /*
* @param bytes_after_return cast=(unsigned long *)
* @param prop_return cast=(unsigned char **)
*/
@@ -15713,7 +15725,7 @@ index ea39bc8..d687398 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);
-@@ -961,8 +961,8 @@ public static final int /*long*/ XGetWindowProperty(int /*long*/ display, int /*
+@@ -971,8 +971,8 @@ public static final int /*long*/ XGetWindowProperty(int /*long*/ display, int /*
* @param name cast=(char *)
* @param ifExists cast=(Bool)
*/
@@ -15724,7 +15736,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XInternAtom(display, name, ifExists);
-@@ -981,8 +981,8 @@ public static final int /*long*/ XInternAtom(int /*long*/ display, byte[] name,
+@@ -991,8 +991,8 @@ public static final int /*long*/ XInternAtom(int /*long*/ display, byte[] name,
* @param win_y_return cast=(int *)
* @param mask_return cast=(unsigned int *)
*/
@@ -15735,7 +15747,7 @@ index ea39bc8..d687398 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);
-@@ -998,8 +998,8 @@ public static final int XQueryPointer(int /*long*/ display, int /*long*/ w, int
+@@ -1008,8 +1008,8 @@ public static final int XQueryPointer(int /*long*/ display, int /*long*/ w, int
* @param children_return cast=(Window **)
* @param nchildren_return cast=(unsigned int *)
*/
@@ -15746,7 +15758,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XQueryTree(display, w, root_return, parent_return, children_return, nchildren_return);
-@@ -1011,8 +1011,8 @@ public static final int XQueryTree(int /*long*/ display, int /*long*/ w, int /*l
+@@ -1021,8 +1021,8 @@ public static final int XQueryTree(int /*long*/ display, int /*long*/ w, int /*l
* @param display cast=(Display *)
* @param keysym cast=(KeySym)
*/
@@ -15757,7 +15769,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XKeysymToKeycode(display, keysym);
-@@ -1025,8 +1025,8 @@ public static final int XKeysymToKeycode(int /*long*/ display, int /*long*/ keys
+@@ -1035,8 +1035,8 @@ public static final int XKeysymToKeycode(int /*long*/ display, int /*long*/ keys
* @param window cast=(Window)
* @param num_prop_return cast=(int *)
*/
@@ -15768,7 +15780,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XListProperties(display, window, num_prop_return);
-@@ -1039,8 +1039,8 @@ public static final int /*long*/ XListProperties(int /*long*/ display, int /*lon
+@@ -1049,8 +1049,8 @@ public static final int /*long*/ XListProperties(int /*long*/ display, int /*lon
* @param window cast=(Window)
* @param values flags=no_out
*/
@@ -15779,7 +15791,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XReconfigureWMWindow(display, window, screen, valueMask, values);
-@@ -1053,8 +1053,8 @@ public static final int XReconfigureWMWindow(int /*long*/ display, int /*long*/
+@@ -1063,8 +1063,8 @@ public static final int XReconfigureWMWindow(int /*long*/ display, int /*long*/
* @param w cast=(Window)
* @param event_send cast=(XEvent *)
*/
@@ -15790,7 +15802,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XSendEvent(display, w, propogate, event_mask, event_send);
-@@ -1063,8 +1063,8 @@ public static final int XSendEvent(int /*long*/ display, int /*long*/ w, boolean
+@@ -1073,8 +1073,8 @@ public static final int XSendEvent(int /*long*/ display, int /*long*/ w, boolean
}
}
/** @param handler cast=(XIOErrorHandler) */
@@ -15801,7 +15813,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XSetIOErrorHandler(handler);
-@@ -1073,8 +1073,8 @@ public static final int /*long*/ XSetIOErrorHandler(int /*long*/ handler) {
+@@ -1083,8 +1083,8 @@ public static final int /*long*/ XSetIOErrorHandler(int /*long*/ handler) {
}
}
/** @param handler cast=(XErrorHandler) */
@@ -15812,7 +15824,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XSetErrorHandler(handler);
-@@ -1086,8 +1086,8 @@ public static final int /*long*/ XSetErrorHandler(int /*long*/ handler) {
+@@ -1096,8 +1096,8 @@ public static final int /*long*/ XSetErrorHandler(int /*long*/ handler) {
* @param display cast=(Display *)
* @param window cast=(Window)
*/
@@ -15823,7 +15835,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XSetInputFocus(display, window, revert, time);
-@@ -1100,8 +1100,8 @@ public static final int XSetInputFocus(int /*long*/ display, int /*long*/ window
+@@ -1110,8 +1110,8 @@ public static final int XSetInputFocus(int /*long*/ display, int /*long*/ window
* @param w cast=(Window)
* @param prop_window cast=(Window)
*/
@@ -15834,7 +15846,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XSetTransientForHint(display, w, prop_window);
-@@ -1110,8 +1110,8 @@ public static final int XSetTransientForHint(int /*long*/ display, int /*long*/
+@@ -1120,8 +1120,8 @@ public static final int XSetTransientForHint(int /*long*/ display, int /*long*/
}
}
/** @param display cast=(Display *) */
@@ -15845,7 +15857,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XSynchronize(display, onoff);
-@@ -1124,8 +1124,8 @@ public static final int /*long*/ XSynchronize(int /*long*/ display, boolean onof
+@@ -1134,8 +1134,8 @@ public static final int /*long*/ XSynchronize(int /*long*/ display, boolean onof
* @param is_press cast=(Bool)
* @param delay cast=(unsigned long)
*/
@@ -15856,7 +15868,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_XTestFakeButtonEvent(display, button, is_press, delay);
-@@ -1138,8 +1138,8 @@ public static final void XTestFakeButtonEvent(int /*long*/ display, int button,
+@@ -1148,8 +1148,8 @@ public static final void XTestFakeButtonEvent(int /*long*/ display, int button,
* @param is_press cast=(Bool)
* @param delay cast=(unsigned long)
*/
@@ -15867,7 +15879,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_XTestFakeKeyEvent(display, keycode, is_press, delay);
-@@ -1151,8 +1151,8 @@ public static final void XTestFakeKeyEvent(int /*long*/ display, int keycode, bo
+@@ -1161,8 +1161,8 @@ public static final void XTestFakeKeyEvent(int /*long*/ display, int keycode, bo
* @param display cast=(Display *)
* @param delay cast=(unsigned long)
*/
@@ -15878,7 +15890,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_XTestFakeMotionEvent(display, screen_number, x, y, delay);
-@@ -1165,8 +1165,8 @@ public static final void XTestFakeMotionEvent(int /*long*/ display, int screen_n
+@@ -1175,8 +1175,8 @@ public static final void XTestFakeMotionEvent(int /*long*/ display, int screen_n
* @param sourceWindow cast=(Window)
* @param destWindow cast=(Window)
*/
@@ -15889,7 +15901,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XWarpPointer(display, sourceWindow, destWindow, sourceX, sourceY, sourceWidth, sourceHeight, destX, destY);
-@@ -1175,8 +1175,8 @@ public static final int XWarpPointer(int /*long*/ display, int /*long*/ sourceWi
+@@ -1185,8 +1185,8 @@ public static final int XWarpPointer(int /*long*/ display, int /*long*/ sourceWi
}
}
/** @param atom cast=(GdkAtom) */
@@ -15900,7 +15912,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_x11_atom_to_xatom(atom);
-@@ -1185,8 +1185,8 @@ public static final int /*long*/ gdk_x11_atom_to_xatom(int /*long*/ atom) {
+@@ -1195,8 +1195,8 @@ public static final int /*long*/ gdk_x11_atom_to_xatom(int /*long*/ atom) {
}
}
/** @param colormap cast=(GdkColormap *) */
@@ -15911,7 +15923,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_x11_colormap_get_xcolormap(colormap);
-@@ -1195,8 +1195,8 @@ public static final int /*long*/ gdk_x11_colormap_get_xcolormap(int /*long*/ col
+@@ -1205,8 +1205,8 @@ public static final int /*long*/ gdk_x11_colormap_get_xcolormap(int /*long*/ col
}
}
/** @param gdkdisplay cast=(GdkDisplay *) */
@@ -15922,7 +15934,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_x11_display_get_xdisplay(gdkdisplay);
-@@ -1205,8 +1205,8 @@ public static final int /*long*/ gdk_x11_display_get_xdisplay (int /*long*/ gdkd
+@@ -1215,8 +1215,8 @@ public static final int /*long*/ gdk_x11_display_get_xdisplay (int /*long*/ gdkd
}
}
/** @param drawable cast=(GdkDrawable *) */
@@ -15933,7 +15945,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_x11_drawable_get_xdisplay(drawable);
-@@ -1215,8 +1215,8 @@ public static final int /*long*/ gdk_x11_drawable_get_xdisplay(int /*long*/ draw
+@@ -1225,8 +1225,8 @@ public static final int /*long*/ gdk_x11_drawable_get_xdisplay(int /*long*/ draw
}
}
/** @param drawable cast=(GdkDrawable *) */
@@ -15944,7 +15956,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_x11_drawable_get_xid(drawable);
-@@ -1229,8 +1229,8 @@ public static final int /*long*/ gdk_x11_drawable_get_xid(int /*long*/ drawable)
+@@ -1239,8 +1239,8 @@ public static final int /*long*/ gdk_x11_drawable_get_xid(int /*long*/ drawable)
* @param screen cast=(GdkScreen *)
* @param xvisualid cast=(VisualID)
*/
@@ -15955,7 +15967,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_x11_screen_lookup_visual(screen, xvisualid);
-@@ -1242,8 +1242,8 @@ public static final int /*long*/ gdk_x11_screen_lookup_visual(int /*long*/ scree
+@@ -1252,8 +1252,8 @@ public static final int /*long*/ gdk_x11_screen_lookup_visual(int /*long*/ scree
* @method flags=dynamic
* @param screen cast=(GdkScreen *)
*/
@@ -15966,7 +15978,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_x11_screen_get_window_manager_name(screen);
-@@ -1252,8 +1252,8 @@ public static final int /*long*/ gdk_x11_screen_get_window_manager_name(int /*lo
+@@ -1262,8 +1262,8 @@ public static final int /*long*/ gdk_x11_screen_get_window_manager_name(int /*lo
}
}
/** @param visual cast=(GdkVisual *) */
@@ -15977,7 +15989,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_x11_visual_get_xvisual(visual);
-@@ -1265,8 +1265,8 @@ public static final int /*long*/ gdk_x11_visual_get_xvisual(int /*long*/ visual)
+@@ -1275,8 +1275,8 @@ public static final int /*long*/ gdk_x11_visual_get_xvisual(int /*long*/ visual)
* @method flags=dynamic
* @param gdkdisplay cast=(GdkDisplay *)
*/
@@ -15988,7 +16000,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_x11_window_lookup_for_display(gdkdisplay, xid);
-@@ -1274,8 +1274,8 @@ public static final int /*long*/ gdk_x11_window_lookup_for_display(int /*long*/
+@@ -1284,8 +1284,8 @@ public static final int /*long*/ gdk_x11_window_lookup_for_display(int /*long*/
lock.unlock();
}
}
@@ -15999,7 +16011,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_pixmap_foreign_new(anid);
-@@ -1286,8 +1286,8 @@ public static final int /*long*/ gdk_pixmap_foreign_new(int /*long*/ anid) {
+@@ -1296,8 +1296,8 @@ public static final int /*long*/ gdk_pixmap_foreign_new(int /*long*/ anid) {
/**
* @method flags=dynamic
*/
@@ -16010,7 +16022,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_window_lookup(xid);
-@@ -1300,8 +1300,8 @@ public static final int /*long*/ gdk_window_lookup(int /*long*/ xid) {
+@@ -1310,8 +1310,8 @@ public static final int /*long*/ gdk_window_lookup(int /*long*/ xid) {
* @param function cast=(GdkFilterFunc)
* @param data cast=(gpointer)
*/
@@ -16021,7 +16033,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_add_filter(window, function, data);
-@@ -1314,8 +1314,8 @@ public static final void gdk_window_add_filter(int /*long*/ window, int /*long*/
+@@ -1324,8 +1324,8 @@ public static final void gdk_window_add_filter(int /*long*/ window, int /*long*/
* @param function cast=(GdkFilterFunc)
* @param data cast=(gpointer)
*/
@@ -16032,7 +16044,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_remove_filter(window, function, data);
-@@ -1328,49 +1328,49 @@ public static final void gdk_window_remove_filter(int /*long*/ window, int /*lon
+@@ -1338,49 +1338,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)
*/
@@ -16090,7 +16102,7 @@ index ea39bc8..d687398 100644
/** @method flags=const */
public static final native int RTLD_GLOBAL();
-@@ -1390,8 +1390,8 @@ public static final int PictOpOver = 3;
+@@ -1400,8 +1400,8 @@ public static final int PictOpOver = 3;
public static final native int XRenderPictureAttributes_sizeof();
/** @method flags=dynamic */
@@ -16101,7 +16113,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XRenderQueryExtension(display, event_basep, error_basep);
-@@ -1400,8 +1400,8 @@ public static final boolean XRenderQueryExtension(int /*long*/ display, int[] ev
+@@ -1410,8 +1410,8 @@ public static final boolean XRenderQueryExtension(int /*long*/ display, int[] ev
}
}
/** @method flags=dynamic */
@@ -16112,7 +16124,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XRenderQueryVersion(display, major_versionp, minor_versionp);
-@@ -1413,8 +1413,8 @@ public static final int XRenderQueryVersion(int /*long*/ display, int[] major_ve
+@@ -1423,8 +1423,8 @@ public static final int XRenderQueryVersion(int /*long*/ display, int[] major_ve
* @method flags=dynamic
* @param attributes flags=no_out
*/
@@ -16123,7 +16135,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XRenderCreatePicture(display, drawable, format, valuemask, attributes);
-@@ -1423,8 +1423,8 @@ public static final int /*long*/ XRenderCreatePicture(int /*long*/ display, int
+@@ -1433,8 +1433,8 @@ public static final int /*long*/ XRenderCreatePicture(int /*long*/ display, int
}
}
/** @method flags=dynamic */
@@ -16134,7 +16146,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_XRenderSetPictureClipRectangles(display, picture, xOrigin, yOrigin, rects, count);
-@@ -1433,8 +1433,8 @@ public static final void XRenderSetPictureClipRectangles(int /*long*/ display, i
+@@ -1443,8 +1443,8 @@ public static final void XRenderSetPictureClipRectangles(int /*long*/ display, i
}
}
/** @method flags=dynamic */
@@ -16145,7 +16157,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_XRenderSetPictureTransform(display, picture, transform);
-@@ -1443,8 +1443,8 @@ public static final void XRenderSetPictureTransform(int /*long*/ display, int /*
+@@ -1453,8 +1453,8 @@ public static final void XRenderSetPictureTransform(int /*long*/ display, int /*
}
}
/** @method flags=dynamic */
@@ -16156,7 +16168,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_XRenderFreePicture(display, picture);
-@@ -1453,8 +1453,8 @@ public static final void XRenderFreePicture(int /*long*/ display, int /*long*/ p
+@@ -1463,8 +1463,8 @@ public static final void XRenderFreePicture(int /*long*/ display, int /*long*/ p
}
}
/** @method flags=dynamic */
@@ -16167,7 +16179,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_XRenderComposite(display, op, src, mask, dst, src_x, src_y, mask_x, mask_y, dst_x, dst_y, width, height);
-@@ -1463,8 +1463,8 @@ public static final void XRenderComposite(int /*long*/ display, int op, int /*lo
+@@ -1473,8 +1473,8 @@ public static final void XRenderComposite(int /*long*/ display, int op, int /*lo
}
}
/** @method flags=dynamic */
@@ -16178,7 +16190,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XRenderFindStandardFormat(display, format);
-@@ -1473,8 +1473,8 @@ public static final int /*long*/ XRenderFindStandardFormat(int /*long*/ display,
+@@ -1483,8 +1483,8 @@ public static final int /*long*/ XRenderFindStandardFormat(int /*long*/ display,
}
}
/** @method flags=dynamic */
@@ -16189,7 +16201,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _XRenderFindVisualFormat(display, visual);
-@@ -1486,15 +1486,15 @@ public static final int /*long*/ XRenderFindVisualFormat(int /*long*/ display, i
+@@ -1496,15 +1496,15 @@ public static final int /*long*/ XRenderFindVisualFormat(int /*long*/ display, i
/** Custom callbacks */
/** @method flags=no_gen */
@@ -16210,7 +16222,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GDK_TYPE_COLOR();
-@@ -1503,8 +1503,8 @@ public static final int /*long*/ GDK_TYPE_COLOR() {
+@@ -1513,8 +1513,8 @@ public static final int /*long*/ GDK_TYPE_COLOR() {
}
}
/** @method flags=const */
@@ -16221,7 +16233,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GDK_TYPE_PIXBUF();
-@@ -1512,8 +1512,8 @@ public static final int /*long*/ GDK_TYPE_PIXBUF() {
+@@ -1522,8 +1522,8 @@ public static final int /*long*/ GDK_TYPE_PIXBUF() {
lock.unlock();
}
}
@@ -16232,7 +16244,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_IS_ACCEL_LABEL(obj);
-@@ -1521,8 +1521,8 @@ public static final boolean GTK_IS_ACCEL_LABEL(int /*long*/ obj) {
+@@ -1531,8 +1531,8 @@ public static final boolean GTK_IS_ACCEL_LABEL(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16243,7 +16255,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_IS_BUTTON(obj);
-@@ -1530,8 +1530,8 @@ public static final boolean GTK_IS_BUTTON(int /*long*/ obj) {
+@@ -1540,8 +1540,8 @@ public static final boolean GTK_IS_BUTTON(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16254,7 +16266,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_IS_LABEL(obj);
-@@ -1539,8 +1539,8 @@ public static final boolean GTK_IS_LABEL(int /*long*/ obj) {
+@@ -1549,8 +1549,8 @@ public static final boolean GTK_IS_LABEL(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16265,7 +16277,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_IS_SCROLLED_WINDOW(obj);
-@@ -1548,8 +1548,8 @@ public static final boolean GTK_IS_SCROLLED_WINDOW(int /*long*/ obj) {
+@@ -1558,8 +1558,8 @@ public static final boolean GTK_IS_SCROLLED_WINDOW(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16276,7 +16288,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_IS_WINDOW(obj);
-@@ -1557,8 +1557,8 @@ public static final boolean GTK_IS_WINDOW(int /*long*/ obj) {
+@@ -1567,8 +1567,8 @@ public static final boolean GTK_IS_WINDOW(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16287,7 +16299,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_IS_CELL_RENDERER_PIXBUF(obj);
-@@ -1566,8 +1566,8 @@ public static final boolean GTK_IS_CELL_RENDERER_PIXBUF(int /*long*/ obj) {
+@@ -1576,8 +1576,8 @@ public static final boolean GTK_IS_CELL_RENDERER_PIXBUF(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16298,7 +16310,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_IS_CELL_RENDERER_TEXT(obj);
-@@ -1575,8 +1575,8 @@ public static final boolean GTK_IS_CELL_RENDERER_TEXT(int /*long*/ obj) {
+@@ -1585,8 +1585,8 @@ public static final boolean GTK_IS_CELL_RENDERER_TEXT(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16309,7 +16321,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_IS_CELL_RENDERER_TOGGLE(obj);
-@@ -1584,8 +1584,8 @@ public static final boolean GTK_IS_CELL_RENDERER_TOGGLE(int /*long*/ obj) {
+@@ -1594,8 +1594,8 @@ public static final boolean GTK_IS_CELL_RENDERER_TOGGLE(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16320,7 +16332,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_IS_CONTAINER(obj);
-@@ -1593,8 +1593,8 @@ public static final boolean GTK_IS_CONTAINER(int /*long*/ obj) {
+@@ -1603,8 +1603,8 @@ public static final boolean GTK_IS_CONTAINER(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16331,7 +16343,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_IS_IMAGE_MENU_ITEM(obj);
-@@ -1602,8 +1602,8 @@ public static final boolean GTK_IS_IMAGE_MENU_ITEM(int /*long*/ obj) {
+@@ -1612,8 +1612,8 @@ public static final boolean GTK_IS_IMAGE_MENU_ITEM(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16342,7 +16354,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_IS_MENU_ITEM(obj);
-@@ -1611,8 +1611,8 @@ public static final boolean GTK_IS_MENU_ITEM(int /*long*/ obj) {
+@@ -1621,8 +1621,8 @@ public static final boolean GTK_IS_MENU_ITEM(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16353,7 +16365,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_IS_PLUG(obj);
-@@ -1620,8 +1620,8 @@ public static final boolean GTK_IS_PLUG(int /*long*/ obj) {
+@@ -1630,8 +1630,8 @@ public static final boolean GTK_IS_PLUG(int /*long*/ obj) {
lock.unlock();
}
}
@@ -16364,7 +16376,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_IS_SOCKET(obj);
-@@ -1630,8 +1630,8 @@ public static final boolean GTK_IS_SOCKET(int /*long*/ obj) {
+@@ -1640,8 +1640,8 @@ public static final boolean GTK_IS_SOCKET(int /*long*/ obj) {
}
}
/** @method flags=const */
@@ -16375,7 +16387,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_STOCK_CANCEL();
-@@ -1640,8 +1640,8 @@ public static final int /*long*/ GTK_STOCK_CANCEL() {
+@@ -1650,8 +1650,8 @@ public static final int /*long*/ GTK_STOCK_CANCEL() {
}
}
/** @method flags=const */
@@ -16386,7 +16398,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_STOCK_OK();
-@@ -1650,8 +1650,8 @@ public static final int /*long*/ GTK_STOCK_OK() {
+@@ -1660,8 +1660,8 @@ public static final int /*long*/ GTK_STOCK_OK() {
}
}
/** @method flags=const */
@@ -16397,7 +16409,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_TYPE_CELL_RENDERER_TEXT();
-@@ -1660,8 +1660,8 @@ public static final int /*long*/ GTK_TYPE_CELL_RENDERER_TEXT() {
+@@ -1670,8 +1670,8 @@ public static final int /*long*/ GTK_TYPE_CELL_RENDERER_TEXT() {
}
}
/** @method flags=const */
@@ -16408,7 +16420,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_TYPE_CELL_RENDERER_PIXBUF();
-@@ -1670,8 +1670,8 @@ public static final int /*long*/ GTK_TYPE_CELL_RENDERER_PIXBUF() {
+@@ -1680,8 +1680,8 @@ public static final int /*long*/ GTK_TYPE_CELL_RENDERER_PIXBUF() {
}
}
/** @method flags=const */
@@ -16419,7 +16431,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_TYPE_CELL_RENDERER_TOGGLE();
-@@ -1680,8 +1680,8 @@ public static final int /*long*/ GTK_TYPE_CELL_RENDERER_TOGGLE() {
+@@ -1690,8 +1690,8 @@ public static final int /*long*/ GTK_TYPE_CELL_RENDERER_TOGGLE() {
}
}
/** @method flags=const */
@@ -16430,7 +16442,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_TYPE_FIXED();
-@@ -1690,8 +1690,8 @@ public static final int /*long*/ GTK_TYPE_FIXED() {
+@@ -1700,8 +1700,8 @@ public static final int /*long*/ GTK_TYPE_FIXED() {
}
}
/** @method flags=const */
@@ -16441,7 +16453,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_TYPE_MENU();
-@@ -1700,8 +1700,8 @@ public static final int /*long*/ GTK_TYPE_MENU() {
+@@ -1710,8 +1710,8 @@ public static final int /*long*/ GTK_TYPE_MENU() {
}
}
/** @method flags=const */
@@ -16452,7 +16464,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_TYPE_WIDGET();
-@@ -1709,8 +1709,8 @@ public static final int /*long*/ GTK_TYPE_WIDGET() {
+@@ -1719,8 +1719,8 @@ public static final int /*long*/ GTK_TYPE_WIDGET() {
lock.unlock();
}
}
@@ -16463,7 +16475,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_WIDGET_FLAGS(wid);
-@@ -1718,8 +1718,8 @@ public static final int GTK_WIDGET_FLAGS(int /*long*/ wid) {
+@@ -1728,8 +1728,8 @@ public static final int GTK_WIDGET_FLAGS(int /*long*/ wid) {
lock.unlock();
}
}
@@ -16474,7 +16486,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_WIDGET_STATE(wid);
-@@ -1727,8 +1727,8 @@ public static final int GTK_WIDGET_STATE(int /*long*/ wid) {
+@@ -1737,8 +1737,8 @@ public static final int GTK_WIDGET_STATE(int /*long*/ wid) {
lock.unlock();
}
}
@@ -16485,7 +16497,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_WIDGET_HAS_DEFAULT(wid);
-@@ -1736,8 +1736,8 @@ public static final boolean GTK_WIDGET_HAS_DEFAULT(int /*long*/ wid) {
+@@ -1746,8 +1746,8 @@ public static final boolean GTK_WIDGET_HAS_DEFAULT(int /*long*/ wid) {
lock.unlock();
}
}
@@ -16496,7 +16508,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_WIDGET_HAS_FOCUS(wid);
-@@ -1745,8 +1745,8 @@ public static final boolean GTK_WIDGET_HAS_FOCUS(int /*long*/ wid) {
+@@ -1755,8 +1755,8 @@ public static final boolean GTK_WIDGET_HAS_FOCUS(int /*long*/ wid) {
lock.unlock();
}
}
@@ -16507,7 +16519,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_WIDGET_MAPPED(wid);
-@@ -1754,8 +1754,8 @@ public static final boolean GTK_WIDGET_MAPPED(int /*long*/ wid) {
+@@ -1764,8 +1764,8 @@ public static final boolean GTK_WIDGET_MAPPED(int /*long*/ wid) {
lock.unlock();
}
}
@@ -16518,7 +16530,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_WIDGET_SENSITIVE(wid);
-@@ -1763,8 +1763,8 @@ public static final boolean GTK_WIDGET_SENSITIVE(int /*long*/ wid) {
+@@ -1773,8 +1773,8 @@ public static final boolean GTK_WIDGET_SENSITIVE(int /*long*/ wid) {
lock.unlock();
}
}
@@ -16529,7 +16541,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_GTK_WIDGET_SET_FLAGS(wid, flag);
-@@ -1772,8 +1772,8 @@ public static final void GTK_WIDGET_SET_FLAGS(int /*long*/ wid, int flag) {
+@@ -1782,8 +1782,8 @@ public static final void GTK_WIDGET_SET_FLAGS(int /*long*/ wid, int flag) {
lock.unlock();
}
}
@@ -16540,7 +16552,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_GTK_WIDGET_UNSET_FLAGS(wid, flag);
-@@ -1781,8 +1781,8 @@ public static final void GTK_WIDGET_UNSET_FLAGS(int /*long*/ wid, int flag) {
+@@ -1791,8 +1791,8 @@ public static final void GTK_WIDGET_UNSET_FLAGS(int /*long*/ wid, int flag) {
lock.unlock();
}
}
@@ -16551,7 +16563,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GTK_WIDGET_VISIBLE(wid);
-@@ -1790,8 +1790,8 @@ public static final boolean GTK_WIDGET_VISIBLE(int /*long*/ wid) {
+@@ -1800,8 +1800,8 @@ public static final boolean GTK_WIDGET_VISIBLE(int /*long*/ wid) {
lock.unlock();
}
}
@@ -16562,7 +16574,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _G_OBJECT_CLASS(klass);
-@@ -1799,8 +1799,8 @@ public static final int /*long*/ G_OBJECT_CLASS (int /*long*/ klass) {
+@@ -1809,8 +1809,8 @@ public static final int /*long*/ G_OBJECT_CLASS (int /*long*/ klass) {
lock.unlock();
}
}
@@ -16573,7 +16585,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _G_OBJECT_GET_CLASS(object);
-@@ -1808,8 +1808,8 @@ public static final int /*long*/ G_OBJECT_GET_CLASS (int /*long*/ object) {
+@@ -1818,8 +1818,8 @@ public static final int /*long*/ G_OBJECT_GET_CLASS (int /*long*/ object) {
lock.unlock();
}
}
@@ -16584,7 +16596,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _G_OBJECT_TYPE_NAME(object);
-@@ -1817,8 +1817,8 @@ public static final int /*long*/ G_OBJECT_TYPE_NAME (int /*long*/ object) {
+@@ -1827,8 +1827,8 @@ public static final int /*long*/ G_OBJECT_TYPE_NAME (int /*long*/ object) {
lock.unlock();
}
}
@@ -16595,7 +16607,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _G_TYPE_CHECK_INSTANCE_TYPE(instance, type);
-@@ -1827,18 +1827,18 @@ public static final boolean G_TYPE_CHECK_INSTANCE_TYPE (int /*long*/ instance, i
+@@ -1837,18 +1837,18 @@ public static final boolean G_TYPE_CHECK_INSTANCE_TYPE (int /*long*/ instance, i
}
}
/** @method flags=const */
@@ -16622,7 +16634,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _G_OBJECT_TYPE(instance);
-@@ -1847,8 +1847,8 @@ public static final int /*long*/ G_OBJECT_TYPE (int /*long*/ instance) {
+@@ -1857,8 +1857,8 @@ public static final int /*long*/ G_OBJECT_TYPE (int /*long*/ instance) {
}
}
/** @method flags=const */
@@ -16633,7 +16645,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _G_TYPE_STRING();
-@@ -1866,8 +1866,8 @@ public static final int PANGO_PIXELS(int dimension) {
+@@ -1876,8 +1876,8 @@ public static final int PANGO_PIXELS(int dimension) {
}
}
/** @method flags=const */
@@ -16644,7 +16656,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _PANGO_TYPE_FONT_DESCRIPTION();
-@@ -1876,8 +1876,8 @@ public static final int /*long*/ PANGO_TYPE_FONT_DESCRIPTION() {
+@@ -1886,8 +1886,8 @@ public static final int /*long*/ PANGO_TYPE_FONT_DESCRIPTION() {
}
}
/** @method flags=const */
@@ -16655,7 +16667,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _PANGO_TYPE_LAYOUT();
-@@ -1886,8 +1886,8 @@ public static final int /*long*/ PANGO_TYPE_LAYOUT() {
+@@ -1896,8 +1896,8 @@ public static final int /*long*/ PANGO_TYPE_LAYOUT() {
}
}
/** @param handle cast=(void *) */
@@ -16666,7 +16678,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _dlclose(handle);
-@@ -1896,8 +1896,8 @@ public static final int dlclose(int /*long*/ handle) {
+@@ -1906,8 +1906,8 @@ public static final int dlclose(int /*long*/ handle) {
}
}
/** @param filename cast=(const char *) */
@@ -16677,7 +16689,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _dlopen(filename, flag);
-@@ -1909,8 +1909,8 @@ public static final int /*long*/ dlopen(byte[] filename, int flag) {
+@@ -1919,8 +1919,8 @@ public static final int /*long*/ dlopen(byte[] filename, int flag) {
* @param handle cast=(void *)
* @param symbol cast=(const char *)
*/
@@ -16688,7 +16700,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _dlsym(handle, symbol);
-@@ -1919,8 +1919,8 @@ public static final int /*long*/ dlsym(int /*long*/ handle, byte[] symbol) {
+@@ -1929,8 +1929,8 @@ public static final int /*long*/ dlsym(int /*long*/ handle, byte[] symbol) {
}
}
/** @method flags=dynamic */
@@ -16699,7 +16711,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_app_info_create_from_commandline(commandline, applName, flags, error);
-@@ -1929,8 +1929,8 @@ public static final int /*long*/ g_app_info_create_from_commandline(byte[] comma
+@@ -1939,8 +1939,8 @@ public static final int /*long*/ g_app_info_create_from_commandline(byte[] comma
}
}
/** @method flags=dynamic */
@@ -16710,7 +16722,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_app_info_get_all();
-@@ -1939,8 +1939,8 @@ public static final int /*long*/ g_app_info_get_all() {
+@@ -1949,8 +1949,8 @@ public static final int /*long*/ g_app_info_get_all() {
}
}
/** @method flags=dynamic */
@@ -16721,7 +16733,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_app_info_get_executable(appInfo);
-@@ -1949,8 +1949,8 @@ public static final int /*long*/ g_app_info_get_executable(int /*long*/ appInfo)
+@@ -1959,8 +1959,8 @@ public static final int /*long*/ g_app_info_get_executable(int /*long*/ appInfo)
}
}
/** @method flags=dynamic */
@@ -16732,7 +16744,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_app_info_get_icon(appInfo);
-@@ -1959,8 +1959,8 @@ public static final int /*long*/ g_app_info_get_icon(int /*long*/ appInfo) {
+@@ -1969,8 +1969,8 @@ public static final int /*long*/ g_app_info_get_icon(int /*long*/ appInfo) {
}
}
/** @method flags=dynamic */
@@ -16743,7 +16755,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_app_info_get_id(appInfo);
-@@ -1969,8 +1969,8 @@ public static final int /*long*/ g_app_info_get_id(int /*long*/ appInfo) {
+@@ -1979,8 +1979,8 @@ public static final int /*long*/ g_app_info_get_id(int /*long*/ appInfo) {
}
}
/** @method flags=dynamic */
@@ -16754,7 +16766,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_app_info_get_name(appInfo);
-@@ -1979,8 +1979,8 @@ public static final int /*long*/ g_app_info_get_name(int /*long*/ appInfo) {
+@@ -1989,8 +1989,8 @@ public static final int /*long*/ g_app_info_get_name(int /*long*/ appInfo) {
}
}
/** @method flags=dynamic */
@@ -16765,7 +16777,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_app_info_launch(appInfo, list, launchContext, error);
-@@ -1989,8 +1989,8 @@ public static final boolean g_app_info_launch(int /*long*/ appInfo, int /*long*/
+@@ -1999,8 +1999,8 @@ public static final boolean g_app_info_launch(int /*long*/ appInfo, int /*long*/
}
}
/** @method flags=dynamic */
@@ -16776,7 +16788,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_app_info_get_default_for_type(mimeType, mustSupportURIs);
-@@ -1999,8 +1999,8 @@ public static final int /*long*/ g_app_info_get_default_for_type(byte[] mimeType
+@@ -2009,8 +2009,8 @@ public static final int /*long*/ g_app_info_get_default_for_type(byte[] mimeType
}
}
/** @method flags=dynamic */
@@ -16787,7 +16799,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_app_info_launch_default_for_uri(appInfo, launchContext, error);
-@@ -2009,8 +2009,8 @@ public static final boolean g_app_info_launch_default_for_uri(int /*long*/ appIn
+@@ -2019,8 +2019,8 @@ public static final boolean g_app_info_launch_default_for_uri(int /*long*/ appIn
}
}
/** @method flags=dynamic */
@@ -16798,7 +16810,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_app_info_should_show(appInfo);
-@@ -2019,8 +2019,8 @@ public static final boolean g_app_info_should_show(int /*long*/ appInfo) {
+@@ -2029,8 +2029,8 @@ public static final boolean g_app_info_should_show(int /*long*/ appInfo) {
}
}
/** @method flags=dynamic */
@@ -16809,7 +16821,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_app_info_supports_uris(appInfo);
-@@ -2029,8 +2029,8 @@ public static final boolean g_app_info_supports_uris(int /*long*/ appInfo) {
+@@ -2039,8 +2039,8 @@ public static final boolean g_app_info_supports_uris(int /*long*/ appInfo) {
}
}
/** @method flags=dynamic */
@@ -16820,7 +16832,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_data_input_stream_new(input_stream);
-@@ -2039,8 +2039,8 @@ public static final int /*long*/ g_data_input_stream_new(int /*long*/ input_stre
+@@ -2049,8 +2049,8 @@ public static final int /*long*/ g_data_input_stream_new(int /*long*/ input_stre
}
}
/** @method flags=dynamic */
@@ -16831,7 +16843,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_data_input_stream_read_line(stream, count, cancellable, error);
-@@ -2049,8 +2049,8 @@ public static final int /*long*/ g_data_input_stream_read_line(int /*long*/ stre
+@@ -2059,8 +2059,8 @@ public static final int /*long*/ g_data_input_stream_read_line(int /*long*/ stre
}
}
/** @method flags=dynamic */
@@ -16842,7 +16854,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_content_type_equals(type1, type2);
-@@ -2059,8 +2059,8 @@ public static final boolean g_content_type_equals(int /*long*/ type1, byte[] typ
+@@ -2069,8 +2069,8 @@ public static final boolean g_content_type_equals(int /*long*/ type1, byte[] typ
}
}
/** @method flags=dynamic */
@@ -16853,7 +16865,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_content_type_is_a(type, supertype);
-@@ -2069,8 +2069,8 @@ public static final boolean g_content_type_is_a(int /*long*/ type, byte[] supert
+@@ -2079,8 +2079,8 @@ public static final boolean g_content_type_is_a(int /*long*/ type, byte[] supert
}
}
/** @method flags=dynamic */
@@ -16864,7 +16876,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_content_type_get_mime_type(mime_type);
-@@ -2079,8 +2079,8 @@ public static final int /*long*/ g_content_type_get_mime_type(byte[] mime_type)
+@@ -2089,8 +2089,8 @@ public static final int /*long*/ g_content_type_get_mime_type(byte[] mime_type)
}
}
/** @method flags=dynamic */
@@ -16875,7 +16887,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_content_types_get_registered();
-@@ -2089,8 +2089,8 @@ public static final int /*long*/ g_content_types_get_registered() {
+@@ -2099,8 +2099,8 @@ public static final int /*long*/ g_content_types_get_registered() {
}
}
/** @method flags=dynamic */
@@ -16886,7 +16898,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_desktop_app_info_new_from_filename(fileName);
-@@ -2099,8 +2099,8 @@ public static final int /*long*/ g_desktop_app_info_new_from_filename(byte[] fil
+@@ -2109,8 +2109,8 @@ public static final int /*long*/ g_desktop_app_info_new_from_filename(byte[] fil
}
}
/** @method flags=dynamic */
@@ -16897,7 +16909,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_file_info_get_content_type (info);
-@@ -2109,8 +2109,8 @@ public static final int /*long*/ g_file_info_get_content_type (int /*long*/ info
+@@ -2119,8 +2119,8 @@ public static final int /*long*/ g_file_info_get_content_type (int /*long*/ info
}
}
/** @method flags=dynamic */
@@ -16908,7 +16920,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_file_get_path(file);
-@@ -2119,8 +2119,8 @@ public static final int /*long*/ g_file_get_path (int /*long*/ file) {
+@@ -2129,8 +2129,8 @@ public static final int /*long*/ g_file_get_path (int /*long*/ file) {
}
}
/** @method flags=dynamic */
@@ -16919,7 +16931,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_file_get_uri(file);
-@@ -2129,8 +2129,8 @@ public static final int /*long*/ g_file_get_uri (int /*long*/ file) {
+@@ -2139,8 +2139,8 @@ public static final int /*long*/ g_file_get_uri (int /*long*/ file) {
}
}
/** @method flags=dynamic */
@@ -16930,7 +16942,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_file_info_get_modification_time(info, result);
-@@ -2139,8 +2139,8 @@ public static final void g_file_info_get_modification_time(int /*long*/ info, in
+@@ -2149,8 +2149,8 @@ public static final void g_file_info_get_modification_time(int /*long*/ info, in
}
}
/** @method flags=dynamic */
@@ -16941,7 +16953,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_file_icon_get_file(icon);
-@@ -2149,8 +2149,8 @@ public static final int /*long*/ g_file_icon_get_file(int /*long*/ icon) {
+@@ -2159,8 +2159,8 @@ public static final int /*long*/ g_file_icon_get_file(int /*long*/ icon) {
}
}
/** @method flags=dynamic */
@@ -16952,7 +16964,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_file_new_for_path(fileName);
-@@ -2159,8 +2159,8 @@ public static final int /*long*/ g_file_new_for_path(byte[] fileName) {
+@@ -2169,8 +2169,8 @@ public static final int /*long*/ g_file_new_for_path(byte[] fileName) {
}
}
/** @method flags=dynamic */
@@ -16963,7 +16975,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_file_new_for_commandline_arg(fileName);
-@@ -2169,8 +2169,8 @@ public static final int /*long*/ g_file_new_for_commandline_arg(byte[] fileName)
+@@ -2179,8 +2179,8 @@ public static final int /*long*/ g_file_new_for_commandline_arg(byte[] fileName)
}
}
/** @method flags=dynamic */
@@ -16974,7 +16986,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_file_new_for_uri(fileName);
-@@ -2179,8 +2179,8 @@ public static final int /*long*/ g_file_new_for_uri(byte[] fileName) {
+@@ -2189,8 +2189,8 @@ public static final int /*long*/ g_file_new_for_uri(byte[] fileName) {
}
}
/** @method flags=dynamic */
@@ -16985,7 +16997,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_file_query_info (file, attributes, flags, cancellable, error);
-@@ -2190,8 +2190,8 @@ public static final int /*long*/ g_file_query_info (int /*long*/ file,byte[] at
+@@ -2200,8 +2200,8 @@ public static final int /*long*/ g_file_query_info (int /*long*/ file,byte[] at
}
/** @method flags=dynamic */
@@ -16996,7 +17008,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_file_read(file, cancellable, error);
-@@ -2210,8 +2210,8 @@ public static final boolean /*long*/ g_file_test(byte[] file, int test) {
+@@ -2220,8 +2220,8 @@ public static final boolean /*long*/ g_file_test(byte[] file, int test) {
}
}
/** @method flags=dynamic */
@@ -17007,7 +17019,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_icon_to_string(icon);
-@@ -2220,8 +2220,8 @@ public static final int /*long*/ g_icon_to_string (int /*long*/ icon) {
+@@ -2230,8 +2230,8 @@ public static final int /*long*/ g_icon_to_string (int /*long*/ icon) {
}
}
/** @method flags=dynamic */
@@ -17018,7 +17030,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_icon_new_for_string(str, error);
-@@ -2236,8 +2236,8 @@ public static final int /*long*/ g_icon_new_for_string (byte[] str, int /*long*/
+@@ -2246,8 +2246,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)
*/
@@ -17029,7 +17041,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_signal_add_emission_hook(signal_id, detail, hook_func, hook_data, data_destroy);
-@@ -2249,8 +2249,8 @@ public static final int /*long*/ g_signal_add_emission_hook(int signal_id, int d
+@@ -2259,8 +2259,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)
*/
@@ -17040,7 +17052,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_signal_remove_emission_hook (signal_id, hook_id);
-@@ -2263,8 +2263,8 @@ public static final void g_signal_remove_emission_hook(int signal_id, int /*long
+@@ -2273,8 +2273,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)
*/
@@ -17051,7 +17063,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_cclosure_new(callback_func, user_data, destroy_data);
-@@ -2273,8 +2273,8 @@ public static final int /*long*/ g_cclosure_new(int /*long*/ callback_func, int
+@@ -2283,8 +2283,8 @@ public static final int /*long*/ g_cclosure_new(int /*long*/ callback_func, int
}
}
/** @param closure cast=(GClosure *) */
@@ -17062,7 +17074,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_closure_ref(closure);
-@@ -2283,8 +2283,8 @@ public static final int /*long*/ g_closure_ref(int /*long*/ closure) {
+@@ -2293,8 +2293,8 @@ public static final int /*long*/ g_closure_ref(int /*long*/ closure) {
}
}
/** @param closure cast=(GClosure *) */
@@ -17073,7 +17085,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_closure_unref(closure);
-@@ -2293,8 +2293,8 @@ public static final void g_closure_unref(int /*long*/ closure) {
+@@ -2303,8 +2303,8 @@ public static final void g_closure_unref(int /*long*/ closure) {
}
}
/** @param context cast=(GMainContext *) */
@@ -17084,7 +17096,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_main_context_acquire(context);
-@@ -2306,8 +2306,8 @@ public static final boolean g_main_context_acquire(int /*long*/ context) {
+@@ -2316,8 +2316,8 @@ public static final boolean g_main_context_acquire(int /*long*/ context) {
* @param context cast=(GMainContext *)
* @param fds cast=(GPollFD *)
*/
@@ -17095,7 +17107,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_main_context_check(context, max_priority, fds, n_fds);
-@@ -2315,8 +2315,8 @@ public static final int g_main_context_check(int /*long*/ context, int max_prior
+@@ -2325,8 +2325,8 @@ public static final int g_main_context_check(int /*long*/ context, int max_prior
lock.unlock();
}
}
@@ -17106,7 +17118,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_main_context_default();
-@@ -2325,8 +2325,8 @@ public static final int /*long*/ g_main_context_default() {
+@@ -2335,8 +2335,8 @@ public static final int /*long*/ g_main_context_default() {
}
}
/** @param context cast=(GMainContext *) */
@@ -17117,7 +17129,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_main_context_iteration(context, may_block);
-@@ -2335,8 +2335,8 @@ public static final boolean g_main_context_iteration(int /*long*/ context, boole
+@@ -2345,8 +2345,8 @@ public static final boolean g_main_context_iteration(int /*long*/ context, boole
}
}
/** @param context cast=(GMainContext *) */
@@ -17128,7 +17140,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_main_context_pending(context);
-@@ -2345,8 +2345,8 @@ public static final boolean g_main_context_pending(int /*long*/ context) {
+@@ -2355,8 +2355,8 @@ public static final boolean g_main_context_pending(int /*long*/ context) {
}
}
/** @param context cast=(GMainContext *) */
@@ -17139,7 +17151,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_main_context_get_poll_func(context);
-@@ -2355,8 +2355,8 @@ public static final int /*long*/ g_main_context_get_poll_func(int /*long*/ conte
+@@ -2365,8 +2365,8 @@ public static final int /*long*/ g_main_context_get_poll_func(int /*long*/ conte
}
}
/** @param context cast=(GMainContext *) */
@@ -17150,7 +17162,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_main_context_prepare(context, priority);
-@@ -2368,8 +2368,8 @@ public static final boolean g_main_context_prepare(int /*long*/ context, int[] p
+@@ -2378,8 +2378,8 @@ public static final boolean g_main_context_prepare(int /*long*/ context, int[] p
* @param context cast=(GMainContext *)
* @param fds cast=(GPollFD *)
*/
@@ -17161,7 +17173,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_main_context_query(context, max_priority, timeout_, fds, n_fds);
-@@ -2378,8 +2378,8 @@ public static final int g_main_context_query(int /*long*/ context, int max_prior
+@@ -2388,8 +2388,8 @@ public static final int g_main_context_query(int /*long*/ context, int max_prior
}
}
/** @param context cast=(GMainContext *) */
@@ -17172,7 +17184,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_main_context_release(context);
-@@ -2388,7 +2388,7 @@ public static final void g_main_context_release(int /*long*/ context) {
+@@ -2398,7 +2398,7 @@ public static final void g_main_context_release(int /*long*/ context) {
}
}
/** @param context cast=(GMainContext *) */
@@ -17181,7 +17193,7 @@ index ea39bc8..d687398 100644
/**
* @param opsysstring cast=(const gchar *)
* @param len cast=(gssize)
-@@ -2396,8 +2396,8 @@ public static final native void g_main_context_wakeup(int /*long*/ context);
+@@ -2406,8 +2406,8 @@ public static final native void g_main_context_wakeup(int /*long*/ context);
* @param bytes_written cast=(gsize *)
* @param error cast=(GError **)
*/
@@ -17192,7 +17204,18 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_filename_to_utf8(opsysstring, len, bytes_read, bytes_written, error);
-@@ -2410,8 +2410,8 @@ public static final int /*long*/ g_filename_to_utf8(int /*long*/ opsysstring, in
+@@ -2418,8 +2418,8 @@ public static final int /*long*/ g_filename_to_utf8(int /*long*/ opsysstring, in
+ /**
+ * @method flags=dynamic
+ */
+-public static final native int /*long*/ _g_filename_display_name(int /*long*/ filename);
+-public static final int /*long*/ g_filename_display_name(int /*long*/ filename) {
++public static final native long /*int*/ _g_filename_display_name(long /*int*/ filename);
++public static final long /*int*/ g_filename_display_name(long /*int*/ filename) {
+ lock.lock();
+ try {
+ return _g_filename_display_name(filename);
+@@ -2432,8 +2432,8 @@ public static final int /*long*/ g_filename_display_name(int /*long*/ filename)
* @param hostname cast=(const char *)
* @param error cast=(GError **)
*/
@@ -17203,7 +17226,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_filename_to_uri(filename, hostname, error);
-@@ -2426,8 +2426,8 @@ public static final int /*long*/ g_filename_to_uri(int /*long*/ filename, int /*
+@@ -2448,8 +2448,8 @@ public static final int /*long*/ g_filename_to_uri(int /*long*/ filename, int /*
* @param bytes_written cast=(gsize *)
* @param error cast=(GError **)
*/
@@ -17214,7 +17237,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_filename_from_utf8(opsysstring, len, bytes_read, bytes_written, error);
-@@ -2440,8 +2440,8 @@ public static final int /*long*/ g_filename_from_utf8(int /*long*/ opsysstring,
+@@ -2462,8 +2462,8 @@ public static final int /*long*/ g_filename_from_utf8(int /*long*/ opsysstring,
* @param hostname cast=(char **)
* @param error cast=(GError **)
*/
@@ -17225,7 +17248,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_filename_from_uri(uri, hostname, error);
-@@ -2450,8 +2450,8 @@ public static final int /*long*/ g_filename_from_uri(int /*long*/ uri, int /*lon
+@@ -2472,8 +2472,8 @@ public static final int /*long*/ g_filename_from_uri(int /*long*/ uri, int /*lon
}
}
/** @param mem cast=(gpointer) */
@@ -17236,7 +17259,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_free(mem);
-@@ -2463,8 +2463,8 @@ public static final void g_free(int /*long*/ mem) {
+@@ -2485,8 +2485,8 @@ public static final void g_free(int /*long*/ mem) {
* @param function cast=(GSourceFunc)
* @param data cast=(gpointer)
*/
@@ -17247,7 +17270,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_idle_add(function, data);
-@@ -2476,8 +2476,8 @@ public static final int g_idle_add(int /*long*/ function, int /*long*/ data) {
+@@ -2498,8 +2498,8 @@ public static final int g_idle_add(int /*long*/ function, int /*long*/ data) {
* @param list cast=(GList *)
* @param data cast=(gpointer)
*/
@@ -17258,7 +17281,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_list_append(list, data);
-@@ -2486,8 +2486,8 @@ public static final int /*long*/ g_list_append(int /*long*/ list, int /*long*/ d
+@@ -2508,8 +2508,8 @@ public static final int /*long*/ g_list_append(int /*long*/ list, int /*long*/ d
}
}
/** @param list cast=(GList *) */
@@ -17269,7 +17292,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_list_data(list);
-@@ -2496,8 +2496,8 @@ public static final int /*long*/ g_list_data(int /*long*/ list) {
+@@ -2518,8 +2518,8 @@ public static final int /*long*/ g_list_data(int /*long*/ list) {
}
}
/** @param list cast=(GList *) */
@@ -17280,7 +17303,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_list_free(list);
-@@ -2506,8 +2506,8 @@ public static final void g_list_free(int /*long*/ list) {
+@@ -2528,8 +2528,8 @@ public static final void g_list_free(int /*long*/ list) {
}
}
/** @param list cast=(GList *) */
@@ -17291,7 +17314,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_list_free_1(list);
-@@ -2518,8 +2518,8 @@ public static final void g_list_free_1(int /*long*/ list) {
+@@ -2540,8 +2540,8 @@ public static final void g_list_free_1(int /*long*/ list) {
/**
* @param list cast=(GList *)
*/
@@ -17302,7 +17325,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_list_last(list);
-@@ -2528,8 +2528,8 @@ public static final int /*long*/ g_list_last(int /*long*/ list) {
+@@ -2550,8 +2550,8 @@ public static final int /*long*/ g_list_last(int /*long*/ list) {
}
}
/** @param list cast=(GList *) */
@@ -17313,7 +17336,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_list_length(list);
-@@ -2541,8 +2541,8 @@ public static final int g_list_length(int /*long*/ list) {
+@@ -2563,8 +2563,8 @@ public static final int g_list_length(int /*long*/ list) {
* @param list cast=(GList *)
* @param llist cast=(GList *)
*/
@@ -17324,7 +17347,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_list_set_next(list, llist);
-@@ -2550,8 +2550,8 @@ public static final void g_list_set_next(int /*long*/ list, int /*long*/ llist)
+@@ -2572,8 +2572,8 @@ public static final void g_list_set_next(int /*long*/ list, int /*long*/ llist)
lock.unlock();
}
}
@@ -17335,7 +17358,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_list_next(list);
-@@ -2563,8 +2563,8 @@ public static final int /*long*/ g_list_next(int /*long*/ list) {
+@@ -2585,8 +2585,8 @@ public static final int /*long*/ g_list_next(int /*long*/ list) {
* @param list cast=(GList *)
* @param n cast=(guint)
*/
@@ -17346,7 +17369,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_list_nth(list, n);
-@@ -2576,8 +2576,8 @@ public static final int /*long*/ g_list_nth(int /*long*/ list, int n) {
+@@ -2598,8 +2598,8 @@ public static final int /*long*/ g_list_nth(int /*long*/ list, int n) {
* @param list cast=(GList *)
* @param n cast=(guint)
*/
@@ -17357,7 +17380,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_list_nth_data(list, n);
-@@ -2589,8 +2589,8 @@ public static final int /*long*/ g_list_nth_data(int /*long*/ list, int n) {
+@@ -2611,8 +2611,8 @@ public static final int /*long*/ g_list_nth_data(int /*long*/ list, int n) {
* @param list cast=(GList *)
* @param data cast=(gpointer)
*/
@@ -17368,7 +17391,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_list_prepend(list, data);
-@@ -2602,8 +2602,8 @@ public static final int /*long*/ g_list_prepend(int /*long*/ list, int /*long*/
+@@ -2624,8 +2624,8 @@ public static final int /*long*/ g_list_prepend(int /*long*/ list, int /*long*/
* @param list cast=(GList *)
* @param llist cast=(GList *)
*/
@@ -17379,7 +17402,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_list_set_previous(list, llist);
-@@ -2611,8 +2611,8 @@ public static final void g_list_set_previous(int /*long*/ list, int /*long*/ lli
+@@ -2633,8 +2633,8 @@ public static final void g_list_set_previous(int /*long*/ list, int /*long*/ lli
lock.unlock();
}
}
@@ -17390,7 +17413,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_list_previous(list);
-@@ -2624,8 +2624,8 @@ public static final int /*long*/ g_list_previous(int /*long*/ list) {
+@@ -2646,8 +2646,8 @@ public static final int /*long*/ g_list_previous(int /*long*/ list) {
* @param list cast=(GList *)
* @param link cast=(GList *)
*/
@@ -17401,7 +17424,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_list_remove_link(list, link);
-@@ -2634,8 +2634,8 @@ public static final int /*long*/ g_list_remove_link(int /*long*/ list, int /*lon
+@@ -2656,8 +2656,8 @@ public static final int /*long*/ g_list_remove_link(int /*long*/ list, int /*lon
}
}
/** @param list cast=(GList *) */
@@ -17412,7 +17435,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_list_reverse(list);
-@@ -2650,8 +2650,8 @@ public static final int /*long*/ g_list_reverse(int /*long*/ list) {
+@@ -2672,8 +2672,8 @@ public static final int /*long*/ g_list_reverse(int /*long*/ list) {
* @param bytes_written cast=(gsize *)
* @param error cast=(GError **)
*/
@@ -17423,7 +17446,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_locale_from_utf8(utf8string, len, bytes_read, bytes_written, error);
-@@ -2666,8 +2666,8 @@ public static final int /*long*/ g_locale_from_utf8(int /*long*/ utf8string, int
+@@ -2688,8 +2688,8 @@ public static final int /*long*/ g_locale_from_utf8(int /*long*/ utf8string, int
* @param bytes_written cast=(gsize *)
* @param error cast=(GError **)
*/
@@ -17434,7 +17457,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_locale_to_utf8(opsysstring, len, bytes_read, bytes_written, error);
-@@ -2681,8 +2681,8 @@ public static final int /*long*/ g_locale_to_utf8(int /*long*/ opsysstring, int
+@@ -2703,8 +2703,8 @@ public static final int /*long*/ g_locale_to_utf8(int /*long*/ opsysstring, int
* @param message cast=(gchar *)
* @param unused_data cast=(gpointer)
*/
@@ -17445,7 +17468,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_log_default_handler(log_domain, log_levels, message, unused_data);
-@@ -2709,8 +2709,8 @@ public static final void g_log_remove_handler(byte[] log_domain, int handler_id)
+@@ -2731,8 +2731,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)
*/
@@ -17456,7 +17479,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_log_set_handler(log_domain, log_levels, log_func, user_data);
-@@ -2719,8 +2719,8 @@ public static final int g_log_set_handler(byte[] log_domain, int log_levels, int
+@@ -2741,8 +2741,8 @@ public static final int g_log_set_handler(byte[] log_domain, int log_levels, int
}
}
/** @param size cast=(gulong) */
@@ -17467,7 +17490,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_malloc(size);
-@@ -2732,8 +2732,8 @@ public static final int /*long*/ g_malloc(int /*long*/ size) {
+@@ -2754,8 +2754,8 @@ public static final int /*long*/ g_malloc(int /*long*/ size) {
* @param oclass cast=(GObjectClass *)
* @param property_name cast=(const gchar *)
*/
@@ -17478,7 +17501,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_object_class_find_property(oclass, property_name);
-@@ -2746,8 +2746,8 @@ public static final int /*long*/ g_object_class_find_property(int /*long*/ oclas
+@@ -2768,8 +2768,8 @@ public static final int /*long*/ g_object_class_find_property(int /*long*/ oclas
* @param first_property_name cast=(const gchar *),flags=no_out
* @param terminator cast=(const gchar *),flags=sentinel
*/
@@ -17489,7 +17512,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_object_get(object, first_property_name, value, terminator);
-@@ -2760,8 +2760,8 @@ public static final void g_object_get(int /*long*/ object, byte[] first_property
+@@ -2782,8 +2782,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
*/
@@ -17500,7 +17523,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_object_get(object, first_property_name, value, terminator);
-@@ -2773,8 +2773,8 @@ public static final void g_object_get(int /*long*/ object, byte[] first_property
+@@ -2795,8 +2795,8 @@ public static final void g_object_get(int /*long*/ object, byte[] first_property
* @param object cast=(GObject *)
* @param quark cast=(GQuark)
*/
@@ -17511,7 +17534,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_object_get_qdata(object, quark);
-@@ -2786,8 +2786,8 @@ public static final int /*long*/ g_object_get_qdata(int /*long*/ object, int qua
+@@ -2808,8 +2808,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 *)
*/
@@ -17522,7 +17545,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_object_new(type, first_property_name);
-@@ -2799,8 +2799,8 @@ public static final int /*long*/ g_object_new (int /*long*/ type, int /*long*/ f
+@@ -2821,8 +2821,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 *)
*/
@@ -17533,7 +17556,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_object_notify(object, property_name);
-@@ -2809,8 +2809,8 @@ public static final void g_object_notify (int /*long*/ object, byte[] property_n
+@@ -2831,8 +2831,8 @@ public static final void g_object_notify (int /*long*/ object, byte[] property_n
}
}
/** @param object cast=(gpointer) */
@@ -17544,7 +17567,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_object_ref(object);
-@@ -2823,8 +2823,8 @@ public static final int /*long*/ g_object_ref(int /*long*/ object) {
+@@ -2845,8 +2845,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
*/
@@ -17555,7 +17578,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2837,8 +2837,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
+@@ -2859,8 +2859,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
*/
@@ -17566,7 +17589,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2851,8 +2851,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
+@@ -2873,8 +2873,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
*/
@@ -17577,7 +17600,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2865,8 +2865,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
+@@ -2887,8 +2887,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
*/
@@ -17588,7 +17611,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2879,8 +2879,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
+@@ -2901,8 +2901,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
*/
@@ -17599,7 +17622,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2893,8 +2893,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
+@@ -2915,8 +2915,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
*/
@@ -17610,7 +17633,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2907,8 +2907,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
+@@ -2929,8 +2929,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
* @param quark cast=(GQuark)
* @param data cast=(gpointer)
*/
@@ -17621,7 +17644,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_object_set_qdata(object, quark, data);
-@@ -2917,8 +2917,8 @@ public static final void g_object_set_qdata(int /*long*/ object, int quark, int
+@@ -2939,8 +2939,8 @@ public static final void g_object_set_qdata(int /*long*/ object, int quark, int
}
}
/** @param object cast=(gpointer) */
@@ -17632,7 +17655,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_object_unref(object);
-@@ -2952,8 +2952,8 @@ public static final void g_set_prgname(byte[] prgname) {
+@@ -2974,8 +2974,8 @@ public static final void g_set_prgname(byte[] prgname) {
* @param proc cast=(GCallback)
* @param data cast=(gpointer)
*/
@@ -17643,7 +17666,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_signal_connect(instance, detailed_signal, proc, data);
-@@ -2967,8 +2967,8 @@ public static final int g_signal_connect(int /*long*/ instance, byte[] detailed_
+@@ -2989,8 +2989,8 @@ public static final int g_signal_connect(int /*long*/ instance, byte[] detailed_
* @param closure cast=(GClosure *)
* @param after cast=(gboolean)
*/
@@ -17654,7 +17677,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_signal_connect_closure(instance, detailed_signal, closure, after);
-@@ -2983,8 +2983,8 @@ public static final int g_signal_connect_closure(int /*long*/ instance, byte[] d
+@@ -3005,8 +3005,8 @@ public static final int g_signal_connect_closure(int /*long*/ instance, byte[] d
* @param closure cast=(GClosure *)
* @param after cast=(gboolean)
*/
@@ -17665,7 +17688,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_signal_connect_closure_by_id(instance, signal_id, detail, closure, after);
-@@ -2998,8 +2998,8 @@ public static final int g_signal_connect_closure_by_id(int /*long*/ instance, in
+@@ -3020,8 +3020,8 @@ public static final int g_signal_connect_closure_by_id(int /*long*/ instance, in
* @param proc cast=(GCallback)
* @param data cast=(gpointer)
*/
@@ -17676,7 +17699,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_signal_connect_after(instance, detailed_signal, proc, data);
-@@ -3011,8 +3011,8 @@ public static final int g_signal_connect_after(int /*long*/ instance, byte[] det
+@@ -3033,8 +3033,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
*/
@@ -17687,7 +17710,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal);
-@@ -3024,8 +3024,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
+@@ -3046,8 +3046,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
*/
@@ -17698,7 +17721,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data);
-@@ -3037,8 +3037,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
+@@ -3059,8 +3059,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
*/
@@ -17709,7 +17732,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data);
-@@ -3050,8 +3050,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
+@@ -3072,8 +3072,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
*/
@@ -17720,7 +17743,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data1, data2);
-@@ -3063,8 +3063,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
+@@ -3085,8 +3085,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
*/
@@ -17731,7 +17754,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data);
-@@ -3076,8 +3076,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
+@@ -3098,8 +3098,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
* @param instance cast=(gpointer)
* @param handler_id cast=(gulong)
*/
@@ -17742,7 +17765,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_signal_handler_disconnect(instance, handler_id);
-@@ -3092,8 +3092,8 @@ public static final void g_signal_handler_disconnect(int /*long*/ instance, int
+@@ -3114,8 +3114,8 @@ public static final void g_signal_handler_disconnect(int /*long*/ instance, int
* @param func cast=(gpointer)
* @param data cast=(gpointer)
*/
@@ -17753,7 +17776,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_signal_handler_find(instance, mask, signal_id, detail, closure, func, data);
-@@ -3110,8 +3110,8 @@ public static final int g_signal_handler_find(int /*long*/ instance, int mask, i
+@@ -3132,8 +3132,8 @@ public static final int g_signal_handler_find(int /*long*/ instance, int mask, i
* @param func cast=(gpointer)
* @param data cast=(gpointer)
*/
@@ -17764,7 +17787,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_signal_handlers_block_matched(instance, mask, signal_id, detail, closure, func, data);
-@@ -3128,8 +3128,8 @@ public static final int g_signal_handlers_block_matched(int /*long*/ instance, i
+@@ -3150,8 +3150,8 @@ public static final int g_signal_handlers_block_matched(int /*long*/ instance, i
* @param func cast=(gpointer)
* @param data cast=(gpointer)
*/
@@ -17775,7 +17798,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_signal_handlers_disconnect_matched(instance, mask, signal_id, detail, closure, func, data);
-@@ -3146,8 +3146,8 @@ public static final int g_signal_handlers_disconnect_matched(int /*long*/ instan
+@@ -3168,8 +3168,8 @@ public static final int g_signal_handlers_disconnect_matched(int /*long*/ instan
* @param func cast=(gpointer)
* @param data cast=(gpointer)
*/
@@ -17786,7 +17809,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_signal_handlers_unblock_matched(instance, mask, signal_id, detail, closure, func, data);
-@@ -3156,8 +3156,8 @@ public static final int g_signal_handlers_unblock_matched(int /*long*/ instance,
+@@ -3178,8 +3178,8 @@ public static final int g_signal_handlers_unblock_matched(int /*long*/ instance,
}
}
/** @param name cast=(const gchar *),flags=no_out */
@@ -17797,7 +17820,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_signal_lookup(name, itype);
-@@ -3169,8 +3169,8 @@ public static final int g_signal_lookup (byte[] name, int /*long*/ itype) {
+@@ -3191,8 +3191,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
*/
@@ -17808,7 +17831,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_signal_stop_emission_by_name(instance, detailed_signal);
-@@ -3179,8 +3179,8 @@ public static final void g_signal_stop_emission_by_name(int /*long*/ instance, b
+@@ -3201,8 +3201,8 @@ public static final void g_signal_stop_emission_by_name(int /*long*/ instance, b
}
}
/** @param tag cast=(guint) */
@@ -17819,7 +17842,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_source_remove(tag);
-@@ -3192,8 +3192,8 @@ public static final boolean /*long*/ g_source_remove (int /*long*/ tag) {
+@@ -3214,8 +3214,8 @@ public static final boolean /*long*/ g_source_remove (int /*long*/ tag) {
* @param list cast=(GSList *)
* @param data cast=(gpointer)
*/
@@ -17830,7 +17853,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_slist_append(list, data);
-@@ -3202,8 +3202,8 @@ public static final int /*long*/ g_slist_append(int /*long*/ list, int /*long*/
+@@ -3224,8 +3224,8 @@ public static final int /*long*/ g_slist_append(int /*long*/ list, int /*long*/
}
}
/** @param list cast=(GSList *) */
@@ -17841,7 +17864,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_slist_data(list);
-@@ -3212,8 +3212,8 @@ public static final int /*long*/ g_slist_data (int /*long*/ list) {
+@@ -3234,8 +3234,8 @@ public static final int /*long*/ g_slist_data (int /*long*/ list) {
}
}
/** @param list cast=(GSList *) */
@@ -17852,7 +17875,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_slist_free(list);
-@@ -3222,8 +3222,8 @@ public static final void g_slist_free (int /*long*/ list) {
+@@ -3244,8 +3244,8 @@ public static final void g_slist_free (int /*long*/ list) {
}
}
/** @param list cast=(GSList *) */
@@ -17863,7 +17886,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_slist_next(list);
-@@ -3232,8 +3232,8 @@ public static final int /*long*/ g_slist_next (int /*long*/ list) {
+@@ -3254,8 +3254,8 @@ public static final int /*long*/ g_slist_next (int /*long*/ list) {
}
}
/** @param list cast=(GSList *) */
@@ -17874,7 +17897,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_slist_length(list);
-@@ -3242,8 +3242,8 @@ public static final int g_slist_length (int /*long*/ list) {
+@@ -3264,8 +3264,8 @@ public static final int g_slist_length (int /*long*/ list) {
}
}
/** @param string_array cast=(gchar **) */
@@ -17885,7 +17908,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_strfreev(string_array);
-@@ -3255,8 +3255,8 @@ public static final void g_strfreev(int /*long*/ string_array) {
+@@ -3277,8 +3277,8 @@ public static final void g_strfreev(int /*long*/ string_array) {
* @method flags=getter
* @param string cast=(GString *)
*/
@@ -17896,7 +17919,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GString_len(string);
-@@ -3268,8 +3268,8 @@ public static final int GString_len(int /*long*/ string) {
+@@ -3290,8 +3290,8 @@ public static final int GString_len(int /*long*/ string) {
* @method flags=getter
* @param string cast=(GString *)
*/
@@ -17907,7 +17930,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _GString_str(string);
-@@ -3281,8 +3281,8 @@ public static final int /*long*/ GString_str(int /*long*/ string) {
+@@ -3303,8 +3303,8 @@ public static final int /*long*/ GString_str(int /*long*/ string) {
* @param str cast=(const gchar *)
* @param endptr cast=(gchar **)
*/
@@ -17918,7 +17941,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_strtod(str, endptr);
-@@ -3295,8 +3295,8 @@ public static final double g_strtod(int /*long*/ str, int /*long*/[] endptr) {
+@@ -3317,8 +3317,8 @@ public static final double g_strtod(int /*long*/ str, int /*long*/[] endptr) {
* @param interface_type cast=(GType)
* @param info cast=(const GInterfaceInfo *)
*/
@@ -17929,7 +17952,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_type_add_interface_static(instance_type, interface_type, info);
-@@ -3305,8 +3305,8 @@ public static final void g_type_add_interface_static (int /*long*/ instance_type
+@@ -3327,8 +3327,8 @@ public static final void g_type_add_interface_static (int /*long*/ instance_type
}
}
/** @param g_class cast=(GType) */
@@ -17940,7 +17963,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_type_class_peek(g_class);
-@@ -3315,8 +3315,8 @@ public static final int /*long*/ g_type_class_peek (int /*long*/ g_class) {
+@@ -3337,8 +3337,8 @@ public static final int /*long*/ g_type_class_peek (int /*long*/ g_class) {
}
}
/** @param g_class cast=(gpointer) */
@@ -17951,7 +17974,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_type_class_peek_parent(g_class);
-@@ -3325,8 +3325,8 @@ public static final int /*long*/ g_type_class_peek_parent (int /*long*/ g_class)
+@@ -3347,8 +3347,8 @@ public static final int /*long*/ g_type_class_peek_parent (int /*long*/ g_class)
}
}
/** @param g_class cast=(GType) */
@@ -17962,7 +17985,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_type_class_ref(g_class);
-@@ -3335,8 +3335,8 @@ public static final int /*long*/ g_type_class_ref (int /*long*/ g_class) {
+@@ -3357,8 +3357,8 @@ public static final int /*long*/ g_type_class_ref (int /*long*/ g_class) {
}
}
/** @param g_class cast=(gpointer) */
@@ -17973,7 +17996,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_type_class_unref(g_class);
-@@ -3345,8 +3345,8 @@ public static final void g_type_class_unref (int /*long*/ g_class) {
+@@ -3367,8 +3367,8 @@ public static final void g_type_class_unref (int /*long*/ g_class) {
}
}
/** @param name cast=(const gchar *) */
@@ -17984,7 +18007,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_type_from_name(name);
-@@ -3355,8 +3355,8 @@ public static final int /*long*/ g_type_from_name (byte[] name) {
+@@ -3377,8 +3377,8 @@ public static final int /*long*/ g_type_from_name (byte[] name) {
}
}
/** @param iface cast=(gpointer) */
@@ -17995,7 +18018,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_type_interface_peek_parent(iface);
-@@ -3368,8 +3368,8 @@ public static final int /*long*/ g_type_interface_peek_parent (int /*long*/ ifac
+@@ -3390,8 +3390,8 @@ public static final int /*long*/ g_type_interface_peek_parent (int /*long*/ ifac
* @param type cast=(GType)
* @param is_a_type cast=(GType)
*/
@@ -18006,7 +18029,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_type_is_a(type, is_a_type);
-@@ -3378,8 +3378,8 @@ public static final boolean g_type_is_a (int /*long*/ type, int /*long*/ is_a_ty
+@@ -3400,8 +3400,8 @@ public static final boolean g_type_is_a (int /*long*/ type, int /*long*/ is_a_ty
}
}
/** @param handle cast=(GType) */
@@ -18017,7 +18040,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_type_name(handle);
-@@ -3388,8 +3388,8 @@ public static final int /*long*/ g_type_name (int /*long*/ handle) {
+@@ -3410,8 +3410,8 @@ public static final int /*long*/ g_type_name (int /*long*/ handle) {
}
}
/** @param type cast=(GType) */
@@ -18028,7 +18051,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_type_parent(type);
-@@ -3401,8 +3401,8 @@ public static final int /*long*/ g_type_parent (int /*long*/ type) {
+@@ -3423,8 +3423,8 @@ public static final int /*long*/ g_type_parent (int /*long*/ type) {
* @param type cast=(GType)
* @param query cast=(GTypeQuery *)
*/
@@ -18039,7 +18062,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_type_query(type, query);
-@@ -3416,8 +3416,8 @@ public static final void g_type_query (int /*long*/ type, int /*long*/ query) {
+@@ -3438,8 +3438,8 @@ public static final void g_type_query (int /*long*/ type, int /*long*/ query) {
* @param info cast=(const GTypeInfo *)
* @param flags cast=(GTypeFlags)
*/
@@ -18050,7 +18073,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_type_register_static(parent_type, type_name, info, flags);
-@@ -3426,8 +3426,8 @@ public static final int /*long*/ g_type_register_static (int /*long*/ parent_typ
+@@ -3448,8 +3448,8 @@ public static final int /*long*/ g_type_register_static (int /*long*/ parent_typ
}
}
/** @param vtable cast=(GThreadFunctions *) */
@@ -18061,7 +18084,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_g_thread_init(vtable);
-@@ -3451,8 +3451,8 @@ public static final boolean g_thread_supported() {
+@@ -3473,8 +3473,8 @@ public static final boolean g_thread_supported() {
* @param items_written cast=(glong *),flags=critical
* @param error cast=(GError **),flags=critical
*/
@@ -18072,7 +18095,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_utf16_to_utf8(str, len, items_read, items_written, error);
-@@ -3461,8 +3461,8 @@ public static final int /*long*/ g_utf16_to_utf8(char[] str, int /*long*/ len, i
+@@ -3483,8 +3483,8 @@ public static final int /*long*/ g_utf16_to_utf8(char[] str, int /*long*/ len, i
}
}
/** @param str cast=(const gchar *) */
@@ -18083,7 +18106,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_utf8_offset_to_pointer(str, offset);
-@@ -3474,8 +3474,8 @@ public static final int /*long*/ g_utf8_offset_to_pointer(int /*long*/ str, int
+@@ -3496,8 +3496,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 *)
*/
@@ -18094,7 +18117,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_utf8_pointer_to_offset(str, pos);
-@@ -3484,8 +3484,8 @@ public static final int /*long*/ g_utf8_pointer_to_offset(int /*long*/ str, int
+@@ -3506,8 +3506,8 @@ public static final int /*long*/ g_utf8_pointer_to_offset(int /*long*/ str, int
}
}
/** @param str cast=(const gchar *) */
@@ -18105,7 +18128,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_utf16_offset_to_pointer(str, offset);
-@@ -3497,8 +3497,8 @@ public static final int /*long*/ g_utf16_offset_to_pointer(int /*long*/ str, int
+@@ -3519,8 +3519,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 *)
*/
@@ -18116,7 +18139,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_utf16_pointer_to_offset(str, pos);
-@@ -3507,8 +3507,8 @@ public static final int /*long*/ g_utf16_pointer_to_offset(int /*long*/ str, int
+@@ -3529,8 +3529,8 @@ public static final int /*long*/ g_utf16_pointer_to_offset(int /*long*/ str, int
}
}
/** @param str cast=(const gchar *) */
@@ -18127,7 +18150,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_utf16_strlen(str, max);
-@@ -3517,8 +3517,8 @@ public static final int /*long*/ g_utf16_strlen(int /*long*/ str, int /*long*/ m
+@@ -3539,8 +3539,8 @@ public static final int /*long*/ g_utf16_strlen(int /*long*/ str, int /*long*/ m
}
}
/** @param str cast=(const gchar *) */
@@ -18138,7 +18161,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_utf8_offset_to_utf16_offset(str, offset);
-@@ -3527,8 +3527,8 @@ public static final int /*long*/ g_utf8_offset_to_utf16_offset(int /*long*/ str,
+@@ -3549,8 +3549,8 @@ public static final int /*long*/ g_utf8_offset_to_utf16_offset(int /*long*/ str,
}
}
/** @param str cast=(const gchar *) */
@@ -18149,7 +18172,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_utf16_offset_to_utf8_offset(str, offset);
-@@ -3537,8 +3537,8 @@ public static final int /*long*/ g_utf16_offset_to_utf8_offset(int /*long*/ str,
+@@ -3559,8 +3559,8 @@ public static final int /*long*/ g_utf16_offset_to_utf8_offset(int /*long*/ str,
}
}
/** @param str cast=(const gchar *) */
@@ -18160,7 +18183,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_utf8_strlen(str, max);
-@@ -3553,8 +3553,8 @@ public static final int /*long*/ g_utf8_strlen(int /*long*/ str, int /*long*/ ma
+@@ -3575,8 +3575,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
*/
@@ -18171,7 +18194,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_utf8_to_utf16(str, len, items_read, items_written, error);
-@@ -3569,8 +3569,8 @@ public static final int /*long*/ g_utf8_to_utf16(byte[] str, int /*long*/ len, i
+@@ -3591,8 +3591,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
*/
@@ -18182,7 +18205,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_utf8_to_utf16(str, len, items_read, items_written, error);
-@@ -3582,28 +3582,28 @@ public static final int /*long*/ g_utf8_to_utf16(int /*long*/ str, int /*long*/
+@@ -3604,28 +3604,28 @@ public static final int /*long*/ g_utf8_to_utf16(int /*long*/ str, int /*long*/
* @param value cast=(GValue *)
* @param type cast=(GType)
*/
@@ -18223,7 +18246,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_value_peek_pointer(value);
-@@ -3612,8 +3612,8 @@ public static final int /*long*/ g_value_peek_pointer (int /*long*/ value) {
+@@ -3634,8 +3634,8 @@ public static final int /*long*/ g_value_peek_pointer (int /*long*/ value) {
}
}
/** @param atom_name cast=(const gchar *),flags=no_out critical */
@@ -18234,7 +18257,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_atom_intern(atom_name, only_if_exists);
-@@ -3622,8 +3622,8 @@ public static final int /*long*/ gdk_atom_intern(byte[] atom_name, boolean only_
+@@ -3644,8 +3644,8 @@ public static final int /*long*/ gdk_atom_intern(byte[] atom_name, boolean only_
}
}
/** @param atom cast=(GdkAtom) */
@@ -18245,7 +18268,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_atom_name(atom);
-@@ -3646,8 +3646,8 @@ public static final void gdk_beep() {
+@@ -3668,8 +3668,8 @@ public static final void gdk_beep() {
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -18256,7 +18279,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_bitmap_create_from_data(window, data, width, height);
-@@ -3656,8 +3656,8 @@ public static final int /*long*/ gdk_bitmap_create_from_data(int /*long*/ window
+@@ -3678,8 +3678,8 @@ public static final int /*long*/ gdk_bitmap_create_from_data(int /*long*/ window
}
}
/** @method flags=dynamic */
@@ -18267,7 +18290,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_cairo_create(drawable);
-@@ -3666,8 +3666,8 @@ public static final int /*long*/ gdk_cairo_create(int /*long*/ drawable) {
+@@ -3688,8 +3688,8 @@ public static final int /*long*/ gdk_cairo_create(int /*long*/ drawable) {
}
}
/** @method flags=dynamic */
@@ -18278,7 +18301,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_cairo_region(cairo, region);
-@@ -3676,8 +3676,8 @@ public static final void gdk_cairo_region(int /*long*/ cairo, int /*long*/ regio
+@@ -3698,8 +3698,8 @@ public static final void gdk_cairo_region(int /*long*/ cairo, int /*long*/ regio
}
}
/** @method flags=dynamic */
@@ -18289,7 +18312,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_cairo_reset_clip(cairo, drawable);
-@@ -3686,8 +3686,8 @@ public static final void gdk_cairo_reset_clip(int /*long*/ cairo, int /*long*/ d
+@@ -3708,8 +3708,8 @@ public static final void gdk_cairo_reset_clip(int /*long*/ cairo, int /*long*/ d
}
}
/** @method flags=dynamic */
@@ -18300,7 +18323,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_cairo_set_source_color(cairo, color);
-@@ -3699,8 +3699,8 @@ public static final void gdk_cairo_set_source_color(int /*long*/ cairo, GdkColor
+@@ -3721,8 +3721,8 @@ public static final void gdk_cairo_set_source_color(int /*long*/ cairo, GdkColor
* @method flags=dynamic
* @param window cast=(GdkWindow *)
*/
@@ -18311,7 +18334,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_cairo_set_source_window(cairo, window, x, y);
-@@ -3710,8 +3710,8 @@ public static final void gdk_cairo_set_source_window(int /*long*/ cairo, int /*l
+@@ -3732,8 +3732,8 @@ public static final void gdk_cairo_set_source_window(int /*long*/ cairo, int /*l
}
}
/** @param color cast=(GdkColor *) */
@@ -18322,7 +18345,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_color_free(color);
-@@ -3736,8 +3736,8 @@ public static final boolean gdk_color_parse(byte[] spec, GdkColor color) {
+@@ -3758,8 +3758,8 @@ public static final boolean gdk_color_parse(byte[] spec, GdkColor color) {
* @param colormap cast=(GdkColormap *)
* @param color cast=(GdkColor *),flags=no_in
*/
@@ -18333,7 +18356,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_color_white(colormap, color);
-@@ -3751,8 +3751,8 @@ public static final boolean gdk_color_white(int /*long*/ colormap, GdkColor colo
+@@ -3773,8 +3773,8 @@ public static final boolean gdk_color_white(int /*long*/ colormap, GdkColor colo
* @param writeable cast=(gboolean)
* @param best_match cast=(gboolean)
*/
@@ -18344,7 +18367,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_colormap_alloc_color(colormap, color, writeable, best_match);
-@@ -3765,8 +3765,8 @@ public static final boolean gdk_colormap_alloc_color(int /*long*/ colormap, GdkC
+@@ -3787,8 +3787,8 @@ public static final boolean gdk_colormap_alloc_color(int /*long*/ colormap, GdkC
* @param colors cast=(GdkColor *),flags=no_out
* @param ncolors cast=(gint)
*/
@@ -18355,7 +18378,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_colormap_free_colors(colormap, colors, ncolors);
-@@ -3774,8 +3774,8 @@ public static final void gdk_colormap_free_colors(int /*long*/ colormap, GdkColo
+@@ -3796,8 +3796,8 @@ public static final void gdk_colormap_free_colors(int /*long*/ colormap, GdkColo
lock.unlock();
}
}
@@ -18366,7 +18389,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_colormap_get_system();
-@@ -3788,8 +3788,8 @@ public static final int /*long*/ gdk_colormap_get_system() {
+@@ -3810,8 +3810,8 @@ public static final int /*long*/ gdk_colormap_get_system() {
* @param pixel cast=(gulong)
* @param result cast=(GdkColor *)
*/
@@ -18377,7 +18400,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_colormap_query_color(colormap, pixel, result);
-@@ -3798,8 +3798,8 @@ public static final void gdk_colormap_query_color(int /*long*/ colormap, int /*l
+@@ -3820,8 +3820,8 @@ public static final void gdk_colormap_query_color(int /*long*/ colormap, int /*l
}
}
/** @param cursor cast=(GdkCursor *) */
@@ -18388,7 +18411,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_cursor_unref(cursor);
-@@ -3808,8 +3808,8 @@ public static final void gdk_cursor_unref(int /*long*/ cursor) {
+@@ -3830,8 +3830,8 @@ public static final void gdk_cursor_unref(int /*long*/ cursor) {
}
}
/** @param cursor_type cast=(GdkCursorType) */
@@ -18399,7 +18422,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_cursor_new(cursor_type);
-@@ -3825,8 +3825,8 @@ public static final int /*long*/ gdk_cursor_new(int /*long*/ cursor_type) {
+@@ -3847,8 +3847,8 @@ public static final int /*long*/ gdk_cursor_new(int /*long*/ cursor_type) {
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -18410,7 +18433,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_cursor_new_from_pixmap(source, mask, fg, bg, x, y);
-@@ -3835,8 +3835,8 @@ public static final int /*long*/ gdk_cursor_new_from_pixmap(int /*long*/ source,
+@@ -3857,8 +3857,8 @@ public static final int /*long*/ gdk_cursor_new_from_pixmap(int /*long*/ source,
}
}
/** @method flags=dynamic */
@@ -18421,7 +18444,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_cursor_new_from_pixbuf(display, pixbuf, x, y);
-@@ -3845,8 +3845,8 @@ public static final int /*long*/ gdk_cursor_new_from_pixbuf(int /*long*/ display
+@@ -3867,8 +3867,8 @@ public static final int /*long*/ gdk_cursor_new_from_pixbuf(int /*long*/ display
}
}
/** @method flags=dynamic */
@@ -18432,7 +18455,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_display_get_default();
-@@ -3855,8 +3855,8 @@ public static final int /*long*/ gdk_display_get_default() {
+@@ -3877,8 +3877,8 @@ public static final int /*long*/ gdk_display_get_default() {
}
}
/** @method flags=dynamic */
@@ -18443,7 +18466,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_display_supports_cursor_color(display);
-@@ -3869,8 +3869,8 @@ public static final boolean gdk_display_supports_cursor_color(int /*long*/ displ
+@@ -3891,8 +3891,8 @@ public static final boolean gdk_display_supports_cursor_color(int /*long*/ displ
* @param action cast=(GdkDragAction)
* @param time cast=(guint32)
*/
@@ -18454,7 +18477,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_drag_status(context, action, time);
-@@ -3888,8 +3888,8 @@ public static final void gdk_drag_status(int /*long*/ context, int action, int t
+@@ -3910,8 +3910,8 @@ public static final void gdk_drag_status(int /*long*/ context, int action, int t
* @param angle1 cast=(gint)
* @param angle2 cast=(gint)
*/
@@ -18465,7 +18488,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_draw_arc(drawable, gc, filled, x, y, width, height, angle1, angle2);
-@@ -3908,8 +3908,8 @@ public static final void gdk_draw_arc(int /*long*/ drawable, int /*long*/ gc, in
+@@ -3930,8 +3930,8 @@ public static final void gdk_draw_arc(int /*long*/ drawable, int /*long*/ gc, in
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -18476,7 +18499,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_draw_drawable(drawable, gc, src, xsrc, ysrc, xdest, ydest, width, height);
-@@ -3922,8 +3922,8 @@ public static final void gdk_draw_drawable(int /*long*/ drawable, int /*long*/ g
+@@ -3944,8 +3944,8 @@ public static final void gdk_draw_drawable(int /*long*/ drawable, int /*long*/ g
* @param gc cast=(GdkGC *)
* @param image cast=(GdkImage *)
*/
@@ -18487,7 +18510,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_draw_image(drawable, gc, image, xsrc, ysrc, xdest, ydest, width, height);
-@@ -3938,8 +3938,8 @@ public static final void gdk_draw_image(int /*long*/ drawable, int /*long*/ gc,
+@@ -3960,8 +3960,8 @@ public static final void gdk_draw_image(int /*long*/ drawable, int /*long*/ gc,
* @param y cast=(gint)
* @param layout cast=(PangoLayout *)
*/
@@ -18498,7 +18521,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_draw_layout(drawable, gc, x, y, layout);
-@@ -3955,8 +3955,8 @@ public static final void gdk_draw_layout(int /*long*/ drawable, int /*long*/ gc,
+@@ -3977,8 +3977,8 @@ public static final void gdk_draw_layout(int /*long*/ drawable, int /*long*/ gc,
* @param foreground flags=no_out
* @param background flags=no_out
*/
@@ -18509,7 +18532,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_draw_layout_with_colors(drawable, gc, x, y, layout, foreground, background);
-@@ -3971,8 +3971,8 @@ public static final void gdk_draw_layout_with_colors(int /*long*/ drawable, int
+@@ -3993,8 +3993,8 @@ public static final void gdk_draw_layout_with_colors(int /*long*/ drawable, int
* @param x2 cast=(gint)
* @param y2 cast=(gint)
*/
@@ -18520,7 +18543,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_draw_line(drawable, gc, x1, y1, x2, y2);
-@@ -3985,8 +3985,8 @@ public static final void gdk_draw_line(int /*long*/ drawable, int /*long*/ gc, i
+@@ -4007,8 +4007,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)
*/
@@ -18531,7 +18554,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_draw_lines(drawable, gc, points, npoints);
-@@ -4009,8 +4009,8 @@ public static final void gdk_draw_lines(int /*long*/ drawable, int /*long*/ gc,
+@@ -4031,8 +4031,8 @@ public static final void gdk_draw_lines(int /*long*/ drawable, int /*long*/ gc,
* @param x_dither cast=(gint)
* @param y_dither cast=(gint)
*/
@@ -18542,7 +18565,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_draw_pixbuf(drawable, gc, pixbuf, xsrc, ysrc, xdest, ydest, width, height, dither, x_dither, y_dither);
-@@ -4021,8 +4021,8 @@ public static final void gdk_draw_pixbuf(int /*long*/ drawable, int /*long*/ gc,
+@@ -4043,8 +4043,8 @@ public static final void gdk_draw_pixbuf(int /*long*/ drawable, int /*long*/ gc,
/**
* @method flags=dynamic
*/
@@ -18553,7 +18576,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_draw_point(drawable, gc, x, y);
-@@ -4037,8 +4037,8 @@ public static final void gdk_draw_point(int /*long*/ drawable, int /*long*/ gc,
+@@ -4059,8 +4059,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)
*/
@@ -18564,7 +18587,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_draw_polygon(drawable, gc, filled, points, npoints);
-@@ -4055,8 +4055,8 @@ public static final void gdk_draw_polygon(int /*long*/ drawable, int /*long*/ gc
+@@ -4077,8 +4077,8 @@ public static final void gdk_draw_polygon(int /*long*/ drawable, int /*long*/ gc
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -18575,7 +18598,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_draw_rectangle(drawable, gc, filled, x, y, width, height);
-@@ -4065,8 +4065,8 @@ public static final void gdk_draw_rectangle(int /*long*/ drawable, int /*long*/
+@@ -4087,8 +4087,8 @@ public static final void gdk_draw_rectangle(int /*long*/ drawable, int /*long*/
}
}
/** @param drawable cast=(GdkDrawable *) */
@@ -18586,7 +18609,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_drawable_get_depth(drawable);
-@@ -4082,8 +4082,8 @@ public static final int gdk_drawable_get_depth(int /*long*/ drawable) {
+@@ -4104,8 +4104,8 @@ public static final int gdk_drawable_get_depth(int /*long*/ drawable) {
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -18597,7 +18620,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_drawable_get_image(drawable, x, y, width, height);
-@@ -4096,8 +4096,8 @@ public static final int /*long*/ gdk_drawable_get_image(int /*long*/ drawable, i
+@@ -4118,8 +4118,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
*/
@@ -18608,7 +18631,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_drawable_get_size(drawable, width, height);
-@@ -4106,8 +4106,8 @@ public static final void gdk_drawable_get_size(int /*long*/ drawable, int[] widt
+@@ -4128,8 +4128,8 @@ public static final void gdk_drawable_get_size(int /*long*/ drawable, int[] widt
}
}
/** @param drawable cast=(GdkDrawable *) */
@@ -18619,7 +18642,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_drawable_get_visible_region(drawable);
-@@ -4116,8 +4116,8 @@ public static final int /*long*/ gdk_drawable_get_visible_region(int /*long*/ dr
+@@ -4138,8 +4138,8 @@ public static final int /*long*/ gdk_drawable_get_visible_region(int /*long*/ dr
}
}
/** @param event cast=(GdkEvent *) */
@@ -18630,7 +18653,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_event_copy(event);
-@@ -4126,8 +4126,8 @@ public static final int /*long*/ gdk_event_copy(int /*long*/ event) {
+@@ -4148,8 +4148,8 @@ public static final int /*long*/ gdk_event_copy(int /*long*/ event) {
}
}
/** @param event cast=(GdkEvent *) */
@@ -18641,7 +18664,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_event_free(event);
-@@ -4135,8 +4135,8 @@ public static final void gdk_event_free(int /*long*/ event) {
+@@ -4157,8 +4157,8 @@ public static final void gdk_event_free(int /*long*/ event) {
lock.unlock();
}
}
@@ -18652,7 +18675,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_event_get();
-@@ -4149,8 +4149,8 @@ public static final int /*long*/ gdk_event_get() {
+@@ -4171,8 +4171,8 @@ public static final int /*long*/ gdk_event_get() {
* @param px cast=(gdouble *)
* @param py cast=(gdouble *)
*/
@@ -18663,7 +18686,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_event_get_root_coords(event, px, py);
-@@ -4163,8 +4163,8 @@ public static final boolean gdk_event_get_root_coords(int /*long*/ event, double
+@@ -4185,8 +4185,8 @@ public static final boolean gdk_event_get_root_coords(int /*long*/ event, double
* @param px cast=(gdouble *)
* @param py cast=(gdouble *)
*/
@@ -18674,7 +18697,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_event_get_coords(event, px, py);
-@@ -4176,8 +4176,8 @@ public static final boolean gdk_event_get_coords(int /*long*/ event, double[] px
+@@ -4198,8 +4198,8 @@ public static final boolean gdk_event_get_coords(int /*long*/ event, double[] px
* @param event cast=(GdkEvent *)
* @param pmod cast=(GdkModifierType *)
*/
@@ -18685,7 +18708,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_event_get_state(event, pmod);
-@@ -4186,8 +4186,8 @@ public static final boolean gdk_event_get_state(int /*long*/ event, int[] pmod)
+@@ -4208,8 +4208,8 @@ public static final boolean gdk_event_get_state(int /*long*/ event, int[] pmod)
}
}
/** @param event cast=(GdkEvent *) */
@@ -18696,7 +18719,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_event_get_time(event);
-@@ -4200,8 +4200,8 @@ public static final int gdk_event_get_time(int /*long*/ event) {
+@@ -4222,8 +4222,8 @@ public static final int gdk_event_get_time(int /*long*/ event) {
* @param data cast=(gpointer)
* @param notify cast=(GDestroyNotify)
*/
@@ -18707,7 +18730,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_event_handler_set(func, data, notify);
-@@ -4209,8 +4209,8 @@ public static final void gdk_event_handler_set(int /*long*/ func, int /*long*/ d
+@@ -4231,8 +4231,8 @@ public static final void gdk_event_handler_set(int /*long*/ func, int /*long*/ d
lock.unlock();
}
}
@@ -18718,7 +18741,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_event_new(type);
-@@ -4218,8 +4218,8 @@ public static final int /*long*/ gdk_event_new(int type) {
+@@ -4240,8 +4240,8 @@ public static final int /*long*/ gdk_event_new(int type) {
lock.unlock();
}
}
@@ -18729,7 +18752,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_event_peek();
-@@ -4228,8 +4228,8 @@ public static final int /*long*/ gdk_event_peek() {
+@@ -4250,8 +4250,8 @@ public static final int /*long*/ gdk_event_peek() {
}
}
/** @param event cast=(GdkEvent *) */
@@ -18740,7 +18763,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_event_put(event);
-@@ -4268,8 +4268,8 @@ public static final void gdk_flush() {
+@@ -4290,8 +4290,8 @@ public static final void gdk_flush() {
* @param gc cast=(GdkGC *)
* @param values cast=(GdkGCValues *),flags=no_in
*/
@@ -18751,7 +18774,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_gc_get_values(gc, values);
-@@ -4278,8 +4278,8 @@ public static final void gdk_gc_get_values(int /*long*/ gc, GdkGCValues values)
+@@ -4300,8 +4300,8 @@ public static final void gdk_gc_get_values(int /*long*/ gc, GdkGCValues values)
}
}
/** @param window cast=(GdkDrawable *) */
@@ -18762,7 +18785,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_gc_new(window);
-@@ -4291,8 +4291,8 @@ public static final int /*long*/ gdk_gc_new(int /*long*/ window) {
+@@ -4313,8 +4313,8 @@ public static final int /*long*/ gdk_gc_new(int /*long*/ window) {
* @method flags=dynamic
* @param color cast=(GdkColor *),flags=no_out
*/
@@ -18773,7 +18796,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_gc_set_background(gc, color);
-@@ -4303,8 +4303,8 @@ public static final void gdk_gc_set_background(int /*long*/ gc, GdkColor color)
+@@ -4325,8 +4325,8 @@ public static final void gdk_gc_set_background(int /*long*/ gc, GdkColor color)
/**
* @method flags=dynamic
*/
@@ -18784,7 +18807,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_gc_set_clip_mask(gc, mask);
-@@ -4317,8 +4317,8 @@ public static final void gdk_gc_set_clip_mask(int /*long*/ gc, int /*long*/ mask
+@@ -4339,8 +4339,8 @@ public static final void gdk_gc_set_clip_mask(int /*long*/ gc, int /*long*/ mask
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -18795,7 +18818,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_gc_set_clip_origin(gc, x, y);
-@@ -4330,8 +4330,8 @@ public static final void gdk_gc_set_clip_origin(int /*long*/ gc, int x, int y) {
+@@ -4352,8 +4352,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 *)
*/
@@ -18806,7 +18829,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_gc_set_clip_region(gc, region);
-@@ -4345,8 +4345,8 @@ public static final void gdk_gc_set_clip_region(int /*long*/ gc, int /*long*/ re
+@@ -4367,8 +4367,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)
*/
@@ -18817,7 +18840,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_gc_set_dashes(gc, dash_offset, dash_list, n);
-@@ -4358,8 +4358,8 @@ public static final void gdk_gc_set_dashes(int /*long*/ gc, int dash_offset, byt
+@@ -4380,8 +4380,8 @@ public static final void gdk_gc_set_dashes(int /*long*/ gc, int dash_offset, byt
* @param gc cast=(GdkGC *)
* @param exposures cast=(gboolean)
*/
@@ -18828,7 +18851,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_gc_set_exposures(gc, exposures);
-@@ -4371,8 +4371,8 @@ public static final void gdk_gc_set_exposures(int /*long*/ gc, boolean exposures
+@@ -4393,8 +4393,8 @@ public static final void gdk_gc_set_exposures(int /*long*/ gc, boolean exposures
* @param gc cast=(GdkGC *)
* @param fill cast=(GdkFill)
*/
@@ -18839,7 +18862,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_gc_set_fill(gc, fill);
-@@ -4384,8 +4384,8 @@ public static final void gdk_gc_set_fill(int /*long*/ gc, int fill) {
+@@ -4406,8 +4406,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
*/
@@ -18850,7 +18873,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_gc_set_foreground(gc, color);
-@@ -4397,8 +4397,8 @@ public static final void gdk_gc_set_foreground(int /*long*/ gc, GdkColor color)
+@@ -4419,8 +4419,8 @@ public static final void gdk_gc_set_foreground(int /*long*/ gc, GdkColor color)
* @param gc cast=(GdkGC *)
* @param function cast=(GdkFunction)
*/
@@ -18861,7 +18884,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_gc_set_function(gc, function);
-@@ -4409,8 +4409,8 @@ public static final void gdk_gc_set_function(int /*long*/ gc, int /*long*/ funct
+@@ -4431,8 +4431,8 @@ public static final void gdk_gc_set_function(int /*long*/ gc, int /*long*/ funct
/**
* @method flags=dynamic
*/
@@ -18872,7 +18895,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_gc_set_line_attributes(gc, line_width, line_style, cap_style, join_style);
-@@ -4422,8 +4422,8 @@ public static final void gdk_gc_set_line_attributes(int /*long*/ gc, int line_wi
+@@ -4444,8 +4444,8 @@ public static final void gdk_gc_set_line_attributes(int /*long*/ gc, int line_wi
* @param gc cast=(GdkGC *)
* @param stipple cast=(GdkPixmap *)
*/
@@ -18883,7 +18906,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_gc_set_stipple(gc, stipple);
-@@ -4435,8 +4435,8 @@ public static final void gdk_gc_set_stipple(int /*long*/ gc, int /*long*/ stippl
+@@ -4457,8 +4457,8 @@ public static final void gdk_gc_set_stipple(int /*long*/ gc, int /*long*/ stippl
* @param gc cast=(GdkGC *)
* @param mode cast=(GdkSubwindowMode)
*/
@@ -18894,7 +18917,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_gc_set_subwindow(gc, mode);
-@@ -4447,8 +4447,8 @@ public static final void gdk_gc_set_subwindow(int /*long*/ gc, int /*long*/ mode
+@@ -4469,8 +4469,8 @@ public static final void gdk_gc_set_subwindow(int /*long*/ gc, int /*long*/ mode
/**
* @method flags=dynamic
*/
@@ -18905,7 +18928,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_gc_set_tile(gc, tile);
-@@ -4459,8 +4459,8 @@ public static final void gdk_gc_set_tile(int /*long*/ gc, int /*long*/ tile) {
+@@ -4481,8 +4481,8 @@ public static final void gdk_gc_set_tile(int /*long*/ gc, int /*long*/ tile) {
/**
* @method flags=dynamic
*/
@@ -18916,7 +18939,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_gc_set_ts_origin(gc, x, y);
-@@ -4473,8 +4473,8 @@ public static final void gdk_gc_set_ts_origin(int /*long*/ gc, int x, int y) {
+@@ -4495,8 +4495,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)
*/
@@ -18927,7 +18950,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_gc_set_values(gc, values, values_mask);
-@@ -4482,8 +4482,8 @@ public static final void gdk_gc_set_values(int /*long*/ gc, GdkGCValues values,
+@@ -4504,8 +4504,8 @@ public static final void gdk_gc_set_values(int /*long*/ gc, GdkGCValues values,
lock.unlock();
}
}
@@ -18938,7 +18961,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_get_default_root_window();
-@@ -4500,8 +4500,8 @@ public static final void gdk_keyboard_ungrab(int time) {
+@@ -4522,8 +4522,8 @@ public static final void gdk_keyboard_ungrab(int time) {
lock.unlock();
}
}
@@ -18949,7 +18972,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_keymap_get_default();
-@@ -4517,8 +4517,8 @@ public static final int /*long*/ gdk_keymap_get_default() {
+@@ -4539,8 +4539,8 @@ public static final int /*long*/ gdk_keymap_get_default() {
* @param level cast=(gint*)
* @param consumed_modifiers cast=(GdkModifierType *)
*/
@@ -18960,7 +18983,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_keymap_translate_keyboard_state(keymap, hardware_keycode, state, group, keyval, effective_group, level, consumed_modifiers);
-@@ -4544,8 +4544,8 @@ public static final int gdk_keyval_to_unicode(int keyval) {
+@@ -4566,8 +4566,8 @@ public static final int gdk_keyval_to_unicode(int keyval) {
lock.unlock();
}
}
@@ -18971,7 +18994,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_pango_attr_embossed_new(embossed);
-@@ -4553,8 +4553,8 @@ public static final int /*long*/ gdk_pango_attr_embossed_new(boolean embossed) {
+@@ -4575,8 +4575,8 @@ public static final int /*long*/ gdk_pango_attr_embossed_new(boolean embossed) {
lock.unlock();
}
}
@@ -18982,7 +19005,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_pango_context_get();
-@@ -4567,8 +4567,8 @@ public static final int /*long*/ gdk_pango_context_get() {
+@@ -4589,8 +4589,8 @@ public static final int /*long*/ gdk_pango_context_get() {
* @param context cast=(PangoContext *)
* @param colormap cast=(GdkColormap *)
*/
@@ -18993,7 +19016,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_pango_context_set_colormap(context, colormap);
-@@ -4577,8 +4577,8 @@ public static final void gdk_pango_context_set_colormap(int /*long*/ context, in
+@@ -4599,8 +4599,8 @@ public static final void gdk_pango_context_set_colormap(int /*long*/ context, in
}
}
/** @param layout cast=(PangoLayout *) */
@@ -19004,7 +19027,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_pango_layout_get_clip_region(layout, x_origin, y_origin, index_ranges, n_ranges);
-@@ -4590,8 +4590,8 @@ public static final int /*long*/ gdk_pango_layout_get_clip_region(int /*long*/ l
+@@ -4612,8 +4612,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 *)
*/
@@ -19015,7 +19038,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_pixbuf_copy_area(src_pixbuf, src_x, src_y, width, height, dest_pixbuf, dest_x, dest_y);
-@@ -4604,8 +4604,8 @@ public static final void gdk_pixbuf_copy_area(int /*long*/ src_pixbuf, int src_x
+@@ -4626,8 +4626,8 @@ public static final void gdk_pixbuf_copy_area(int /*long*/ src_pixbuf, int src_x
* @param src cast=(GdkDrawable *)
* @param cmap cast=(GdkColormap *)
*/
@@ -19026,7 +19049,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_pixbuf_get_from_drawable(dest, src, cmap, src_x, src_y, dest_x, dest_y, width, height);
-@@ -4614,8 +4614,8 @@ public static final int /*long*/ gdk_pixbuf_get_from_drawable(int /*long*/ dest,
+@@ -4636,8 +4636,8 @@ public static final int /*long*/ gdk_pixbuf_get_from_drawable(int /*long*/ dest,
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -19037,7 +19060,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_pixbuf_get_has_alpha(pixbuf);
-@@ -4624,8 +4624,8 @@ public static final boolean gdk_pixbuf_get_has_alpha(int /*long*/ pixbuf) {
+@@ -4646,8 +4646,8 @@ public static final boolean gdk_pixbuf_get_has_alpha(int /*long*/ pixbuf) {
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -19048,7 +19071,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_pixbuf_get_height(pixbuf);
-@@ -4634,8 +4634,8 @@ public static final int gdk_pixbuf_get_height(int /*long*/ pixbuf) {
+@@ -4656,8 +4656,8 @@ public static final int gdk_pixbuf_get_height(int /*long*/ pixbuf) {
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -19059,7 +19082,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_pixbuf_get_pixels(pixbuf);
-@@ -4644,8 +4644,8 @@ public static final int /*long*/ gdk_pixbuf_get_pixels(int /*long*/ pixbuf) {
+@@ -4666,8 +4666,8 @@ public static final int /*long*/ gdk_pixbuf_get_pixels(int /*long*/ pixbuf) {
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -19070,7 +19093,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_pixbuf_get_rowstride(pixbuf);
-@@ -4654,8 +4654,8 @@ public static final int gdk_pixbuf_get_rowstride(int /*long*/ pixbuf) {
+@@ -4676,8 +4676,8 @@ public static final int gdk_pixbuf_get_rowstride(int /*long*/ pixbuf) {
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -19081,7 +19104,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_pixbuf_get_width(pixbuf);
-@@ -4663,8 +4663,8 @@ public static final int gdk_pixbuf_get_width(int /*long*/ pixbuf) {
+@@ -4685,8 +4685,8 @@ public static final int gdk_pixbuf_get_width(int /*long*/ pixbuf) {
lock.unlock();
}
}
@@ -19092,7 +19115,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_pixbuf_loader_new();
-@@ -4676,8 +4676,8 @@ public static final int /*long*/ gdk_pixbuf_loader_new() {
+@@ -4698,8 +4698,8 @@ public static final int /*long*/ gdk_pixbuf_loader_new() {
* @param loader cast=(GdkPixbufLoader *)
* @param error cast=(GError **)
*/
@@ -19103,7 +19126,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_pixbuf_loader_close(loader, error);
-@@ -4686,8 +4686,8 @@ public static final boolean gdk_pixbuf_loader_close(int /*long*/ loader, int /*l
+@@ -4708,8 +4708,8 @@ public static final boolean gdk_pixbuf_loader_close(int /*long*/ loader, int /*l
}
}
/** @param loader cast=(GdkPixbufLoader *) */
@@ -19114,7 +19137,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_pixbuf_loader_get_pixbuf(loader);
-@@ -4701,8 +4701,8 @@ public static final int /*long*/ gdk_pixbuf_loader_get_pixbuf(int /*long*/ loade
+@@ -4723,8 +4723,8 @@ public static final int /*long*/ gdk_pixbuf_loader_get_pixbuf(int /*long*/ loade
* @param count cast=(gsize)
* @param error cast=(GError **)
*/
@@ -19125,7 +19148,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_pixbuf_loader_write(loader, buffer, count, error);
-@@ -4714,8 +4714,8 @@ public static final boolean gdk_pixbuf_loader_write(int /*long*/ loader, int /*l
+@@ -4736,8 +4736,8 @@ public static final boolean gdk_pixbuf_loader_write(int /*long*/ loader, int /*l
* @param colorspace cast=(GdkColorspace)
* @param has_alpha cast=(gboolean)
*/
@@ -19136,7 +19159,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_pixbuf_new(colorspace, has_alpha, bits_per_sample, width, height);
-@@ -4727,8 +4727,8 @@ public static final int /*long*/ gdk_pixbuf_new(int colorspace, boolean has_alph
+@@ -4749,8 +4749,8 @@ public static final int /*long*/ gdk_pixbuf_new(int colorspace, boolean has_alph
* @param filename cast=(const char *)
* @param error cast=(GError**)
*/
@@ -19147,7 +19170,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_pixbuf_new_from_file(filename, error);
-@@ -4742,8 +4742,8 @@ public static final int /*long*/ gdk_pixbuf_new_from_file(byte[] filename, int /
+@@ -4764,8 +4764,8 @@ public static final int /*long*/ gdk_pixbuf_new_from_file(byte[] filename, int /
* @param gc cast=(GdkGC *)
* @param dither cast=(GdkRgbDither)
*/
@@ -19158,7 +19181,7 @@ index ea39bc8..d687398 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);
-@@ -4756,8 +4756,8 @@ public static final void gdk_pixbuf_render_to_drawable(int /*long*/ pixbuf, int
+@@ -4778,8 +4778,8 @@ public static final void gdk_pixbuf_render_to_drawable(int /*long*/ pixbuf, int
* @param pixmap_return cast=(GdkDrawable **)
* @param mask_return cast=(GdkBitmap **)
*/
@@ -19169,7 +19192,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap_return, mask_return, alpha_threshold);
-@@ -4775,8 +4775,8 @@ public static final void gdk_pixbuf_render_pixmap_and_mask(int /*long*/ pixbuf,
+@@ -4797,8 +4797,8 @@ public static final void gdk_pixbuf_render_pixmap_and_mask(int /*long*/ pixbuf,
* @param option_values cast=(char **)
* @param error cast=(GError **)
*/
@@ -19180,7 +19203,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_pixbuf_save_to_bufferv(pixbuf, buffer, buffer_size, type, option_keys, option_values, error);
-@@ -4792,8 +4792,8 @@ public static final boolean gdk_pixbuf_save_to_bufferv(int /*long*/ pixbuf, int
+@@ -4814,8 +4814,8 @@ public static final boolean gdk_pixbuf_save_to_bufferv(int /*long*/ pixbuf, int
* @param scale_x cast=(double)
* @param scale_y cast=(double)
*/
@@ -19191,7 +19214,7 @@ index ea39bc8..d687398 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);
-@@ -4805,8 +4805,8 @@ public static final void gdk_pixbuf_scale(int /*long*/ src, int /*long*/ dest, i
+@@ -4827,8 +4827,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)
*/
@@ -19202,7 +19225,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_pixbuf_scale_simple(src, dest_width, dest_height, interp_type);
-@@ -4820,8 +4820,8 @@ public static final int /*long*/ gdk_pixbuf_scale_simple(int /*long*/ src, int d
+@@ -4842,8 +4842,8 @@ public static final int /*long*/ gdk_pixbuf_scale_simple(int /*long*/ src, int d
* @param height cast=(gint)
* @param depth cast=(gint)
*/
@@ -19213,7 +19236,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_pixmap_new(window, width, height, depth);
-@@ -4837,8 +4837,8 @@ public static final int /*long*/ gdk_pixmap_new(int /*long*/ window, int width,
+@@ -4859,8 +4859,8 @@ public static final int /*long*/ gdk_pixmap_new(int /*long*/ window, int width,
* @param cursor cast=(GdkCursor *)
* @param time cast=(guint32)
*/
@@ -19224,7 +19247,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_pointer_grab(window, owner_events, event_mask, confine_to, cursor, time);
-@@ -4874,8 +4874,8 @@ public static final void gdk_pointer_ungrab(int time) {
+@@ -4896,8 +4896,8 @@ public static final void gdk_pointer_ungrab(int time) {
* @param actual_length cast=(gint *)
* @param data cast=(guchar **)
*/
@@ -19235,7 +19258,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_property_get(window, property, type, offset, length, pdelete, actual_property_type, actual_format, actual_length, data);
-@@ -4884,8 +4884,8 @@ public static final boolean gdk_property_get(int /*long*/ window, int /*long*/ p
+@@ -4906,8 +4906,8 @@ public static final boolean gdk_property_get(int /*long*/ window, int /*long*/ p
}
}
/** @param region cast=(GdkRegion *) */
@@ -19246,7 +19269,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_region_destroy(region);
-@@ -4894,8 +4894,8 @@ public static final void gdk_region_destroy(int /*long*/ region) {
+@@ -4916,8 +4916,8 @@ public static final void gdk_region_destroy(int /*long*/ region) {
}
}
/** @param region cast=(GdkRegion *) */
@@ -19257,7 +19280,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_region_empty(region);
-@@ -4907,8 +4907,8 @@ public static final boolean gdk_region_empty(int /*long*/ region) {
+@@ -4929,8 +4929,8 @@ public static final boolean gdk_region_empty(int /*long*/ region) {
* @param region cast=(GdkRegion *)
* @param rectangle cast=(GdkRectangle *),flags=no_in
*/
@@ -19268,7 +19291,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_region_get_clipbox(region, rectangle);
-@@ -4921,8 +4921,8 @@ public static final void gdk_region_get_clipbox(int /*long*/ region, GdkRectangl
+@@ -4943,8 +4943,8 @@ public static final void gdk_region_get_clipbox(int /*long*/ region, GdkRectangl
* @param rectangles cast=(GdkRectangle **)
* @param n_rectangles cast=(gint *)
*/
@@ -19279,7 +19302,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_region_get_rectangles(region, rectangles, n_rectangles);
-@@ -4934,8 +4934,8 @@ public static final void gdk_region_get_rectangles(int /*long*/ region, int /*lo
+@@ -4956,8 +4956,8 @@ public static final void gdk_region_get_rectangles(int /*long*/ region, int /*lo
* @param source1 cast=(GdkRegion *)
* @param source2 cast=(GdkRegion *)
*/
@@ -19290,7 +19313,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_region_intersect(source1, source2);
-@@ -4943,8 +4943,8 @@ public static final void gdk_region_intersect(int /*long*/ source1, int /*long*/
+@@ -4965,8 +4965,8 @@ public static final void gdk_region_intersect(int /*long*/ source1, int /*long*/
lock.unlock();
}
}
@@ -19301,7 +19324,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_region_new();
-@@ -4957,8 +4957,8 @@ public static final int /*long*/ gdk_region_new() {
+@@ -4979,8 +4979,8 @@ public static final int /*long*/ gdk_region_new() {
* @param dx cast=(gint)
* @param dy cast=(gint)
*/
@@ -19312,7 +19335,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_region_offset(region, dx, dy);
-@@ -4971,8 +4971,8 @@ public static final void gdk_region_offset(int /*long*/ region, int dx, int dy)
+@@ -4993,8 +4993,8 @@ public static final void gdk_region_offset(int /*long*/ region, int dx, int dy)
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -19323,7 +19346,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_region_point_in(region, x, y);
-@@ -4984,8 +4984,8 @@ public static final boolean gdk_region_point_in(int /*long*/ region, int x, int
+@@ -5006,8 +5006,8 @@ public static final boolean gdk_region_point_in(int /*long*/ region, int x, int
* @param points cast=(GdkPoint *)
* @param fill_rule cast=(GdkFillRule)
*/
@@ -19334,7 +19357,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_region_polygon(points, npoints, fill_rule);
-@@ -4994,8 +4994,8 @@ public static final int /*long*/ gdk_region_polygon(int[] points, int npoints, i
+@@ -5016,8 +5016,8 @@ public static final int /*long*/ gdk_region_polygon(int[] points, int npoints, i
}
}
/** @param rectangle flags=no_out */
@@ -19345,7 +19368,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_region_rectangle(rectangle);
-@@ -5007,8 +5007,8 @@ public static final int /*long*/ gdk_region_rectangle(GdkRectangle rectangle) {
+@@ -5029,8 +5029,8 @@ public static final int /*long*/ gdk_region_rectangle(GdkRectangle rectangle) {
* @param region cast=(GdkRegion *)
* @param rect cast=(GdkRectangle *),flags=no_out
*/
@@ -19356,7 +19379,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_region_rect_in(region, rect);
-@@ -5020,8 +5020,8 @@ public static final int /*long*/ gdk_region_rect_in(int /*long*/ region, GdkRect
+@@ -5042,8 +5042,8 @@ public static final int /*long*/ gdk_region_rect_in(int /*long*/ region, GdkRect
* @param source1 cast=(GdkRegion *)
* @param source2 cast=(GdkRegion *)
*/
@@ -19367,7 +19390,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_region_subtract(source1, source2);
-@@ -5033,8 +5033,8 @@ public static final void gdk_region_subtract(int /*long*/ source1, int /*long*/
+@@ -5055,8 +5055,8 @@ public static final void gdk_region_subtract(int /*long*/ source1, int /*long*/
* @param source1 cast=(GdkRegion *)
* @param source2 cast=(GdkRegion *)
*/
@@ -19378,7 +19401,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_region_union(source1, source2);
-@@ -5046,8 +5046,8 @@ public static final void gdk_region_union(int /*long*/ source1, int /*long*/ sou
+@@ -5068,8 +5068,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
*/
@@ -19389,7 +19412,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_region_union_with_rect(region, rect);
-@@ -5056,8 +5056,8 @@ public static final void gdk_region_union_with_rect(int /*long*/ region, GdkRect
+@@ -5078,8 +5078,8 @@ public static final void gdk_region_union_with_rect(int /*long*/ region, GdkRect
}
}
/** @method flags=dynamic */
@@ -19400,7 +19423,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_screen_get_default();
-@@ -5071,8 +5071,8 @@ public static final int /*long*/ gdk_screen_get_default() {
+@@ -5093,8 +5093,8 @@ public static final int /*long*/ gdk_screen_get_default() {
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -19411,7 +19434,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_screen_get_monitor_at_point (screen, x, y);
-@@ -5085,8 +5085,8 @@ public static final int gdk_screen_get_monitor_at_point (int /*long*/ screen, in
+@@ -5107,8 +5107,8 @@ public static final int gdk_screen_get_monitor_at_point (int /*long*/ screen, in
* @param screen cast=(GdkScreen *)
* @param window cast=(GdkWindow *)
*/
@@ -19422,7 +19445,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_screen_get_monitor_at_window(screen, window);
-@@ -5099,8 +5099,8 @@ public static final int gdk_screen_get_monitor_at_window(int /*long*/ screen, in
+@@ -5121,8 +5121,8 @@ public static final int gdk_screen_get_monitor_at_window(int /*long*/ screen, in
* @param screen cast=(GdkScreen *)
* @param dest flags=no_in
*/
@@ -19433,7 +19456,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_screen_get_monitor_geometry(screen, monitor_num, dest);
-@@ -5112,8 +5112,8 @@ public static final void gdk_screen_get_monitor_geometry (int /*long*/ screen, i
+@@ -5134,8 +5134,8 @@ public static final void gdk_screen_get_monitor_geometry (int /*long*/ screen, i
* @method flags=dynamic
* @param screen cast=(GdkScreen *)
*/
@@ -19444,7 +19467,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_screen_get_n_monitors(screen);
-@@ -5125,8 +5125,8 @@ public static final int gdk_screen_get_n_monitors(int /*long*/ screen) {
+@@ -5147,8 +5147,8 @@ public static final int gdk_screen_get_n_monitors(int /*long*/ screen) {
* @method flags=dynamic
* @param screen cast=(GdkScreen *)
*/
@@ -19455,7 +19478,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_screen_get_number(screen);
-@@ -5178,8 +5178,8 @@ public static final void gdk_set_program_class(byte[] program_class) {
+@@ -5200,8 +5200,8 @@ public static final void gdk_set_program_class(byte[] program_class) {
* @param ctext cast=(guchar **)
* @param length cast=(gint *)
*/
@@ -19466,7 +19489,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_utf8_to_compound_text(str, encoding, format, ctext, length);
-@@ -5188,8 +5188,8 @@ public static final boolean gdk_utf8_to_compound_text(byte[] str, int /*long*/[]
+@@ -5210,8 +5210,8 @@ public static final boolean gdk_utf8_to_compound_text(byte[] str, int /*long*/[]
}
}
/** @param str cast=(const gchar *) */
@@ -19477,7 +19500,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_utf8_to_string_target(str);
-@@ -5203,8 +5203,8 @@ public static final int /*long*/ gdk_utf8_to_string_target(byte[] str) {
+@@ -5225,8 +5225,8 @@ public static final int /*long*/ gdk_utf8_to_string_target(byte[] str) {
* @param text cast=(guchar *)
* @param list cast=(gchar ***)
*/
@@ -19488,7 +19511,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_text_property_to_utf8_list_for_display(display, encoding, format, text, length, list);
-@@ -5218,7 +5218,7 @@ public static final native void gdk_threads_leave ();
+@@ -5240,7 +5240,7 @@ public static final native void gdk_threads_leave ();
/**
* @method flags=dynamic
*/
@@ -19497,7 +19520,7 @@ index ea39bc8..d687398 100644
public static final native int _gdk_unicode_to_keyval(int wc);
public static final int gdk_unicode_to_keyval(int wc) {
-@@ -5229,8 +5229,8 @@ public static final int gdk_unicode_to_keyval(int wc) {
+@@ -5251,8 +5251,8 @@ public static final int gdk_unicode_to_keyval(int wc) {
lock.unlock();
}
}
@@ -19508,7 +19531,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_visual_get_system();
-@@ -5242,8 +5242,8 @@ public static final int /*long*/ gdk_visual_get_system() {
+@@ -5264,8 +5264,8 @@ public static final int /*long*/ gdk_visual_get_system() {
* @param win_x cast=(gint *)
* @param win_y cast=(gint *)
*/
@@ -19519,7 +19542,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_window_at_pointer(win_x, win_y);
-@@ -5255,8 +5255,8 @@ public static final int /*long*/ gdk_window_at_pointer(int[] win_x, int[] win_y)
+@@ -5277,8 +5277,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
*/
@@ -19530,7 +19553,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_begin_paint_rect(window, rectangle);
-@@ -5265,8 +5265,8 @@ public static final void gdk_window_begin_paint_rect(int /*long*/ window, GdkRec
+@@ -5287,8 +5287,8 @@ public static final void gdk_window_begin_paint_rect(int /*long*/ window, GdkRec
}
}
/** @param window cast=(GdkWindow *) */
@@ -19541,7 +19564,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_clear_area(window, x, y, width, height);
-@@ -5278,8 +5278,8 @@ public static final void gdk_window_clear_area(int /*long*/ window, int x, int y
+@@ -5300,8 +5300,8 @@ public static final void gdk_window_clear_area(int /*long*/ window, int x, int y
* @method flags=dynamic
* @param window cast=(GdkWindow *)
*/
@@ -19552,7 +19575,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_window_create_similar_surface(window, content, width, height);
-@@ -5288,8 +5288,8 @@ public static final int /*long*/ gdk_window_create_similar_surface(int /*long*/
+@@ -5310,8 +5310,8 @@ public static final int /*long*/ gdk_window_create_similar_surface(int /*long*/
}
}
/** @param window cast=(GdkWindow *) */
@@ -19563,7 +19586,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_destroy(window);
-@@ -5298,8 +5298,8 @@ public static final void gdk_window_destroy(int /*long*/ window) {
+@@ -5320,8 +5320,8 @@ public static final void gdk_window_destroy(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19574,7 +19597,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_end_paint(window);
-@@ -5308,8 +5308,8 @@ public static final void gdk_window_end_paint(int /*long*/ window) {
+@@ -5330,8 +5330,8 @@ public static final void gdk_window_end_paint(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19585,7 +19608,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_window_get_children(window);
-@@ -5318,8 +5318,8 @@ public static final int /*long*/ gdk_window_get_children(int /*long*/ window) {
+@@ -5340,8 +5340,8 @@ public static final int /*long*/ gdk_window_get_children(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19596,7 +19619,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_window_get_events(window);
-@@ -5328,8 +5328,8 @@ public static final int gdk_window_get_events(int /*long*/ window) {
+@@ -5350,8 +5350,8 @@ public static final int gdk_window_get_events(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19607,7 +19630,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_focus(window, timestamp);
-@@ -5338,8 +5338,8 @@ public static final void gdk_window_focus(int /*long*/ window, int timestamp) {
+@@ -5360,8 +5360,8 @@ public static final void gdk_window_focus(int /*long*/ window, int timestamp) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19618,7 +19641,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_freeze_updates(window);
-@@ -5351,8 +5351,8 @@ public static final void gdk_window_freeze_updates(int /*long*/ window) {
+@@ -5373,8 +5373,8 @@ public static final void gdk_window_freeze_updates(int /*long*/ window) {
* @param window cast=(GdkWindow *)
* @param rect cast=(GdkRectangle *),flags=no_in
*/
@@ -19629,7 +19652,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_get_frame_extents(window, rect);
-@@ -5366,8 +5366,8 @@ public static final void gdk_window_get_frame_extents(int /*long*/ window, GdkRe
+@@ -5388,8 +5388,8 @@ public static final void gdk_window_get_frame_extents(int /*long*/ window, GdkRe
* @param x_offset cast=(gint *)
* @param y_offset cast=(gint *)
*/
@@ -19640,7 +19663,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_get_internal_paint_info(window, real_drawable, x_offset, y_offset);
-@@ -5380,8 +5380,8 @@ public static final void gdk_window_get_internal_paint_info(int /*long*/ window,
+@@ -5402,8 +5402,8 @@ public static final void gdk_window_get_internal_paint_info(int /*long*/ window,
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
@@ -19651,7 +19674,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_window_get_origin(window, x, y);
-@@ -5390,8 +5390,8 @@ public static final int gdk_window_get_origin(int /*long*/ window, int[] x, int[
+@@ -5412,8 +5412,8 @@ public static final int gdk_window_get_origin(int /*long*/ window, int[] x, int[
}
}
/** @param window cast=(GdkWindow *) */
@@ -19662,7 +19685,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_window_get_parent(window);
-@@ -5405,8 +5405,8 @@ public static final int /*long*/ gdk_window_get_parent(int /*long*/ window) {
+@@ -5427,8 +5427,8 @@ public static final int /*long*/ gdk_window_get_parent(int /*long*/ window) {
* @param y cast=(gint *)
* @param mask cast=(GdkModifierType *)
*/
@@ -19673,7 +19696,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_window_get_pointer(window, x, y, mask);
-@@ -5419,8 +5419,8 @@ public static final int /*long*/ gdk_window_get_pointer(int /*long*/ window, int
+@@ -5441,8 +5441,8 @@ public static final int /*long*/ gdk_window_get_pointer(int /*long*/ window, int
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
@@ -19684,7 +19707,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_get_position(window, x, y);
-@@ -5432,8 +5432,8 @@ public static final void gdk_window_get_position(int /*long*/ window, int[] x, i
+@@ -5454,8 +5454,8 @@ public static final void gdk_window_get_position(int /*long*/ window, int[] x, i
* @param window cast=(GdkWindow *)
* @param data cast=(gpointer *)
*/
@@ -19695,7 +19718,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_get_user_data(window, data);
-@@ -5442,8 +5442,8 @@ public static final void gdk_window_get_user_data(int /*long*/ window, int /*lon
+@@ -5464,8 +5464,8 @@ public static final void gdk_window_get_user_data(int /*long*/ window, int /*lon
}
}
/** @param window cast=(GdkWindow *) */
@@ -19706,7 +19729,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_hide(window);
-@@ -5456,8 +5456,8 @@ public static final void gdk_window_hide(int /*long*/ window) {
+@@ -5478,8 +5478,8 @@ public static final void gdk_window_hide(int /*long*/ window) {
* @param rectangle cast=(GdkRectangle *),flags=no_out
* @param invalidate_children cast=(gboolean)
*/
@@ -19717,7 +19740,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_invalidate_rect(window, rectangle, invalidate_children);
-@@ -5470,8 +5470,8 @@ public static final void gdk_window_invalidate_rect(int /*long*/ window, GdkRect
+@@ -5492,8 +5492,8 @@ public static final void gdk_window_invalidate_rect(int /*long*/ window, GdkRect
* @param region cast=(GdkRegion *)
* @param invalidate_children cast=(gboolean)
*/
@@ -19728,7 +19751,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_invalidate_region(window, region, invalidate_children);
-@@ -5480,8 +5480,8 @@ public static final void gdk_window_invalidate_region(int /*long*/ window, int /
+@@ -5502,8 +5502,8 @@ public static final void gdk_window_invalidate_region(int /*long*/ window, int /
}
}
/** @param window cast=(GdkWindow *) */
@@ -19739,7 +19762,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_window_is_visible(window);
-@@ -5490,8 +5490,8 @@ public static final boolean gdk_window_is_visible(int /*long*/ window) {
+@@ -5512,8 +5512,8 @@ public static final boolean gdk_window_is_visible(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19750,7 +19773,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_window_is_viewable (window);
-@@ -5500,8 +5500,8 @@ public static final boolean gdk_window_is_viewable (int /*long*/ window) {
+@@ -5522,8 +5522,8 @@ public static final boolean gdk_window_is_viewable (int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19761,7 +19784,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_move(window, x, y);
-@@ -5510,8 +5510,8 @@ public static final void gdk_window_move(int /*long*/ window, int x, int y) {
+@@ -5532,8 +5532,8 @@ public static final void gdk_window_move(int /*long*/ window, int x, int y) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19772,7 +19795,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_move_resize(window, x, y, width, height);
-@@ -5523,8 +5523,8 @@ public static final void gdk_window_move_resize(int /*long*/ window, int x, int
+@@ -5545,8 +5545,8 @@ public static final void gdk_window_move_resize(int /*long*/ window, int x, int
* @param parent cast=(GdkWindow *)
* @param attributes flags=no_out
*/
@@ -19783,7 +19806,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gdk_window_new(parent, attributes, attributes_mask);
-@@ -5533,8 +5533,8 @@ public static final int /*long*/ gdk_window_new(int /*long*/ parent, GdkWindowAt
+@@ -5555,8 +5555,8 @@ public static final int /*long*/ gdk_window_new(int /*long*/ parent, GdkWindowAt
}
}
/** @param window cast=(GdkWindow *) */
@@ -19794,7 +19817,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_lower(window);
-@@ -5555,8 +5555,8 @@ public static final void gdk_window_process_all_updates() {
+@@ -5577,8 +5577,8 @@ public static final void gdk_window_process_all_updates() {
* @param window cast=(GdkWindow *)
* @param update_children cast=(gboolean)
*/
@@ -19805,7 +19828,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_process_updates(window, update_children);
-@@ -5565,8 +5565,8 @@ public static final void gdk_window_process_updates(int /*long*/ window, boolean
+@@ -5587,8 +5587,8 @@ public static final void gdk_window_process_updates(int /*long*/ window, boolean
}
}
/** @param window cast=(GdkWindow *) */
@@ -19816,7 +19839,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_raise(window);
-@@ -5575,8 +5575,8 @@ public static final void gdk_window_raise(int /*long*/ window) {
+@@ -5597,8 +5597,8 @@ public static final void gdk_window_raise(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19827,7 +19850,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_resize(window, width, height);
-@@ -5590,8 +5590,8 @@ public static final void gdk_window_resize(int /*long*/ window, int width, int h
+@@ -5612,8 +5612,8 @@ public static final void gdk_window_resize(int /*long*/ window, int width, int h
* @param sibling cast=(GdkWindow *)
* @param above cast=(gboolean)
*/
@@ -19838,7 +19861,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_restack(window, sibling, above);
-@@ -5600,8 +5600,8 @@ public static final void gdk_window_restack(int /*long*/ window, int /*long*/ si
+@@ -5622,8 +5622,8 @@ public static final void gdk_window_restack(int /*long*/ window, int /*long*/ si
}
}
/** @param window cast=(GdkWindow *) */
@@ -19849,7 +19872,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_scroll(window, dx, dy);
-@@ -5614,8 +5614,8 @@ public static final void gdk_window_scroll(int /*long*/ window, int dx, int dy)
+@@ -5636,8 +5636,8 @@ public static final void gdk_window_scroll(int /*long*/ window, int dx, int dy)
* @param window cast=(GdkWindow *)
* @param accept_focus cast=(gboolean)
*/
@@ -19860,7 +19883,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_set_accept_focus(window, accept_focus);
-@@ -5628,8 +5628,8 @@ public static final void gdk_window_set_accept_focus(int /*long*/ window, boolea
+@@ -5650,8 +5650,8 @@ public static final void gdk_window_set_accept_focus(int /*long*/ window, boolea
* @param pixmap cast=(GdkPixmap *)
* @param parent_relative cast=(gboolean)
*/
@@ -19871,7 +19894,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_set_back_pixmap(window, pixmap, parent_relative);
-@@ -5641,8 +5641,8 @@ public static final void gdk_window_set_back_pixmap(int /*long*/ window, int /*l
+@@ -5663,8 +5663,8 @@ public static final void gdk_window_set_back_pixmap(int /*long*/ window, int /*l
* @param window cast=(GdkWindow *)
* @param cursor cast=(GdkCursor *)
*/
@@ -19882,7 +19905,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_set_cursor(window, cursor);
-@@ -5664,8 +5664,8 @@ public static final void gdk_window_set_debug_updates(boolean setting) {
+@@ -5686,8 +5686,8 @@ public static final void gdk_window_set_debug_updates(boolean setting) {
* @param window cast=(GdkWindow *)
* @param decorations cast=(GdkWMDecoration)
*/
@@ -19893,7 +19916,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_set_decorations(window, decorations);
-@@ -5674,8 +5674,8 @@ public static final void gdk_window_set_decorations(int /*long*/ window, int dec
+@@ -5696,8 +5696,8 @@ public static final void gdk_window_set_decorations(int /*long*/ window, int dec
}
}
/** @param window cast=(GdkWindow *) */
@@ -19904,7 +19927,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_set_events(window, event_mask);
-@@ -5689,8 +5689,8 @@ public static final void gdk_window_set_events(int /*long*/ window, int event_ma
+@@ -5711,8 +5711,8 @@ public static final void gdk_window_set_events(int /*long*/ window, int event_ma
* @param pixmap cast=(GdkPixmap *)
* @param mask cast=(GdkBitmap *)
*/
@@ -19915,7 +19938,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_set_icon(window, icon_window, pixmap, mask);
-@@ -5702,8 +5702,8 @@ public static final void gdk_window_set_icon(int /*long*/ window, int /*long*/ i
+@@ -5724,8 +5724,8 @@ public static final void gdk_window_set_icon(int /*long*/ window, int /*long*/ i
* @param window cast=(GdkWindow *)
* @param pixbufs cast=(GList *)
*/
@@ -19926,7 +19949,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_set_icon_list(window, pixbufs);
-@@ -5716,8 +5716,8 @@ public static final void gdk_window_set_icon_list(int /*long*/ window, int /*lon
+@@ -5738,8 +5738,8 @@ public static final void gdk_window_set_icon_list(int /*long*/ window, int /*lon
* @param window cast=(GdkWindow *)
* @param setting cast=(gboolean)
*/
@@ -19937,7 +19960,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_set_keep_above(window, setting);
-@@ -5729,8 +5729,8 @@ public static final void gdk_window_set_keep_above(int /*long*/ window, boolean
+@@ -5751,8 +5751,8 @@ public static final void gdk_window_set_keep_above(int /*long*/ window, boolean
* @param window cast=(GdkWindow *)
* @param override_redirect cast=(gboolean)
*/
@@ -19948,7 +19971,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_set_override_redirect(window, override_redirect);
-@@ -5742,8 +5742,8 @@ public static final void gdk_window_set_override_redirect(int /*long*/ window, b
+@@ -5764,8 +5764,8 @@ public static final void gdk_window_set_override_redirect(int /*long*/ window, b
* @param window cast=(GdkWindow *)
* @param user_data cast=(gpointer)
*/
@@ -19959,7 +19982,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_set_user_data(window, user_data);
-@@ -5755,8 +5755,8 @@ public static final void gdk_window_set_user_data(int /*long*/ window, int /*lon
+@@ -5777,8 +5777,8 @@ public static final void gdk_window_set_user_data(int /*long*/ window, int /*lon
* @param window cast=(GdkWindow *)
* @param shape_region cast=(GdkRegion *)
*/
@@ -19970,7 +19993,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_shape_combine_region(window, shape_region, offset_x, offset_y);
-@@ -5765,8 +5765,8 @@ public static final void gdk_window_shape_combine_region (int /*long*/ window, i
+@@ -5787,8 +5787,8 @@ public static final void gdk_window_shape_combine_region (int /*long*/ window, i
}
}
/** @param window cast=(GdkWindow *) */
@@ -19981,7 +20004,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_show(window);
-@@ -5775,8 +5775,8 @@ public static final void gdk_window_show(int /*long*/ window) {
+@@ -5797,8 +5797,8 @@ public static final void gdk_window_show(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19992,7 +20015,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_show_unraised(window);
-@@ -5785,8 +5785,8 @@ public static final void gdk_window_show_unraised(int /*long*/ window) {
+@@ -5807,8 +5807,8 @@ public static final void gdk_window_show_unraised(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -20003,7 +20026,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gdk_window_thaw_updates(window);
-@@ -5808,8 +5808,8 @@ public static final int gtk_accelerator_get_default_mod_mask() {
+@@ -5830,8 +5830,8 @@ public static final int gtk_accelerator_get_default_mod_mask() {
* @param accelerator_key cast=(guint *)
* @param accelerator_mods cast=(GdkModifierType *)
*/
@@ -20014,7 +20037,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_accelerator_parse(accelerator, accelerator_key, accelerator_mods);
-@@ -5817,8 +5817,8 @@ public static final void gtk_accelerator_parse(int /*long*/ accelerator, int []
+@@ -5839,8 +5839,8 @@ public static final void gtk_accelerator_parse(int /*long*/ accelerator, int []
lock.unlock();
}
}
@@ -20025,7 +20048,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_accel_group_new();
-@@ -5831,8 +5831,8 @@ public static final int /*long*/ gtk_accel_group_new() {
+@@ -5853,8 +5853,8 @@ public static final int /*long*/ gtk_accel_group_new() {
* @param accelKey cast=(guint)
* @param accelMods cast=(GdkModifierType)
*/
@@ -20036,7 +20059,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_accel_groups_activate(accelGroup, accelKey, accelMods);
-@@ -5844,8 +5844,8 @@ public static final boolean gtk_accel_groups_activate(int /*long*/ accelGroup, i
+@@ -5866,8 +5866,8 @@ public static final boolean gtk_accel_groups_activate(int /*long*/ accelGroup, i
* @param accel_label cast=(GtkAccelLabel *)
* @param accel_widget cast=(GtkWidget *)
*/
@@ -20047,7 +20070,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_accel_label_set_accel_widget(accel_label, accel_widget);
-@@ -5854,8 +5854,8 @@ public static final void gtk_accel_label_set_accel_widget(int /*long*/ accel_lab
+@@ -5876,8 +5876,8 @@ public static final void gtk_accel_label_set_accel_widget(int /*long*/ accel_lab
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -20058,7 +20081,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_adjustment_changed(adjustment);
-@@ -5870,8 +5870,8 @@ public static final void gtk_adjustment_changed(int /*long*/ adjustment) {
+@@ -5892,8 +5892,8 @@ public static final void gtk_adjustment_changed(int /*long*/ adjustment) {
* @param step_increment cast=(gdouble)
* @param page_increment cast=(gdouble)
*/
@@ -20069,7 +20092,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_adjustment_new(value, lower, upper, step_increment, page_increment, page_size);
-@@ -5883,8 +5883,8 @@ public static final int /*long*/ gtk_adjustment_new(double value, double lower,
+@@ -5905,8 +5905,8 @@ public static final int /*long*/ gtk_adjustment_new(double value, double lower,
* @param adjustment cast=(GtkAdjustment *)
* @param value cast=(gdouble)
*/
@@ -20080,7 +20103,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_adjustment_set_value(adjustment, value);
-@@ -5893,8 +5893,8 @@ public static final void gtk_adjustment_set_value(int /*long*/ adjustment, doubl
+@@ -5915,8 +5915,8 @@ public static final void gtk_adjustment_set_value(int /*long*/ adjustment, doubl
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -20091,7 +20114,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_adjustment_value_changed(adjustment);
-@@ -5906,8 +5906,8 @@ public static final void gtk_adjustment_value_changed(int /*long*/ adjustment) {
+@@ -5928,8 +5928,8 @@ public static final void gtk_adjustment_value_changed(int /*long*/ adjustment) {
* @param arrow_type cast=(GtkArrowType)
* @param shadow_type cast=(GtkShadowType)
*/
@@ -20102,7 +20125,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_arrow_new(arrow_type, shadow_type);
-@@ -5920,8 +5920,8 @@ public static final int /*long*/ gtk_arrow_new(int arrow_type, int shadow_type)
+@@ -5942,8 +5942,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)
*/
@@ -20113,7 +20136,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_arrow_set(arrow, arrow_type, shadow_type);
-@@ -5930,8 +5930,8 @@ public static final void gtk_arrow_set(int /*long*/ arrow, int arrow_type, int s
+@@ -5952,8 +5952,8 @@ public static final void gtk_arrow_set(int /*long*/ arrow, int arrow_type, int s
}
}
/** @param bin cast=(GtkBin *) */
@@ -20124,7 +20147,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_bin_get_child(bin);
-@@ -5940,8 +5940,8 @@ public static final int /*long*/ gtk_bin_get_child(int /*long*/ bin) {
+@@ -5962,8 +5962,8 @@ public static final int /*long*/ gtk_bin_get_child(int /*long*/ bin) {
}
}
/** @param border cast=(GtkBorder *) */
@@ -20135,7 +20158,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_border_free(border);
-@@ -5950,8 +5950,8 @@ public static final void gtk_border_free(int /*long*/ border) {
+@@ -5972,8 +5972,8 @@ public static final void gtk_border_free(int /*long*/ border) {
}
}
/** @param box cast=(GtkBox *) */
@@ -20146,7 +20169,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_box_set_spacing(box, spacing);
-@@ -5963,8 +5963,8 @@ public static final void gtk_box_set_spacing(int /*long*/ box, int spacing) {
+@@ -5985,8 +5985,8 @@ public static final void gtk_box_set_spacing(int /*long*/ box, int spacing) {
* @param box cast=(GtkBox *)
* @param child cast=(GtkWidget *)
*/
@@ -20157,7 +20180,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_box_set_child_packing(box, child, expand, fill, padding, pack_type);
-@@ -5973,8 +5973,8 @@ public static final void gtk_box_set_child_packing(int /*long*/ box, int /*long*
+@@ -5995,8 +5995,8 @@ public static final void gtk_box_set_child_packing(int /*long*/ box, int /*long*
}
}
/** @param button cast=(GtkButton *) */
@@ -20168,7 +20191,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_button_clicked(button);
-@@ -5983,8 +5983,8 @@ public static final void gtk_button_clicked(int /*long*/ button) {
+@@ -6005,8 +6005,8 @@ public static final void gtk_button_clicked(int /*long*/ button) {
}
}
/** @param button cast=(GtkButton *) */
@@ -20179,7 +20202,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_button_get_relief(button);
-@@ -5992,8 +5992,8 @@ public static final int gtk_button_get_relief(int /*long*/ button) {
+@@ -6014,8 +6014,8 @@ public static final int gtk_button_get_relief(int /*long*/ button) {
lock.unlock();
}
}
@@ -20190,7 +20213,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_button_new();
-@@ -6005,8 +6005,8 @@ public static final int /*long*/ gtk_button_new() {
+@@ -6027,8 +6027,8 @@ public static final int /*long*/ gtk_button_new() {
* @param button cast=(GtkButton *)
* @param newstyle cast=(GtkReliefStyle)
*/
@@ -20201,7 +20224,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_button_set_relief(button, newstyle);
-@@ -6015,8 +6015,8 @@ public static final void gtk_button_set_relief(int /*long*/ button, int newstyle
+@@ -6037,8 +6037,8 @@ public static final void gtk_button_set_relief(int /*long*/ button, int newstyle
}
}
/** @method flags=dynamic */
@@ -20212,7 +20235,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_calendar_new();
-@@ -6030,8 +6030,8 @@ public static final int /*long*/ gtk_calendar_new() {
+@@ -6052,8 +6052,8 @@ public static final int /*long*/ gtk_calendar_new() {
* @param month cast=(guint)
* @param year cast=(guint)
*/
@@ -20223,7 +20246,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_calendar_select_month(calendar, month, year);
-@@ -6044,8 +6044,8 @@ public static final boolean /*long*/ gtk_calendar_select_month(int /*long*/ cale
+@@ -6066,8 +6066,8 @@ public static final boolean /*long*/ gtk_calendar_select_month(int /*long*/ cale
* @param calendar cast=(GtkCalendar *)
* @param day cast=(guint)
*/
@@ -20234,7 +20257,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_calendar_select_day(calendar, day);
-@@ -6058,8 +6058,8 @@ public static final void gtk_calendar_select_day(int /*long*/ calendar, int day)
+@@ -6080,8 +6080,8 @@ public static final void gtk_calendar_select_day(int /*long*/ calendar, int day)
* @param calendar cast=(GtkCalendar *)
* @param day cast=(guint)
*/
@@ -20245,7 +20268,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_calendar_mark_day(calendar, day);
-@@ -6071,8 +6071,8 @@ public static final void gtk_calendar_mark_day(int /*long*/ calendar, int day) {
+@@ -6093,8 +6093,8 @@ public static final void gtk_calendar_mark_day(int /*long*/ calendar, int day) {
* @method flags=dynamic
* @param calendar cast=(GtkCalendar *)
*/
@@ -20256,7 +20279,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_calendar_clear_marks(calendar);
-@@ -6085,8 +6085,8 @@ public static final void gtk_calendar_clear_marks(int /*long*/ calendar) {
+@@ -6107,8 +6107,8 @@ public static final void gtk_calendar_clear_marks(int /*long*/ calendar) {
* @param calendar cast=(GtkCalendar *)
* @param flags cast=(GtkCalendarDisplayOptions)
*/
@@ -20267,7 +20290,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_calendar_set_display_options(calendar, flags);
-@@ -6101,8 +6101,8 @@ public static final void gtk_calendar_set_display_options(int /*long*/ calendar,
+@@ -6123,8 +6123,8 @@ public static final void gtk_calendar_set_display_options(int /*long*/ calendar,
* @param month cast=(guint *)
* @param day cast=(guint *)
*/
@@ -20278,7 +20301,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_calendar_get_date(calendar, year, month, day);
-@@ -6111,8 +6111,8 @@ public static final void gtk_calendar_get_date(int /*long*/ calendar, int[] year
+@@ -6133,8 +6133,8 @@ public static final void gtk_calendar_get_date(int /*long*/ calendar, int[] year
}
}
/** @method flags=dynamic */
@@ -20289,7 +20312,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_cell_layout_clear(cell_layout);
-@@ -6121,8 +6121,8 @@ public static final void gtk_cell_layout_clear(int /*long*/ cell_layout) {
+@@ -6143,8 +6143,8 @@ public static final void gtk_cell_layout_clear(int /*long*/ cell_layout) {
}
}
/** @method flags=dynamic */
@@ -20300,7 +20323,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_cell_layout_get_cells(cell_layout);
-@@ -6131,8 +6131,8 @@ public static final int /*long*/ gtk_cell_layout_get_cells(int /*long*/ cell_lay
+@@ -6153,8 +6153,8 @@ public static final int /*long*/ gtk_cell_layout_get_cells(int /*long*/ cell_lay
}
}
/** @method flags=no_gen */
@@ -20311,7 +20334,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_cell_layout_set_attributes(cell_layout, cell, attribute, column, sentinel);
-@@ -6141,8 +6141,8 @@ public static final void gtk_cell_layout_set_attributes(int /*long*/ cell_layout
+@@ -6163,8 +6163,8 @@ public static final void gtk_cell_layout_set_attributes(int /*long*/ cell_layout
}
}
/** @method flags=dynamic */
@@ -20322,7 +20345,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_cell_layout_pack_start(cell_layout, cell, expand);
-@@ -6159,8 +6159,8 @@ public static final void gtk_cell_layout_pack_start(int /*long*/ cell_layout, in
+@@ -6181,8 +6181,8 @@ public static final void gtk_cell_layout_pack_start(int /*long*/ cell_layout, in
* @param width cast=(gint *)
* @param height cast=(gint *)
*/
@@ -20333,7 +20356,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_cell_renderer_get_size(cell, widget, area, x_offset, y_offset, width, height);
-@@ -6168,8 +6168,8 @@ public static final void gtk_cell_renderer_get_size(int /*long*/ cell, int /*lon
+@@ -6190,8 +6190,8 @@ public static final void gtk_cell_renderer_get_size(int /*long*/ cell, int /*lon
lock.unlock();
}
}
@@ -20344,7 +20367,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_cell_renderer_pixbuf_new();
-@@ -6177,8 +6177,8 @@ public static final int /*long*/ gtk_cell_renderer_pixbuf_new() {
+@@ -6199,8 +6199,8 @@ public static final int /*long*/ gtk_cell_renderer_pixbuf_new() {
lock.unlock();
}
}
@@ -20355,7 +20378,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_cell_renderer_text_new();
-@@ -6186,8 +6186,8 @@ public static final int /*long*/ gtk_cell_renderer_text_new() {
+@@ -6208,8 +6208,8 @@ public static final int /*long*/ gtk_cell_renderer_text_new() {
lock.unlock();
}
}
@@ -20366,7 +20389,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_cell_renderer_toggle_new();
-@@ -6195,8 +6195,8 @@ public static final int /*long*/ gtk_cell_renderer_toggle_new() {
+@@ -6217,8 +6217,8 @@ public static final int /*long*/ gtk_cell_renderer_toggle_new() {
lock.unlock();
}
}
@@ -20377,7 +20400,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_check_button_new();
-@@ -6205,8 +6205,8 @@ public static final int /*long*/ gtk_check_button_new() {
+@@ -6227,8 +6227,8 @@ public static final int /*long*/ gtk_check_button_new() {
}
}
/** @param check_menu_item cast=(GtkCheckMenuItem *) */
@@ -20388,7 +20411,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_check_menu_item_get_active(check_menu_item);
-@@ -6215,8 +6215,8 @@ public static final boolean gtk_check_menu_item_get_active(int /*long*/ check_me
+@@ -6237,8 +6237,8 @@ public static final boolean gtk_check_menu_item_get_active(int /*long*/ check_me
}
}
/** @param label cast=(const gchar *) */
@@ -20399,7 +20422,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_check_menu_item_new_with_label(label);
-@@ -6228,8 +6228,8 @@ public static final int /*long*/ gtk_check_menu_item_new_with_label(byte[] label
+@@ -6250,8 +6250,8 @@ public static final int /*long*/ gtk_check_menu_item_new_with_label(byte[] label
* @param wid cast=(GtkCheckMenuItem *)
* @param active cast=(gboolean)
*/
@@ -20410,7 +20433,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_check_menu_item_set_active(wid, active);
-@@ -6237,8 +6237,8 @@ public static final void gtk_check_menu_item_set_active(int /*long*/ wid, boolea
+@@ -6259,8 +6259,8 @@ public static final void gtk_check_menu_item_set_active(int /*long*/ wid, boolea
lock.unlock();
}
}
@@ -20421,7 +20444,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_check_version(required_major, required_minor, required_micro);
-@@ -6247,8 +6247,8 @@ public static final int /*long*/ gtk_check_version(int required_major, int requi
+@@ -6269,8 +6269,8 @@ public static final int /*long*/ gtk_check_version(int required_major, int requi
}
}
/** @param clipboard cast=(GtkClipboard *) */
@@ -20432,7 +20455,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_clipboard_clear(clipboard);
-@@ -6257,8 +6257,8 @@ public static final void gtk_clipboard_clear(int /*long*/ clipboard) {
+@@ -6279,8 +6279,8 @@ public static final void gtk_clipboard_clear(int /*long*/ clipboard) {
}
}
/** @param selection cast=(GdkAtom) */
@@ -20443,7 +20466,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_clipboard_get(selection);
-@@ -6274,8 +6274,8 @@ public static final int /*long*/ gtk_clipboard_get(int /*long*/ selection) {
+@@ -6296,8 +6296,8 @@ public static final int /*long*/ gtk_clipboard_get(int /*long*/ selection) {
* @param clear_func cast=(GtkClipboardClearFunc)
* @param user_data cast=(GObject *)
*/
@@ -20454,7 +20477,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_clipboard_set_with_data(clipboard, target, n_targets, get_func, clear_func, user_data);
-@@ -6291,8 +6291,8 @@ public static final boolean gtk_clipboard_set_with_data(int /*long*/ clipboard,
+@@ -6313,8 +6313,8 @@ public static final boolean gtk_clipboard_set_with_data(int /*long*/ clipboard,
* @param clear_func cast=(GtkClipboardClearFunc)
* @param user_data cast=(GObject *)
*/
@@ -20465,7 +20488,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_clipboard_set_with_owner(clipboard, target, n_targets, get_func, clear_func, user_data);
-@@ -6306,8 +6306,8 @@ public static final boolean gtk_clipboard_set_with_owner(int /*long*/ clipboard,
+@@ -6328,8 +6328,8 @@ public static final boolean gtk_clipboard_set_with_owner(int /*long*/ clipboard,
* @param targets cast=(const GtkTargetEntry *)
* @param n_targets cast=(gint)
*/
@@ -20476,7 +20499,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_clipboard_set_can_store(clipboard, targets, n_targets);
-@@ -6319,8 +6319,8 @@ public static final void gtk_clipboard_set_can_store(int /*long*/ clipboard, int
+@@ -6341,8 +6341,8 @@ public static final void gtk_clipboard_set_can_store(int /*long*/ clipboard, int
* @method flags=dynamic
* @param clipboard cast=(GtkClipboard *)
*/
@@ -20487,7 +20510,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_clipboard_store(clipboard);
-@@ -6332,8 +6332,8 @@ public static final void gtk_clipboard_store(int /*long*/ clipboard) {
+@@ -6354,8 +6354,8 @@ public static final void gtk_clipboard_store(int /*long*/ clipboard) {
* @param clipboard cast=(GtkClipboard *)
* @param target cast=(GdkAtom)
*/
@@ -20498,7 +20521,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_clipboard_wait_for_contents(clipboard, target);
-@@ -6342,8 +6342,8 @@ public static final int /*long*/ gtk_clipboard_wait_for_contents(int /*long*/ cl
+@@ -6364,8 +6364,8 @@ public static final int /*long*/ gtk_clipboard_wait_for_contents(int /*long*/ cl
}
}
/** @param title cast=(const gchar *) */
@@ -20509,7 +20532,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_color_selection_dialog_new(title);
-@@ -6355,8 +6355,8 @@ public static final int /*long*/ gtk_color_selection_dialog_new(byte[] title) {
+@@ -6377,8 +6377,8 @@ public static final int /*long*/ gtk_color_selection_dialog_new(byte[] title) {
* @param colorsel cast=(GtkColorSelection *)
* @param color cast=(GdkColor *),flags=no_in
*/
@@ -20520,7 +20543,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_color_selection_get_current_color(colorsel, color);
-@@ -6369,8 +6369,8 @@ public static final void gtk_color_selection_get_current_color(int /*long*/ colo
+@@ -6391,8 +6391,8 @@ public static final void gtk_color_selection_get_current_color(int /*long*/ colo
* @param colors cast=(GdkColor **)
* @param n_colors cast=(gint *)
*/
@@ -20531,7 +20554,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_color_selection_palette_from_string(str, colors, n_colors);
-@@ -6382,8 +6382,8 @@ public static final void gtk_color_selection_palette_from_string(byte[] str, int
+@@ -6404,8 +6404,8 @@ public static final void gtk_color_selection_palette_from_string(byte[] str, int
* @param colors cast=(GdkColor *)
* @param n_colors cast=(gint)
*/
@@ -20542,7 +20565,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_color_selection_palette_to_string(colors, n_colors);
-@@ -6395,8 +6395,8 @@ public static final int /*long*/ gtk_color_selection_palette_to_string(int /*lon
+@@ -6417,8 +6417,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
*/
@@ -20553,7 +20576,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_color_selection_set_current_color(colorsel, color);
-@@ -6405,8 +6405,8 @@ public static final void gtk_color_selection_set_current_color(int /*long*/ colo
+@@ -6427,8 +6427,8 @@ public static final void gtk_color_selection_set_current_color(int /*long*/ colo
}
}
/** @param colorsel cast=(GtkColorSelection *) */
@@ -20564,7 +20587,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_color_selection_set_has_palette(colorsel, has_palette);
-@@ -6415,8 +6415,8 @@ public static final void gtk_color_selection_set_has_palette(int /*long*/ colors
+@@ -6437,8 +6437,8 @@ public static final void gtk_color_selection_set_has_palette(int /*long*/ colors
}
}
/** @method flags=dynamic */
@@ -20575,7 +20598,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_combo_box_set_focus_on_click(combo, val);
-@@ -6425,8 +6425,8 @@ public static final void gtk_combo_box_set_focus_on_click(int /*long*/ combo, bo
+@@ -6447,8 +6447,8 @@ public static final void gtk_combo_box_set_focus_on_click(int /*long*/ combo, bo
}
}
/** @method flags=dynamic */
@@ -20586,7 +20609,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_combo_box_entry_new_text();
-@@ -6435,8 +6435,8 @@ public static final int /*long*/ gtk_combo_box_entry_new_text() {
+@@ -6457,8 +6457,8 @@ public static final int /*long*/ gtk_combo_box_entry_new_text() {
}
}
/** @method flags=dynamic */
@@ -20597,7 +20620,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_combo_box_new_text();
-@@ -6445,8 +6445,8 @@ public static final int /*long*/ gtk_combo_box_new_text() {
+@@ -6467,8 +6467,8 @@ public static final int /*long*/ gtk_combo_box_new_text() {
}
}
/** @method flags=dynamic */
@@ -20608,7 +20631,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_combo_box_insert_text(combo_box, position, text);
-@@ -6455,8 +6455,8 @@ public static final void gtk_combo_box_insert_text(int /*long*/ combo_box, int p
+@@ -6477,8 +6477,8 @@ public static final void gtk_combo_box_insert_text(int /*long*/ combo_box, int p
}
}
/** @method flags=dynamic */
@@ -20619,7 +20642,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_combo_box_remove_text(combo_box, position);
-@@ -6465,8 +6465,8 @@ public static final void gtk_combo_box_remove_text(int /*long*/ combo_box, int p
+@@ -6487,8 +6487,8 @@ public static final void gtk_combo_box_remove_text(int /*long*/ combo_box, int p
}
}
/** @method flags=dynamic */
@@ -20630,7 +20653,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_combo_box_get_active(combo_box);
-@@ -6475,8 +6475,8 @@ public static final int gtk_combo_box_get_active(int /*long*/ combo_box) {
+@@ -6497,8 +6497,8 @@ public static final int gtk_combo_box_get_active(int /*long*/ combo_box) {
}
}
/** @method flags=dynamic */
@@ -20641,7 +20664,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_combo_box_get_model(combo_box);
-@@ -6485,8 +6485,8 @@ public static final int /*long*/ gtk_combo_box_get_model(int /*long*/ combo_box)
+@@ -6507,8 +6507,8 @@ public static final int /*long*/ gtk_combo_box_get_model(int /*long*/ combo_box)
}
}
/** @method flags=dynamic */
@@ -20652,7 +20675,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_combo_box_set_active(combo_box, index);
-@@ -6495,8 +6495,8 @@ public static final void gtk_combo_box_set_active(int /*long*/ combo_box, int in
+@@ -6517,8 +6517,8 @@ public static final void gtk_combo_box_set_active(int /*long*/ combo_box, int in
}
}
/** @method flags=dynamic */
@@ -20663,7 +20686,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_combo_box_popup(combo_box);
-@@ -6505,8 +6505,8 @@ public static final void gtk_combo_box_popup(int /*long*/ combo_box) {
+@@ -6527,8 +6527,8 @@ public static final void gtk_combo_box_popup(int /*long*/ combo_box) {
}
}
/** @method flags=dynamic */
@@ -20674,7 +20697,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_combo_box_popdown(combo_box);
-@@ -6518,8 +6518,8 @@ public static final void gtk_combo_box_popdown(int /*long*/ combo_box) {
+@@ -6540,8 +6540,8 @@ public static final void gtk_combo_box_popdown(int /*long*/ combo_box) {
* @param container cast=(GtkContainer *)
* @param widget cast=(GtkWidget *)
*/
@@ -20685,7 +20708,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_container_add(container, widget);
-@@ -6532,8 +6532,8 @@ public static final void gtk_container_add(int /*long*/ container, int /*long*/
+@@ -6554,8 +6554,8 @@ public static final void gtk_container_add(int /*long*/ container, int /*long*/
* @param callback cast=(GtkCallback)
* @param callback_data cast=(gpointer)
*/
@@ -20696,7 +20719,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_container_forall(container, callback, callback_data);
-@@ -6542,8 +6542,8 @@ public static final void gtk_container_forall(int /*long*/ container, int /*long
+@@ -6564,8 +6564,8 @@ public static final void gtk_container_forall(int /*long*/ container, int /*long
}
}
/** @param container cast=(GtkContainer *) */
@@ -20707,7 +20730,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_container_get_border_width(container);
-@@ -6552,8 +6552,8 @@ public static final int gtk_container_get_border_width(int /*long*/ container) {
+@@ -6574,8 +6574,8 @@ public static final int gtk_container_get_border_width(int /*long*/ container) {
}
}
/** @param container cast=(GtkContainer *) */
@@ -20718,7 +20741,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_container_get_children(container);
-@@ -6565,8 +6565,8 @@ public static final int /*long*/ gtk_container_get_children(int /*long*/ contain
+@@ -6587,8 +6587,8 @@ public static final int /*long*/ gtk_container_get_children(int /*long*/ contain
* @param container cast=(GtkContainer *)
* @param widget cast=(GtkWidget *)
*/
@@ -20729,7 +20752,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_container_remove(container, widget);
-@@ -6575,8 +6575,8 @@ public static final void gtk_container_remove(int /*long*/ container, int /*long
+@@ -6597,8 +6597,8 @@ public static final void gtk_container_remove(int /*long*/ container, int /*long
}
}
/** @param container cast=(GtkContainer *) */
@@ -20740,7 +20763,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_container_resize_children(container);
-@@ -6588,8 +6588,8 @@ public static final void gtk_container_resize_children(int /*long*/ container) {
+@@ -6610,8 +6610,8 @@ public static final void gtk_container_resize_children(int /*long*/ container) {
* @param container cast=(GtkContainer *)
* @param border_width cast=(guint)
*/
@@ -20751,7 +20774,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_container_set_border_width(container, border_width);
-@@ -6602,8 +6602,8 @@ public static final void gtk_container_set_border_width(int /*long*/ container,
+@@ -6624,8 +6624,8 @@ public static final void gtk_container_set_border_width(int /*long*/ container,
* @param button_text cast=(const gchar *)
* @param response_id cast=(gint)
*/
@@ -20762,7 +20785,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_dialog_add_button(dialog, button_text, response_id);
-@@ -6612,8 +6612,8 @@ public static final int /*long*/ gtk_dialog_add_button(int /*long*/ dialog, byte
+@@ -6634,8 +6634,8 @@ public static final int /*long*/ gtk_dialog_add_button(int /*long*/ dialog, byte
}
}
/** @param dialog cast=(GtkDialog *) */
@@ -20773,7 +20796,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_dialog_run(dialog);
-@@ -6628,8 +6628,8 @@ public static final int gtk_dialog_run(int /*long*/ dialog) {
+@@ -6650,8 +6650,8 @@ public static final int gtk_dialog_run(int /*long*/ dialog) {
* @param button cast=(gint)
* @param event cast=(GdkEvent *)
*/
@@ -20784,7 +20807,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_drag_begin(widget, targets, actions, button, event);
-@@ -6644,8 +6644,8 @@ public static final int /*long*/ gtk_drag_begin(int /*long*/ widget, int /*long*
+@@ -6666,8 +6666,8 @@ public static final int /*long*/ gtk_drag_begin(int /*long*/ widget, int /*long*
* @param current_x cast=(gint)
* @param current_y cast=(gint)
*/
@@ -20795,7 +20818,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_drag_check_threshold(widget, start_x, start_y, current_x, current_y);
-@@ -6658,8 +6658,8 @@ public static final boolean gtk_drag_check_threshold(int /*long*/ widget, int st
+@@ -6680,8 +6680,8 @@ public static final boolean gtk_drag_check_threshold(int /*long*/ widget, int st
* @param context cast=(GdkDragContext *)
* @param target_list cast=(GtkTargetList *)
*/
@@ -20806,7 +20829,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_drag_dest_find_target(widget, context, target_list);
-@@ -6674,8 +6674,8 @@ public static final int /*long*/ gtk_drag_dest_find_target(int /*long*/ widget,
+@@ -6696,8 +6696,8 @@ public static final int /*long*/ gtk_drag_dest_find_target(int /*long*/ widget,
* @param n_targets cast=(gint)
* @param actions cast=(GdkDragAction)
*/
@@ -20817,7 +20840,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_drag_dest_set(widget, flags, targets, n_targets, actions);
-@@ -6684,8 +6684,8 @@ public static final void gtk_drag_dest_set(int /*long*/ widget, int flags, int /
+@@ -6706,8 +6706,8 @@ public static final void gtk_drag_dest_set(int /*long*/ widget, int flags, int /
}
}
/** @param widget cast=(GtkWidget *) */
@@ -20828,7 +20851,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_drag_dest_unset(widget);
-@@ -6699,8 +6699,8 @@ public static final void gtk_drag_dest_unset(int /*long*/ widget) {
+@@ -6721,8 +6721,8 @@ public static final void gtk_drag_dest_unset(int /*long*/ widget) {
* @param delete cast=(gboolean)
* @param time cast=(guint32)
*/
@@ -20839,7 +20862,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_drag_finish(context, success, delete, time);
-@@ -6714,8 +6714,8 @@ public static final void gtk_drag_finish(int /*long*/ context, boolean success,
+@@ -6736,8 +6736,8 @@ public static final void gtk_drag_finish(int /*long*/ context, boolean success,
* @param target cast=(GdkAtom)
* @param time cast=(guint32)
*/
@@ -20850,7 +20873,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_drag_get_data(widget, context, target, time);
-@@ -6727,8 +6727,8 @@ public static final void gtk_drag_get_data(int /*long*/ widget, int /*long*/ con
+@@ -6749,8 +6749,8 @@ public static final void gtk_drag_get_data(int /*long*/ widget, int /*long*/ con
* @param context cast=(GdkDragContext *)
* @param pixbuf cast=(GdkPixbuf *)
*/
@@ -20861,7 +20884,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_drag_set_icon_pixbuf(context, pixbuf, hot_x, hot_y);
-@@ -6736,8 +6736,8 @@ public static final void gtk_drag_set_icon_pixbuf(int /*long*/ context, int /*lo
+@@ -6758,8 +6758,8 @@ public static final void gtk_drag_set_icon_pixbuf(int /*long*/ context, int /*lo
lock.unlock();
}
}
@@ -20872,7 +20895,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_drawing_area_new();
-@@ -6746,8 +6746,8 @@ public static final int /*long*/ gtk_drawing_area_new() {
+@@ -6768,8 +6768,8 @@ public static final int /*long*/ gtk_drawing_area_new() {
}
}
/** @param editable cast=(GtkEditable *) */
@@ -20883,7 +20906,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_editable_copy_clipboard(editable);
-@@ -6756,8 +6756,8 @@ public static final void gtk_editable_copy_clipboard(int /*long*/ editable) {
+@@ -6778,8 +6778,8 @@ public static final void gtk_editable_copy_clipboard(int /*long*/ editable) {
}
}
/** @param editable cast=(GtkEditable *) */
@@ -20894,7 +20917,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_editable_cut_clipboard(editable);
-@@ -6766,8 +6766,8 @@ public static final void gtk_editable_cut_clipboard(int /*long*/ editable) {
+@@ -6788,8 +6788,8 @@ public static final void gtk_editable_cut_clipboard(int /*long*/ editable) {
}
}
/** @param editable cast=(GtkEditable *) */
@@ -20905,7 +20928,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_editable_delete_selection(editable);
-@@ -6780,8 +6780,8 @@ public static final void gtk_editable_delete_selection(int /*long*/ editable) {
+@@ -6802,8 +6802,8 @@ public static final void gtk_editable_delete_selection(int /*long*/ editable) {
* @param start_pos cast=(gint)
* @param end_pos cast=(gint)
*/
@@ -20916,7 +20939,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_editable_delete_text(editable, start_pos, end_pos);
-@@ -6794,8 +6794,8 @@ public static final void gtk_editable_delete_text(int /*long*/ editable, int sta
+@@ -6816,8 +6816,8 @@ public static final void gtk_editable_delete_text(int /*long*/ editable, int sta
* @param start_pos cast=(gint)
* @param end_pos cast=(gint)
*/
@@ -20927,7 +20950,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_editable_get_chars(editable, start_pos, end_pos);
-@@ -6804,8 +6804,8 @@ public static final int /*long*/ gtk_editable_get_chars(int /*long*/ editable, i
+@@ -6826,8 +6826,8 @@ public static final int /*long*/ gtk_editable_get_chars(int /*long*/ editable, i
}
}
/** @param editable cast=(GtkEditable *) */
@@ -20938,7 +20961,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_editable_get_editable(editable);
-@@ -6814,8 +6814,8 @@ public static final boolean gtk_editable_get_editable(int /*long*/ editable) {
+@@ -6836,8 +6836,8 @@ public static final boolean gtk_editable_get_editable(int /*long*/ editable) {
}
}
/** @param editable cast=(GtkEditable *) */
@@ -20949,7 +20972,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_editable_get_position(editable);
-@@ -6828,8 +6828,8 @@ public static final int gtk_editable_get_position(int /*long*/ editable) {
+@@ -6850,8 +6850,8 @@ public static final int gtk_editable_get_position(int /*long*/ editable) {
* @param start cast=(gint *)
* @param end cast=(gint *)
*/
@@ -20960,7 +20983,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_editable_get_selection_bounds(editable, start, end);
-@@ -6843,8 +6843,8 @@ public static final boolean gtk_editable_get_selection_bounds(int /*long*/ edita
+@@ -6865,8 +6865,8 @@ public static final boolean gtk_editable_get_selection_bounds(int /*long*/ edita
* @param new_text_length cast=(gint)
* @param position cast=(gint *)
*/
@@ -20971,7 +20994,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_editable_insert_text(editable, new_text, new_text_length, position);
-@@ -6853,8 +6853,8 @@ public static final void gtk_editable_insert_text(int /*long*/ editable, byte[]
+@@ -6875,8 +6875,8 @@ public static final void gtk_editable_insert_text(int /*long*/ editable, byte[]
}
}
/** @param editable cast=(GtkEditable *) */
@@ -20982,7 +21005,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_editable_paste_clipboard(editable);
-@@ -6867,8 +6867,8 @@ public static final void gtk_editable_paste_clipboard(int /*long*/ editable) {
+@@ -6889,8 +6889,8 @@ public static final void gtk_editable_paste_clipboard(int /*long*/ editable) {
* @param start cast=(gint)
* @param end cast=(gint)
*/
@@ -20993,7 +21016,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_editable_select_region(editable, start, end);
-@@ -6880,8 +6880,8 @@ public static final void gtk_editable_select_region(int /*long*/ editable, int s
+@@ -6902,8 +6902,8 @@ public static final void gtk_editable_select_region(int /*long*/ editable, int s
* @param entry cast=(GtkEditable *)
* @param editable cast=(gboolean)
*/
@@ -21004,7 +21027,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_editable_set_editable(entry, editable);
-@@ -6893,8 +6893,8 @@ public static final void gtk_editable_set_editable(int /*long*/ entry, boolean e
+@@ -6915,8 +6915,8 @@ public static final void gtk_editable_set_editable(int /*long*/ entry, boolean e
* @param editable cast=(GtkEditable *)
* @param position cast=(gint)
*/
@@ -21015,7 +21038,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_editable_set_position(editable, position);
-@@ -6903,8 +6903,8 @@ public static final void gtk_editable_set_position(int /*long*/ editable, int po
+@@ -6925,8 +6925,8 @@ public static final void gtk_editable_set_position(int /*long*/ editable, int po
}
}
/** @method flags=dynamic */
@@ -21026,7 +21049,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_entry_get_inner_border(entry);
-@@ -6913,8 +6913,8 @@ public static final int /*long*/ gtk_entry_get_inner_border (int /*long*/ entry)
+@@ -6935,8 +6935,8 @@ public static final int /*long*/ gtk_entry_get_inner_border (int /*long*/ entry)
}
}
/** @param entry cast=(GtkEntry *) */
@@ -21037,7 +21060,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_entry_get_invisible_char(entry);
-@@ -6923,8 +6923,8 @@ public static final char gtk_entry_get_invisible_char(int /*long*/ entry) {
+@@ -6945,8 +6945,8 @@ public static final char gtk_entry_get_invisible_char(int /*long*/ entry) {
}
}
/** @param entry cast=(GtkEntry *) */
@@ -21048,7 +21071,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_entry_get_layout(entry);
-@@ -6933,8 +6933,8 @@ public static final int /*long*/ gtk_entry_get_layout (int /*long*/ entry) {
+@@ -6955,8 +6955,8 @@ public static final int /*long*/ gtk_entry_get_layout (int /*long*/ entry) {
}
}
/** @param entry cast=(GtkEntry *) */
@@ -21059,7 +21082,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_entry_get_layout_offsets(entry, x, y);
-@@ -6943,8 +6943,8 @@ public static final void gtk_entry_get_layout_offsets (int /*long*/ entry, int[]
+@@ -6965,8 +6965,8 @@ public static final void gtk_entry_get_layout_offsets (int /*long*/ entry, int[]
}
}
/** @method flags=dynamic */
@@ -21070,7 +21093,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_entry_text_index_to_layout_index(entry, index);
-@@ -6953,8 +6953,8 @@ public static final int gtk_entry_text_index_to_layout_index (int /*long*/ entry
+@@ -6975,8 +6975,8 @@ public static final int gtk_entry_text_index_to_layout_index (int /*long*/ entry
}
}
/** @param entry cast=(GtkEntry *) */
@@ -21081,7 +21104,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_entry_get_max_length(entry);
-@@ -6963,8 +6963,8 @@ public static final int gtk_entry_get_max_length(int /*long*/ entry) {
+@@ -6985,8 +6985,8 @@ public static final int gtk_entry_get_max_length(int /*long*/ entry) {
}
}
/** @param entry cast=(GtkEntry *) */
@@ -21092,7 +21115,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_entry_get_text(entry);
-@@ -6973,8 +6973,8 @@ public static final int /*long*/ gtk_entry_get_text(int /*long*/ entry) {
+@@ -6995,8 +6995,8 @@ public static final int /*long*/ gtk_entry_get_text(int /*long*/ entry) {
}
}
/** @method flags=dynamic */
@@ -21103,7 +21126,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _FcConfigAppFontAddFile(config, file);
-@@ -6983,8 +6983,8 @@ public static final boolean FcConfigAppFontAddFile(int /*long*/ config, byte[] f
+@@ -7005,8 +7005,8 @@ public static final boolean FcConfigAppFontAddFile(int /*long*/ config, byte[] f
}
}
/** @param entry cast=(GtkEntry *) */
@@ -21114,7 +21137,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_entry_get_visibility(entry);
-@@ -6992,8 +6992,8 @@ public static final boolean gtk_entry_get_visibility(int /*long*/ entry) {
+@@ -7014,8 +7014,8 @@ public static final boolean gtk_entry_get_visibility(int /*long*/ entry) {
lock.unlock();
}
}
@@ -21125,7 +21148,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_entry_new();
-@@ -7005,8 +7005,8 @@ public static final int /*long*/ gtk_entry_new() {
+@@ -7027,8 +7027,8 @@ public static final int /*long*/ gtk_entry_new() {
* @param entry cast=(GtkEntry *)
* @param setting cast=(gboolean)
*/
@@ -21136,7 +21159,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_entry_set_activates_default(entry, setting);
-@@ -7019,8 +7019,8 @@ public static final void gtk_entry_set_activates_default(int /*long*/ entry, boo
+@@ -7041,8 +7041,8 @@ public static final void gtk_entry_set_activates_default(int /*long*/ entry, boo
* @param entry cast=(GtkEntry *)
* @param xalign cast=(gfloat)
*/
@@ -21147,7 +21170,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_entry_set_alignment(entry, xalign);
-@@ -7032,8 +7032,8 @@ public static final void gtk_entry_set_alignment(int /*long*/ entry, float xalig
+@@ -7054,8 +7054,8 @@ public static final void gtk_entry_set_alignment(int /*long*/ entry, float xalig
* @param entry cast=(GtkEntry *)
* @param setting cast=(gboolean)
*/
@@ -21158,7 +21181,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_entry_set_has_frame(entry, setting);
-@@ -7042,8 +7042,8 @@ public static final void gtk_entry_set_has_frame(int /*long*/ entry, boolean set
+@@ -7064,8 +7064,8 @@ public static final void gtk_entry_set_has_frame(int /*long*/ entry, boolean set
}
}
/** @method flags=dynamic */
@@ -21169,7 +21192,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_entry_set_icon_from_stock(entry, icon, stock);
-@@ -7052,8 +7052,8 @@ public static final void gtk_entry_set_icon_from_stock(int /*long*/ entry, int i
+@@ -7074,8 +7074,8 @@ public static final void gtk_entry_set_icon_from_stock(int /*long*/ entry, int i
}
}
/** @method flags=dynamic */
@@ -21180,7 +21203,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_entry_set_icon_sensitive(entry, icon_pos, sensitive);
-@@ -7065,8 +7065,8 @@ public static final void gtk_entry_set_icon_sensitive(int /*long*/ entry, int ic
+@@ -7087,8 +7087,8 @@ public static final void gtk_entry_set_icon_sensitive(int /*long*/ entry, int ic
* @param entry cast=(GtkEntry *)
* @param ch cast=(gint)
*/
@@ -21191,7 +21214,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_entry_set_invisible_char(entry, ch);
-@@ -7078,8 +7078,8 @@ public static final void gtk_entry_set_invisible_char(int /*long*/ entry, char c
+@@ -7100,8 +7100,8 @@ public static final void gtk_entry_set_invisible_char(int /*long*/ entry, char c
* @param entry cast=(GtkEntry *)
* @param max cast=(gint)
*/
@@ -21202,7 +21225,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_entry_set_max_length(entry, max);
-@@ -7091,8 +7091,8 @@ public static final void gtk_entry_set_max_length(int /*long*/ entry, int max) {
+@@ -7113,8 +7113,8 @@ public static final void gtk_entry_set_max_length(int /*long*/ entry, int max) {
* @param entry cast=(GtkEntry *)
* @param text cast=(const gchar *)
*/
@@ -21213,7 +21236,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_entry_set_text(entry, text);
-@@ -7104,8 +7104,8 @@ public static final void gtk_entry_set_text(int /*long*/ entry, byte[] text) {
+@@ -7126,8 +7126,8 @@ public static final void gtk_entry_set_text(int /*long*/ entry, byte[] text) {
* @param entry cast=(GtkEntry *)
* @param visible cast=(gboolean)
*/
@@ -21224,7 +21247,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_entry_set_visibility(entry, visible);
-@@ -7123,8 +7123,8 @@ public static final int gtk_events_pending() {
+@@ -7145,8 +7145,8 @@ public static final int gtk_events_pending() {
}
}
/** @method flags=dynamic */
@@ -21235,7 +21258,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_expander_get_expanded(expander);
-@@ -7133,8 +7133,8 @@ public static final boolean gtk_expander_get_expanded(int /*long*/ expander) {
+@@ -7155,8 +7155,8 @@ public static final boolean gtk_expander_get_expanded(int /*long*/ expander) {
}
}
/** @method flags=dynamic */
@@ -21246,7 +21269,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_expander_get_label_widget(expander);
-@@ -7146,8 +7146,8 @@ public static final int /*long*/ gtk_expander_get_label_widget(int /*long*/ expa
+@@ -7168,8 +7168,8 @@ public static final int /*long*/ gtk_expander_get_label_widget(int /*long*/ expa
* @method flags=dynamic
* @param label cast=(const gchar *)
*/
@@ -21257,7 +21280,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_expander_new(label);
-@@ -7156,8 +7156,8 @@ public static final int /*long*/ gtk_expander_new(byte[] label) {
+@@ -7178,8 +7178,8 @@ public static final int /*long*/ gtk_expander_new(byte[] label) {
}
}
/** @method flags=dynamic */
@@ -21268,7 +21291,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_expander_set_expanded(expander, expanded);
-@@ -7169,8 +7169,8 @@ public static final void gtk_expander_set_expanded(int /*long*/ expander, boolea
+@@ -7191,8 +7191,8 @@ public static final void gtk_expander_set_expanded(int /*long*/ expander, boolea
* @method flags=dynamic
* @param label cast=(const gchar *)
*/
@@ -21279,7 +21302,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_expander_set_label(expander, label);
-@@ -7179,8 +7179,8 @@ public static final void gtk_expander_set_label(int /*long*/ expander, byte[] la
+@@ -7201,8 +7201,8 @@ public static final void gtk_expander_set_label(int /*long*/ expander, byte[] la
}
}
/** @method flags=dynamic */
@@ -21290,7 +21313,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_expander_set_label_widget(expander, label_widget);
-@@ -7189,8 +7189,8 @@ public static final void gtk_expander_set_label_widget(int /*long*/ expander, i
+@@ -7211,8 +7211,8 @@ public static final void gtk_expander_set_label_widget(int /*long*/ expander, i
}
}
/** @method flags=dynamic */
@@ -21301,7 +21324,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_file_chooser_add_filter(chooser, filter);
-@@ -7199,8 +7199,8 @@ public static final void gtk_file_chooser_add_filter(int /*long*/ chooser, int /
+@@ -7221,8 +7221,8 @@ public static final void gtk_file_chooser_add_filter(int /*long*/ chooser, int /
}
}
/** @method flags=no_gen */
@@ -21312,7 +21335,7 @@ index ea39bc8..d687398 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);
-@@ -7209,8 +7209,8 @@ public static final int /*long*/ gtk_file_chooser_dialog_new(byte[] title, int /
+@@ -7231,8 +7231,8 @@ public static final int /*long*/ gtk_file_chooser_dialog_new(byte[] title, int /
}
}
/** @method flags=dynamic */
@@ -21323,7 +21346,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_file_chooser_get_current_folder(chooser);
-@@ -7219,8 +7219,8 @@ public static final int /*long*/ gtk_file_chooser_get_current_folder(int /*long*
+@@ -7241,8 +7241,8 @@ public static final int /*long*/ gtk_file_chooser_get_current_folder(int /*long*
}
}
/** @method flags=dynamic */
@@ -21334,7 +21357,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_file_chooser_get_filename(chooser);
-@@ -7229,8 +7229,8 @@ public static final int /*long*/ gtk_file_chooser_get_filename(int /*long*/ choo
+@@ -7251,8 +7251,8 @@ public static final int /*long*/ gtk_file_chooser_get_filename(int /*long*/ choo
}
}
/** @method flags=dynamic */
@@ -21345,7 +21368,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_file_chooser_get_filenames(chooser);
-@@ -7239,8 +7239,8 @@ public static final int /*long*/ gtk_file_chooser_get_filenames(int /*long*/ cho
+@@ -7261,8 +7261,8 @@ public static final int /*long*/ gtk_file_chooser_get_filenames(int /*long*/ cho
}
}
/** @method flags=dynamic */
@@ -21356,7 +21379,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_file_chooser_get_uri(chooser);
-@@ -7249,8 +7249,8 @@ public static final int /*long*/ gtk_file_chooser_get_uri(int /*long*/ chooser)
+@@ -7271,8 +7271,8 @@ public static final int /*long*/ gtk_file_chooser_get_uri(int /*long*/ chooser)
}
}
/** @method flags=dynamic */
@@ -21367,7 +21390,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_file_chooser_get_uris(chooser);
-@@ -7259,8 +7259,8 @@ public static final int /*long*/ gtk_file_chooser_get_uris(int /*long*/ chooser)
+@@ -7281,8 +7281,8 @@ public static final int /*long*/ gtk_file_chooser_get_uris(int /*long*/ chooser)
}
}
/** @method flags=dynamic */
@@ -21378,7 +21401,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_file_chooser_get_filter(chooser);
-@@ -7269,8 +7269,8 @@ public static final int /*long*/ gtk_file_chooser_get_filter(int /*long*/ choose
+@@ -7291,8 +7291,8 @@ public static final int /*long*/ gtk_file_chooser_get_filter(int /*long*/ choose
}
}
/** @method flags=dynamic */
@@ -21389,7 +21412,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_file_chooser_set_current_folder(chooser, filename);
-@@ -7279,8 +7279,8 @@ public static final void gtk_file_chooser_set_current_folder(int /*long*/ choose
+@@ -7301,8 +7301,8 @@ public static final void gtk_file_chooser_set_current_folder(int /*long*/ choose
}
}
/** @method flags=dynamic */
@@ -21400,7 +21423,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_file_chooser_set_current_folder_uri(chooser, uri);
-@@ -7289,8 +7289,8 @@ public static final void gtk_file_chooser_set_current_folder_uri(int /*long*/ ch
+@@ -7311,8 +7311,8 @@ public static final void gtk_file_chooser_set_current_folder_uri(int /*long*/ ch
}
}
/** @method flags=dynamic */
@@ -21411,7 +21434,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_file_chooser_set_current_name(chooser, name);
-@@ -7299,8 +7299,8 @@ public static final void gtk_file_chooser_set_current_name(int /*long*/ chooser,
+@@ -7321,8 +7321,8 @@ public static final void gtk_file_chooser_set_current_name(int /*long*/ chooser,
}
}
/** @method flags=dynamic */
@@ -21422,7 +21445,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_file_chooser_set_local_only(chooser, local_only);
-@@ -7309,8 +7309,8 @@ public static final void gtk_file_chooser_set_local_only(int /*long*/ chooser, b
+@@ -7331,8 +7331,8 @@ public static final void gtk_file_chooser_set_local_only(int /*long*/ chooser, b
}
}
/** @method flags=dynamic */
@@ -21433,7 +21456,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_file_chooser_set_do_overwrite_confirmation(chooser, do_overwrite_confirmation);
-@@ -7319,8 +7319,8 @@ public static final void gtk_file_chooser_set_do_overwrite_confirmation(int /*lo
+@@ -7341,8 +7341,8 @@ public static final void gtk_file_chooser_set_do_overwrite_confirmation(int /*lo
}
}
/** @method flags=dynamic */
@@ -21444,7 +21467,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_file_chooser_set_extra_widget(chooser, extra_widget);
-@@ -7329,8 +7329,8 @@ public static final void gtk_file_chooser_set_extra_widget(int /*long*/ chooser,
+@@ -7351,8 +7351,8 @@ public static final void gtk_file_chooser_set_extra_widget(int /*long*/ chooser,
}
}
/** @method flags=dynamic */
@@ -21455,7 +21478,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_file_chooser_set_filename(chooser, name);
-@@ -7339,8 +7339,8 @@ public static final void gtk_file_chooser_set_filename(int /*long*/ chooser, int
+@@ -7361,8 +7361,8 @@ public static final void gtk_file_chooser_set_filename(int /*long*/ chooser, int
}
}
/** @method flags=dynamic */
@@ -21466,7 +21489,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_file_chooser_set_filter(chooser, filter);
-@@ -7349,8 +7349,8 @@ public static final void gtk_file_chooser_set_filter(int /*long*/ chooser, int /
+@@ -7371,8 +7371,8 @@ public static final void gtk_file_chooser_set_filter(int /*long*/ chooser, int /
}
}
/** @method flags=dynamic */
@@ -21477,7 +21500,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_file_chooser_set_uri(chooser, uri);
-@@ -7359,8 +7359,8 @@ public static final void gtk_file_chooser_set_uri(int /*long*/ chooser, byte []
+@@ -7381,8 +7381,8 @@ public static final void gtk_file_chooser_set_uri(int /*long*/ chooser, byte []
}
}
/** @method flags=dynamic */
@@ -21488,7 +21511,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_file_chooser_set_select_multiple(chooser, select_multiple);
-@@ -7369,8 +7369,8 @@ public static final void gtk_file_chooser_set_select_multiple(int /*long*/ choos
+@@ -7391,8 +7391,8 @@ public static final void gtk_file_chooser_set_select_multiple(int /*long*/ choos
}
}
/** @method flags=dynamic */
@@ -21499,7 +21522,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_file_filter_add_pattern(filter, pattern);
-@@ -7379,8 +7379,8 @@ public static final void gtk_file_filter_add_pattern(int /*long*/ filter, byte[]
+@@ -7401,8 +7401,8 @@ public static final void gtk_file_filter_add_pattern(int /*long*/ filter, byte[]
}
}
/** @method flags=dynamic */
@@ -21510,7 +21533,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_file_filter_new();
-@@ -7389,8 +7389,8 @@ public static final int /*long*/ gtk_file_filter_new() {
+@@ -7411,8 +7411,8 @@ public static final int /*long*/ gtk_file_filter_new() {
}
}
/** @method flags=dynamic */
@@ -21521,7 +21544,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_file_filter_get_name(filter);
-@@ -7399,8 +7399,8 @@ public static final int /*long*/ gtk_file_filter_get_name(int /*long*/ filter) {
+@@ -7421,8 +7421,8 @@ public static final int /*long*/ gtk_file_filter_get_name(int /*long*/ filter) {
}
}
/** @method flags=dynamic */
@@ -21532,7 +21555,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_file_filter_set_name(filter, name);
-@@ -7414,8 +7414,8 @@ public static final void gtk_file_filter_set_name(int /*long*/ filter, byte[] na
+@@ -7436,8 +7436,8 @@ public static final void gtk_file_filter_set_name(int /*long*/ filter, byte[] na
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -21543,7 +21566,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_fixed_move(fixed, widget, x, y);
-@@ -7423,8 +7423,8 @@ public static final void gtk_fixed_move(int /*long*/ fixed, int /*long*/ widget,
+@@ -7445,8 +7445,8 @@ public static final void gtk_fixed_move(int /*long*/ fixed, int /*long*/ widget,
lock.unlock();
}
}
@@ -21554,7 +21577,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_fixed_new();
-@@ -7436,8 +7436,8 @@ public static final int /*long*/ gtk_fixed_new() {
+@@ -7458,8 +7458,8 @@ public static final int /*long*/ gtk_fixed_new() {
* @param fixed cast=(GtkFixed *)
* @param has_window cast=(gboolean)
*/
@@ -21565,7 +21588,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_fixed_set_has_window(fixed, has_window);
-@@ -7446,8 +7446,8 @@ public static final void gtk_fixed_set_has_window(int /*long*/ fixed, boolean ha
+@@ -7468,8 +7468,8 @@ public static final void gtk_fixed_set_has_window(int /*long*/ fixed, boolean ha
}
}
/** @param fsd cast=(GtkFontSelectionDialog *) */
@@ -21576,7 +21599,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_font_selection_dialog_get_font_name(fsd);
-@@ -7456,8 +7456,8 @@ public static final int /*long*/ gtk_font_selection_dialog_get_font_name(int /*l
+@@ -7478,8 +7478,8 @@ public static final int /*long*/ gtk_font_selection_dialog_get_font_name(int /*l
}
}
/** @param title cast=(const gchar *) */
@@ -21587,7 +21610,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_font_selection_dialog_new(title);
-@@ -7469,8 +7469,8 @@ public static final int /*long*/ gtk_font_selection_dialog_new(byte[] title) {
+@@ -7491,8 +7491,8 @@ public static final int /*long*/ gtk_font_selection_dialog_new(byte[] title) {
* @param fsd cast=(GtkFontSelectionDialog *)
* @param fontname cast=(const gchar *)
*/
@@ -21598,7 +21621,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_font_selection_dialog_set_font_name(fsd, fontname);
-@@ -7479,8 +7479,8 @@ public static final boolean gtk_font_selection_dialog_set_font_name(int /*long*/
+@@ -7501,8 +7501,8 @@ public static final boolean gtk_font_selection_dialog_set_font_name(int /*long*/
}
}
/** @param label cast=(const gchar *) */
@@ -21609,7 +21632,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_frame_new(label);
-@@ -7489,8 +7489,8 @@ public static final int /*long*/ gtk_frame_new(byte[] label) {
+@@ -7511,8 +7511,8 @@ public static final int /*long*/ gtk_frame_new(byte[] label) {
}
}
/** @param frame cast=(GtkFrame *) */
@@ -21620,7 +21643,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_frame_get_label_widget(frame);
-@@ -7502,8 +7502,8 @@ public static final int /*long*/ gtk_frame_get_label_widget(int /*long*/ frame)
+@@ -7524,8 +7524,8 @@ public static final int /*long*/ gtk_frame_get_label_widget(int /*long*/ frame)
* @param frame cast=(GtkFrame *)
* @param label cast=(const gchar *)
*/
@@ -21631,7 +21654,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_frame_set_label(frame, label);
-@@ -7515,8 +7515,8 @@ public static final void gtk_frame_set_label(int /*long*/ frame, byte[] label) {
+@@ -7537,8 +7537,8 @@ public static final void gtk_frame_set_label(int /*long*/ frame, byte[] label) {
* @param frame cast=(GtkFrame *)
* @param label_widget cast=(GtkWidget *)
*/
@@ -21642,7 +21665,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_frame_set_label_widget(frame, label_widget);
-@@ -7528,8 +7528,8 @@ public static final void gtk_frame_set_label_widget(int /*long*/ frame, int /*lo
+@@ -7550,8 +7550,8 @@ public static final void gtk_frame_set_label_widget(int /*long*/ frame, int /*lo
* @param frame cast=(GtkFrame *)
* @param type cast=(GtkShadowType)
*/
@@ -21653,7 +21676,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_frame_set_shadow_type(frame, type);
-@@ -7537,8 +7537,8 @@ public static final void gtk_frame_set_shadow_type(int /*long*/ frame, int type)
+@@ -7559,8 +7559,8 @@ public static final void gtk_frame_set_shadow_type(int /*long*/ frame, int type)
lock.unlock();
}
}
@@ -21664,7 +21687,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_get_current_event();
-@@ -7565,8 +7565,8 @@ public static final int gtk_get_current_event_time() {
+@@ -7587,8 +7587,8 @@ public static final int gtk_get_current_event_time() {
lock.unlock();
}
}
@@ -21675,7 +21698,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_get_default_language();
-@@ -7575,8 +7575,8 @@ public static final int /*long*/ gtk_get_default_language() {
+@@ -7597,8 +7597,8 @@ public static final int /*long*/ gtk_get_default_language() {
}
}
/** @param event cast=(GdkEvent *) */
@@ -21686,7 +21709,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_get_event_widget(event);
-@@ -7585,8 +7585,8 @@ public static final int /*long*/ gtk_get_event_widget(int /*long*/ event) {
+@@ -7607,8 +7607,8 @@ public static final int /*long*/ gtk_get_event_widget(int /*long*/ event) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -21697,7 +21720,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_grab_add(widget);
-@@ -7594,8 +7594,8 @@ public static final void gtk_grab_add(int /*long*/ widget) {
+@@ -7616,8 +7616,8 @@ public static final void gtk_grab_add(int /*long*/ widget) {
lock.unlock();
}
}
@@ -21708,7 +21731,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_grab_get_current();
-@@ -7604,8 +7604,8 @@ public static final int /*long*/ gtk_grab_get_current() {
+@@ -7626,8 +7626,8 @@ public static final int /*long*/ gtk_grab_get_current() {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -21719,7 +21742,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_grab_remove(widget);
-@@ -7617,8 +7617,8 @@ public static final void gtk_grab_remove(int /*long*/ widget) {
+@@ -7639,8 +7639,8 @@ public static final void gtk_grab_remove(int /*long*/ widget) {
* @param homogeneous cast=(gboolean)
* @param spacing cast=(gint)
*/
@@ -21730,7 +21753,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_hbox_new(homogeneous, spacing);
-@@ -7627,8 +7627,8 @@ public static final int /*long*/ gtk_hbox_new(boolean homogeneous, int spacing)
+@@ -7649,8 +7649,8 @@ public static final int /*long*/ gtk_hbox_new(boolean homogeneous, int spacing)
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -21741,7 +21764,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_hscale_new(adjustment);
-@@ -7637,8 +7637,8 @@ public static final int /*long*/ gtk_hscale_new(int /*long*/ adjustment) {
+@@ -7659,8 +7659,8 @@ public static final int /*long*/ gtk_hscale_new(int /*long*/ adjustment) {
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -21752,7 +21775,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_hscrollbar_new(adjustment);
-@@ -7646,8 +7646,8 @@ public static final int /*long*/ gtk_hscrollbar_new(int /*long*/ adjustment) {
+@@ -7668,8 +7668,8 @@ public static final int /*long*/ gtk_hscrollbar_new(int /*long*/ adjustment) {
lock.unlock();
}
}
@@ -21763,7 +21786,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_hseparator_new();
-@@ -7655,8 +7655,8 @@ public static final int /*long*/ gtk_hseparator_new() {
+@@ -7677,8 +7677,8 @@ public static final int /*long*/ gtk_hseparator_new() {
lock.unlock();
}
}
@@ -21774,7 +21797,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_status_icon_position_menu_func();
-@@ -7667,8 +7667,8 @@ public static final int /*long*/ gtk_status_icon_position_menu_func() {
+@@ -7689,8 +7689,8 @@ public static final int /*long*/ gtk_status_icon_position_menu_func() {
/**
* @method flags=dynamic
*/
@@ -21785,7 +21808,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_icon_info_free(icon_info);
-@@ -7677,8 +7677,8 @@ public static final void gtk_icon_info_free(int /*long*/ icon_info) {
+@@ -7699,8 +7699,8 @@ public static final void gtk_icon_info_free(int /*long*/ icon_info) {
}
}
/** @param stock_id cast=(const gchar *) */
@@ -21796,7 +21819,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_icon_factory_lookup_default(stock_id);
-@@ -7687,8 +7687,8 @@ public static final int /*long*/ gtk_icon_factory_lookup_default(byte[] stock_id
+@@ -7709,8 +7709,8 @@ public static final int /*long*/ gtk_icon_factory_lookup_default(byte[] stock_id
}
}
/** @param source cast=(GtkIconSource *) */
@@ -21807,7 +21830,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_icon_source_free(source);
-@@ -7696,8 +7696,8 @@ public static final void gtk_icon_source_free(int /*long*/ source) {
+@@ -7718,8 +7718,8 @@ public static final void gtk_icon_source_free(int /*long*/ source) {
lock.unlock();
}
}
@@ -21818,7 +21841,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_icon_source_new();
-@@ -7709,8 +7709,8 @@ public static final int /*long*/ gtk_icon_source_new() {
+@@ -7731,8 +7731,8 @@ public static final int /*long*/ gtk_icon_source_new() {
* @param source cast=(GtkIconSource *)
* @param pixbuf cast=(GdkPixbuf *)
*/
@@ -21829,7 +21852,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_icon_source_set_pixbuf(source, pixbuf);
-@@ -7727,8 +7727,8 @@ public static final void gtk_icon_source_set_pixbuf(int /*long*/ source, int /*l
+@@ -7749,8 +7749,8 @@ public static final void gtk_icon_source_set_pixbuf(int /*long*/ source, int /*l
* @param widget cast=(GtkWidget *)
* @param detail cast=(const char *)
*/
@@ -21840,7 +21863,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_icon_set_render_icon(icon_set, style, direction, state, size, widget, detail);
-@@ -7739,8 +7739,8 @@ public static final int /*long*/ gtk_icon_set_render_icon(int /*long*/ icon_set,
+@@ -7761,8 +7761,8 @@ public static final int /*long*/ gtk_icon_set_render_icon(int /*long*/ icon_set,
/**
* @method flags=dynamic
*/
@@ -21851,7 +21874,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_icon_theme_get_default ();
-@@ -7751,8 +7751,8 @@ public static final int /*long*/ gtk_icon_theme_get_default() {
+@@ -7773,8 +7773,8 @@ public static final int /*long*/ gtk_icon_theme_get_default() {
/**
* @method flags=dynamic
*/
@@ -21862,7 +21885,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_icon_theme_lookup_by_gicon (icon_theme, icon, size, flags);
-@@ -7763,8 +7763,8 @@ public static final int /*long*/ gtk_icon_theme_lookup_by_gicon(int /*long*/ ico
+@@ -7785,8 +7785,8 @@ public static final int /*long*/ gtk_icon_theme_lookup_by_gicon(int /*long*/ ico
/**
* @method flags=dynamic
*/
@@ -21873,7 +21896,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_icon_info_load_icon(icon_info, error);
-@@ -7776,8 +7776,8 @@ public static final int /*long*/ gtk_icon_info_load_icon(int /*long*/ icon_info,
+@@ -7798,8 +7798,8 @@ public static final int /*long*/ gtk_icon_info_load_icon(int /*long*/ icon_info,
* @param context cast=(GtkIMContext *)
* @param event cast=(GdkEventKey *)
*/
@@ -21884,7 +21907,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_im_context_filter_keypress(context, event);
-@@ -7786,8 +7786,8 @@ public static final boolean gtk_im_context_filter_keypress(int /*long*/ context,
+@@ -7808,8 +7808,8 @@ public static final boolean gtk_im_context_filter_keypress(int /*long*/ context,
}
}
/** @param context cast=(GtkIMContext *) */
@@ -21895,7 +21918,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_im_context_focus_in(context);
-@@ -7796,8 +7796,8 @@ public static final void gtk_im_context_focus_in(int /*long*/ context) {
+@@ -7818,8 +7818,8 @@ public static final void gtk_im_context_focus_in(int /*long*/ context) {
}
}
/** @param context cast=(GtkIMContext *) */
@@ -21906,7 +21929,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_im_context_focus_out(context);
-@@ -7811,8 +7811,8 @@ public static final void gtk_im_context_focus_out(int /*long*/ context) {
+@@ -7833,8 +7833,8 @@ public static final void gtk_im_context_focus_out(int /*long*/ context) {
* @param attrs cast=(PangoAttrList **)
* @param cursor_pos cast=(gint *)
*/
@@ -21917,7 +21940,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_im_context_get_preedit_string(context, str, attrs, cursor_pos);
-@@ -7820,8 +7820,8 @@ public static final void gtk_im_context_get_preedit_string(int /*long*/ context,
+@@ -7842,8 +7842,8 @@ public static final void gtk_im_context_get_preedit_string(int /*long*/ context,
lock.unlock();
}
}
@@ -21928,7 +21951,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_im_context_get_type();
-@@ -7830,8 +7830,8 @@ public static final int /*long*/ gtk_im_context_get_type() {
+@@ -7852,8 +7852,8 @@ public static final int /*long*/ gtk_im_context_get_type() {
}
}
/** @param context cast=(GtkIMContext *) */
@@ -21939,7 +21962,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_im_context_reset(context);
-@@ -7843,8 +7843,8 @@ public static final void gtk_im_context_reset(int /*long*/ context) {
+@@ -7865,8 +7865,8 @@ public static final void gtk_im_context_reset(int /*long*/ context) {
* @param context cast=(GtkIMContext *)
* @param window cast=(GdkWindow *)
*/
@@ -21950,7 +21973,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_im_context_set_client_window(context, window);
-@@ -7856,8 +7856,8 @@ public static final void gtk_im_context_set_client_window(int /*long*/ context,
+@@ -7878,8 +7878,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
*/
@@ -21961,7 +21984,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_im_context_set_cursor_location(context, area);
-@@ -7869,8 +7869,8 @@ public static final void gtk_im_context_set_cursor_location(int /*long*/ context
+@@ -7891,8 +7891,8 @@ public static final void gtk_im_context_set_cursor_location(int /*long*/ context
* @param context cast=(GtkIMMulticontext *)
* @param menushell cast=(GtkMenuShell *)
*/
@@ -21972,7 +21995,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_im_multicontext_append_menuitems(context, menushell);
-@@ -7878,8 +7878,8 @@ public static final void gtk_im_multicontext_append_menuitems (int /*long*/ cont
+@@ -7900,8 +7900,8 @@ public static final void gtk_im_multicontext_append_menuitems (int /*long*/ cont
lock.unlock();
}
}
@@ -21983,7 +22006,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_im_multicontext_new();
-@@ -7888,8 +7888,8 @@ public static final int /*long*/ gtk_im_multicontext_new() {
+@@ -7910,8 +7910,8 @@ public static final int /*long*/ gtk_im_multicontext_new() {
}
}
/** @param label cast=(const gchar *) */
@@ -21994,7 +22017,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_image_menu_item_new_with_label(label);
-@@ -7901,8 +7901,8 @@ public static final int /*long*/ gtk_image_menu_item_new_with_label(byte[] label
+@@ -7923,8 +7923,8 @@ public static final int /*long*/ gtk_image_menu_item_new_with_label(byte[] label
* @param menu_item cast=(GtkImageMenuItem *)
* @param image cast=(GtkWidget *)
*/
@@ -22005,7 +22028,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_image_menu_item_set_image(menu_item, image);
-@@ -7910,8 +7910,8 @@ public static final void gtk_image_menu_item_set_image(int /*long*/ menu_item, i
+@@ -7932,8 +7932,8 @@ public static final void gtk_image_menu_item_set_image(int /*long*/ menu_item, i
lock.unlock();
}
}
@@ -22016,7 +22039,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_image_new();
-@@ -7920,8 +7920,8 @@ public static final int /*long*/ gtk_image_new() {
+@@ -7942,8 +7942,8 @@ public static final int /*long*/ gtk_image_new() {
}
}
/** @param pixbuf cast=(GdkPixbuf *) */
@@ -22027,7 +22050,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_image_new_from_pixbuf(pixbuf);
-@@ -7933,8 +7933,8 @@ public static final int /*long*/ gtk_image_new_from_pixbuf(int /*long*/ pixbuf)
+@@ -7955,8 +7955,8 @@ public static final int /*long*/ gtk_image_new_from_pixbuf(int /*long*/ pixbuf)
* @param pixmap cast=(GdkPixmap *)
* @param mask cast=(GdkBitmap *)
*/
@@ -22038,7 +22061,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_image_new_from_pixmap(pixmap, mask);
-@@ -7946,8 +7946,8 @@ public static final int /*long*/ gtk_image_new_from_pixmap(int /*long*/ pixmap,
+@@ -7968,8 +7968,8 @@ public static final int /*long*/ gtk_image_new_from_pixmap(int /*long*/ pixmap,
* @param image cast=(GtkImage *)
* @param pixbuf cast=(GdkPixbuf *)
*/
@@ -22049,7 +22072,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_image_set_from_pixbuf(image, pixbuf);
-@@ -7960,8 +7960,8 @@ public static final void gtk_image_set_from_pixbuf(int /*long*/ image, int /*lon
+@@ -7982,8 +7982,8 @@ public static final void gtk_image_set_from_pixbuf(int /*long*/ image, int /*lon
* @param pixmap cast=(GdkBitmap *)
* @param mask cast=(GdkBitmap *)
*/
@@ -22060,7 +22083,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_image_set_from_pixmap(image, pixmap, mask);
-@@ -7973,8 +7973,8 @@ public static final void gtk_image_set_from_pixmap(int /*long*/ image, int /*lon
+@@ -7995,8 +7995,8 @@ public static final void gtk_image_set_from_pixmap(int /*long*/ image, int /*lon
* @param argc cast=(int *)
* @param argv cast=(char ***)
*/
@@ -22071,7 +22094,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_init_check(argc, argv);
-@@ -7983,8 +7983,8 @@ public static final boolean gtk_init_check(int /*long*/[] argc, int /*long*/[] a
+@@ -8005,8 +8005,8 @@ public static final boolean gtk_init_check(int /*long*/[] argc, int /*long*/[] a
}
}
/** @param label cast=(GtkLabel *) */
@@ -22082,7 +22105,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_label_get_layout(label);
-@@ -7993,8 +7993,8 @@ public static final int /*long*/ gtk_label_get_layout(int /*long*/ label) {
+@@ -8015,8 +8015,8 @@ public static final int /*long*/ gtk_label_get_layout(int /*long*/ label) {
}
}
/** @param label cast=(GtkLabel *) */
@@ -22093,7 +22116,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_label_get_mnemonic_keyval(label);
-@@ -8003,8 +8003,8 @@ public static final int gtk_label_get_mnemonic_keyval(int /*long*/ label) {
+@@ -8025,8 +8025,8 @@ public static final int gtk_label_get_mnemonic_keyval(int /*long*/ label) {
}
}
/** @param label cast=(const gchar *) */
@@ -22104,7 +22127,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_label_new(label);
-@@ -8013,8 +8013,8 @@ public static final int /*long*/ gtk_label_new(byte[] label) {
+@@ -8035,8 +8035,8 @@ public static final int /*long*/ gtk_label_new(byte[] label) {
}
}
/** @param str cast=(const gchar *) */
@@ -22115,7 +22138,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_label_new_with_mnemonic(str);
-@@ -8026,8 +8026,8 @@ public static final int /*long*/ gtk_label_new_with_mnemonic(byte[] str) {
+@@ -8048,8 +8048,8 @@ public static final int /*long*/ gtk_label_new_with_mnemonic(byte[] str) {
* @param label cast=(GtkLabel *)
* @param attrs cast=(PangoAttrList *)
*/
@@ -22126,7 +22149,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_label_set_attributes(label, attrs);
-@@ -8039,8 +8039,8 @@ public static final void gtk_label_set_attributes(int /*long*/ label, int /*long
+@@ -8061,8 +8061,8 @@ public static final void gtk_label_set_attributes(int /*long*/ label, int /*long
* @param label cast=(GtkLabel *)
* @param jtype cast=(GtkJustification)
*/
@@ -22137,7 +22160,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_label_set_justify(label, jtype);
-@@ -8052,8 +8052,8 @@ public static final void gtk_label_set_justify(int /*long*/ label, int jtype) {
+@@ -8074,8 +8074,8 @@ public static final void gtk_label_set_justify(int /*long*/ label, int jtype) {
* @param label cast=(GtkLabel *)
* @param wrap cast=(gboolean)
*/
@@ -22148,7 +22171,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_label_set_line_wrap(label, wrap);
-@@ -8062,8 +8062,8 @@ public static final void gtk_label_set_line_wrap(int /*long*/ label, boolean wra
+@@ -8084,8 +8084,8 @@ public static final void gtk_label_set_line_wrap(int /*long*/ label, boolean wra
}
}
/** @method flags=dynamic */
@@ -22159,7 +22182,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_label_set_line_wrap_mode(label, wrap_mode);
-@@ -8075,8 +8075,8 @@ public static final void gtk_label_set_line_wrap_mode(int /*long*/ label, int wr
+@@ -8097,8 +8097,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 *)
*/
@@ -22170,7 +22193,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_label_set_text(label, str);
-@@ -8088,8 +8088,8 @@ public static final void gtk_label_set_text(int /*long*/ label, int /*long*/ str
+@@ -8110,8 +8110,8 @@ public static final void gtk_label_set_text(int /*long*/ label, int /*long*/ str
* @param label cast=(GtkLabel *)
* @param str cast=(const gchar *)
*/
@@ -22181,7 +22204,7 @@ index ea39bc8..d687398 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, byte[] str) {
+@@ -8123,8 +8123,8 @@ public static final void gtk_label_set_text(int /*long*/ label, byte[] str) {
* @param label cast=(GtkLabel *)
* @param str cast=(const gchar *)
*/
@@ -22192,7 +22215,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_label_set_text_with_mnemonic(label, str);
-@@ -8114,8 +8114,8 @@ public static final void gtk_label_set_text_with_mnemonic(int /*long*/ label, by
+@@ -8136,8 +8136,8 @@ public static final void gtk_label_set_text_with_mnemonic(int /*long*/ label, by
* @param list_store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -22203,7 +22226,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_list_store_append(list_store, iter);
-@@ -8124,8 +8124,8 @@ public static final void gtk_list_store_append(int /*long*/ list_store, int /*lo
+@@ -8146,8 +8146,8 @@ public static final void gtk_list_store_append(int /*long*/ list_store, int /*lo
}
}
/** @param store cast=(GtkListStore *) */
@@ -22214,7 +22237,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_list_store_clear(store);
-@@ -8138,8 +8138,8 @@ public static final void gtk_list_store_clear(int /*long*/ store) {
+@@ -8160,8 +8160,8 @@ public static final void gtk_list_store_clear(int /*long*/ store) {
* @param iter cast=(GtkTreeIter *)
* @param position cast=(gint)
*/
@@ -22225,7 +22248,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_list_store_insert(list_store, iter, position);
-@@ -8151,8 +8151,8 @@ public static final void gtk_list_store_insert(int /*long*/ list_store, int /*lo
+@@ -8173,8 +8173,8 @@ public static final void gtk_list_store_insert(int /*long*/ list_store, int /*lo
* @param numColumns cast=(gint)
* @param types cast=(GType *)
*/
@@ -22236,7 +22259,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_list_store_newv(numColumns, types);
-@@ -8164,8 +8164,8 @@ public static final int /*long*/ gtk_list_store_newv(int numColumns, int /*long*
+@@ -8186,8 +8186,8 @@ public static final int /*long*/ gtk_list_store_newv(int numColumns, int /*long*
* @param list_store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -22247,7 +22270,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_list_store_remove(list_store, iter);
-@@ -8177,8 +8177,8 @@ public static final void gtk_list_store_remove(int /*long*/ list_store, int /*lo
+@@ -8199,8 +8199,8 @@ public static final void gtk_list_store_remove(int /*long*/ list_store, int /*lo
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -22258,7 +22281,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -8190,8 +8190,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
+@@ -8212,8 +8212,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -22269,7 +22292,7 @@ index ea39bc8..d687398 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
+@@ -8225,8 +8225,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -22280,7 +22303,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -8217,8 +8217,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
+@@ -8239,8 +8239,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
* @param iter cast=(GtkTreeIter *)
* @param value flags=no_out
*/
@@ -22291,7 +22314,7 @@ index ea39bc8..d687398 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
+@@ -8252,8 +8252,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -22302,7 +22325,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -8288,8 +8288,8 @@ public static final int gtk_main_iteration() {
+@@ -8310,8 +8310,8 @@ public static final int gtk_main_iteration() {
}
}
/** @param event cast=(GdkEvent *) */
@@ -22313,7 +22336,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_main_do_event(event);
-@@ -8297,8 +8297,8 @@ public static final void gtk_main_do_event(int /*long*/ event) {
+@@ -8319,8 +8319,8 @@ public static final void gtk_main_do_event(int /*long*/ event) {
lock.unlock();
}
}
@@ -22324,7 +22347,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_menu_bar_new();
-@@ -8307,8 +8307,8 @@ public static final int /*long*/ gtk_menu_bar_new() {
+@@ -8329,8 +8329,8 @@ public static final int /*long*/ gtk_menu_bar_new() {
}
}
/** @param menu cast=(GtkMenu *) */
@@ -22335,7 +22358,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_menu_get_attach_widget(menu);
-@@ -8320,8 +8320,8 @@ public static final int /*long*/ gtk_menu_get_attach_widget(int /*long*/ menu) {
+@@ -8342,8 +8342,8 @@ public static final int /*long*/ gtk_menu_get_attach_widget(int /*long*/ menu) {
* @method flags=dynamic
* @param menu_item cast=(GtkMenuItem *)
*/
@@ -22346,7 +22369,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_menu_item_remove_submenu(menu_item);
-@@ -8330,8 +8330,8 @@ public static final void gtk_menu_item_remove_submenu(int /*long*/ menu_item) {
+@@ -8352,8 +8352,8 @@ public static final void gtk_menu_item_remove_submenu(int /*long*/ menu_item) {
}
}
/** @param menu_item cast=(GtkMenuItem *) */
@@ -22357,7 +22380,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_menu_item_get_submenu(menu_item);
-@@ -8343,8 +8343,8 @@ public static final int /*long*/ gtk_menu_item_get_submenu(int /*long*/ menu_ite
+@@ -8365,8 +8365,8 @@ public static final int /*long*/ gtk_menu_item_get_submenu(int /*long*/ menu_ite
* @param menu_item cast=(GtkMenuItem *)
* @param submenu cast=(GtkWidget *)
*/
@@ -22368,7 +22391,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_menu_item_set_submenu(menu_item, submenu);
-@@ -8352,8 +8352,8 @@ public static final void gtk_menu_item_set_submenu(int /*long*/ menu_item, int /
+@@ -8374,8 +8374,8 @@ public static final void gtk_menu_item_set_submenu(int /*long*/ menu_item, int /
lock.unlock();
}
}
@@ -22379,7 +22402,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_menu_new();
-@@ -8362,8 +8362,8 @@ public static final int /*long*/ gtk_menu_new() {
+@@ -8384,8 +8384,8 @@ public static final int /*long*/ gtk_menu_new() {
}
}
/** @param menu cast=(GtkMenu *) */
@@ -22390,7 +22413,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_menu_popdown(menu);
-@@ -8380,8 +8380,8 @@ public static final void gtk_menu_popdown(int /*long*/ menu) {
+@@ -8402,8 +8402,8 @@ public static final void gtk_menu_popdown(int /*long*/ menu) {
* @param button cast=(guint)
* @param activate_time cast=(guint32)
*/
@@ -22401,7 +22424,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_menu_popup(menu, parent_menu_shell, parent_menu_item, func, data, button, activate_time);
-@@ -8390,8 +8390,8 @@ public static final void gtk_menu_popup(int /*long*/ menu, int /*long*/ parent_m
+@@ -8412,8 +8412,8 @@ public static final void gtk_menu_popup(int /*long*/ menu, int /*long*/ parent_m
}
}
/** @param menu_shell cast=(GtkMenuShell *) */
@@ -22412,7 +22435,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_menu_shell_deactivate(menu_shell);
-@@ -8404,8 +8404,8 @@ public static final void gtk_menu_shell_deactivate(int /*long*/ menu_shell) {
+@@ -8426,8 +8426,8 @@ public static final void gtk_menu_shell_deactivate(int /*long*/ menu_shell) {
* @param child cast=(GtkWidget *)
* @param position cast=(gint)
*/
@@ -22423,7 +22446,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_menu_shell_insert(menu_shell, child, position);
-@@ -8417,8 +8417,8 @@ public static final void gtk_menu_shell_insert(int /*long*/ menu_shell, int /*lo
+@@ -8439,8 +8439,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 *)
*/
@@ -22434,7 +22457,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_menu_shell_select_item(menu_shell, menu_item);
-@@ -8431,8 +8431,8 @@ public static final void gtk_menu_shell_select_item(int /*long*/ menu_shell, int
+@@ -8453,8 +8453,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)
*/
@@ -22445,7 +22468,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_menu_shell_set_take_focus(menu_shell, take_focus);
-@@ -8441,8 +8441,8 @@ public static final void gtk_menu_shell_set_take_focus(int /*long*/ menu_shell,
+@@ -8463,8 +8463,8 @@ public static final void gtk_menu_shell_set_take_focus(int /*long*/ menu_shell,
}
}
/** @method flags=dynamic */
@@ -22456,7 +22479,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_menu_tool_button_new(icon_widget, label);
-@@ -8457,8 +8457,8 @@ public static final int /*long*/ gtk_menu_tool_button_new(int /*long*/ icon_widg
+@@ -8479,8 +8479,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 *)
*/
@@ -22467,7 +22490,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_message_dialog_new(parent, flags, type, buttons, message_format);
-@@ -8471,8 +8471,8 @@ public static final int /*long*/ gtk_message_dialog_new(int /*long*/ parent, int
+@@ -8493,8 +8493,8 @@ public static final int /*long*/ gtk_message_dialog_new(int /*long*/ parent, int
* @param xalign cast=(gfloat)
* @param yalign cast=(gfloat)
*/
@@ -22478,7 +22501,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_misc_set_alignment(misc, xalign, yalign);
-@@ -8481,8 +8481,8 @@ public static final void gtk_misc_set_alignment(int /*long*/ misc, float xalign,
+@@ -8503,8 +8503,8 @@ public static final void gtk_misc_set_alignment(int /*long*/ misc, float xalign,
}
}
/** @param notebook cast=(GtkNotebook *) */
@@ -22489,7 +22512,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_notebook_get_current_page(notebook);
-@@ -8491,8 +8491,8 @@ public static final int gtk_notebook_get_current_page(int /*long*/ notebook) {
+@@ -8513,8 +8513,8 @@ public static final int gtk_notebook_get_current_page(int /*long*/ notebook) {
}
}
/** @param notebook cast=(GtkNotebook *) */
@@ -22500,7 +22523,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_notebook_get_scrollable(notebook);
-@@ -8506,8 +8506,8 @@ public static final boolean gtk_notebook_get_scrollable(int /*long*/ notebook) {
+@@ -8528,8 +8528,8 @@ public static final boolean gtk_notebook_get_scrollable(int /*long*/ notebook) {
* @param tab_label cast=(GtkWidget *)
* @param position cast=(gint)
*/
@@ -22511,7 +22534,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_notebook_insert_page(notebook, child, tab_label, position);
-@@ -8515,8 +8515,8 @@ public static final void gtk_notebook_insert_page(int /*long*/ notebook, int /*l
+@@ -8537,8 +8537,8 @@ public static final void gtk_notebook_insert_page(int /*long*/ notebook, int /*l
lock.unlock();
}
}
@@ -22522,7 +22545,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_notebook_new();
-@@ -8525,8 +8525,8 @@ public static final int /*long*/ gtk_notebook_new() {
+@@ -8547,8 +8547,8 @@ public static final int /*long*/ gtk_notebook_new() {
}
}
/** @param notebook cast=(GtkNotebook *) */
@@ -22533,7 +22556,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_notebook_next_page(notebook);
-@@ -8535,8 +8535,8 @@ public static final void gtk_notebook_next_page(int /*long*/ notebook) {
+@@ -8557,8 +8557,8 @@ public static final void gtk_notebook_next_page(int /*long*/ notebook) {
}
}
/** @param notebook cast=(GtkNotebook *) */
@@ -22544,7 +22567,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_notebook_prev_page(notebook);
-@@ -8548,8 +8548,8 @@ public static final void gtk_notebook_prev_page(int /*long*/ notebook) {
+@@ -8570,8 +8570,8 @@ public static final void gtk_notebook_prev_page(int /*long*/ notebook) {
* @param notebook cast=(GtkNotebook *)
* @param page_num cast=(gint)
*/
@@ -22555,7 +22578,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_notebook_remove_page(notebook, page_num);
-@@ -8561,8 +8561,8 @@ public static final void gtk_notebook_remove_page(int /*long*/ notebook, int pag
+@@ -8583,8 +8583,8 @@ public static final void gtk_notebook_remove_page(int /*long*/ notebook, int pag
* @param notebook cast=(GtkNotebook *)
* @param page_num cast=(gint)
*/
@@ -22566,7 +22589,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_notebook_set_current_page(notebook, page_num);
-@@ -8574,8 +8574,8 @@ public static final void gtk_notebook_set_current_page(int /*long*/ notebook, in
+@@ -8596,8 +8596,8 @@ public static final void gtk_notebook_set_current_page(int /*long*/ notebook, in
* @param notebook cast=(GtkNotebook *)
* @param scrollable cast=(gboolean)
*/
@@ -22577,7 +22600,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_notebook_set_scrollable(notebook, scrollable);
-@@ -8587,8 +8587,8 @@ public static final void gtk_notebook_set_scrollable(int /*long*/ notebook, bool
+@@ -8609,8 +8609,8 @@ public static final void gtk_notebook_set_scrollable(int /*long*/ notebook, bool
* @param notebook cast=(GtkNotebook *)
* @param show_tabs cast=(gboolean)
*/
@@ -22588,7 +22611,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_notebook_set_show_tabs(notebook, show_tabs);
-@@ -8600,8 +8600,8 @@ public static final void gtk_notebook_set_show_tabs(int /*long*/ notebook, boole
+@@ -8622,8 +8622,8 @@ public static final void gtk_notebook_set_show_tabs(int /*long*/ notebook, boole
* @param notebook cast=(GtkNotebook *)
* @param pos cast=(GtkPositionType)
*/
@@ -22599,7 +22622,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_notebook_set_tab_pos(notebook, pos);
-@@ -8610,8 +8610,8 @@ public static final void gtk_notebook_set_tab_pos(int /*long*/ notebook, int pos
+@@ -8632,8 +8632,8 @@ public static final void gtk_notebook_set_tab_pos(int /*long*/ notebook, int pos
}
}
/** @param object cast=(GtkObject *) */
@@ -22610,7 +22633,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_object_sink(object);
-@@ -8620,8 +8620,8 @@ public static final void gtk_object_sink(int /*long*/ object) {
+@@ -8642,8 +8642,8 @@ public static final void gtk_object_sink(int /*long*/ object) {
}
}
/** @method flags=dynamic */
@@ -22621,7 +22644,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_orientable_set_orientation(orientable, orientation);
-@@ -8630,8 +8630,8 @@ public static final void gtk_orientable_set_orientation(int /*long*/ orientable,
+@@ -8652,8 +8652,8 @@ public static final void gtk_orientable_set_orientation(int /*long*/ orientable,
}
}
/** @method flags=dynamic */
@@ -22632,7 +22655,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_page_setup_new ();
-@@ -8640,8 +8640,8 @@ public static final int /*long*/ gtk_page_setup_new () {
+@@ -8662,8 +8662,8 @@ public static final int /*long*/ gtk_page_setup_new () {
}
}
/** @method flags=dynamic */
@@ -22643,7 +22666,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_page_setup_get_orientation(setup);
-@@ -8650,8 +8650,8 @@ public static final int gtk_page_setup_get_orientation(int /*long*/ setup) {
+@@ -8672,8 +8672,8 @@ public static final int gtk_page_setup_get_orientation(int /*long*/ setup) {
}
}
/** @method flags=dynamic */
@@ -22654,7 +22677,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_page_setup_set_orientation(setup, orientation);
-@@ -8660,8 +8660,8 @@ public static final void gtk_page_setup_set_orientation(int /*long*/ setup, int
+@@ -8682,8 +8682,8 @@ public static final void gtk_page_setup_set_orientation(int /*long*/ setup, int
}
}
/** @method flags=dynamic */
@@ -22665,7 +22688,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_page_setup_get_paper_size(setup);
-@@ -8670,8 +8670,8 @@ public static final int /*long*/ gtk_page_setup_get_paper_size(int /*long*/ setu
+@@ -8692,8 +8692,8 @@ public static final int /*long*/ gtk_page_setup_get_paper_size(int /*long*/ setu
}
}
/** @method flags=dynamic */
@@ -22676,7 +22699,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_page_setup_set_paper_size(setup, size);
-@@ -8680,8 +8680,8 @@ public static final void gtk_page_setup_set_paper_size(int /*long*/ setup, int /
+@@ -8702,8 +8702,8 @@ public static final void gtk_page_setup_set_paper_size(int /*long*/ setup, int /
}
}
/** @method flags=dynamic */
@@ -22687,7 +22710,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_page_setup_get_top_margin(setup, unit);
-@@ -8690,8 +8690,8 @@ public static final double gtk_page_setup_get_top_margin(int /*long*/ setup, int
+@@ -8712,8 +8712,8 @@ public static final double gtk_page_setup_get_top_margin(int /*long*/ setup, int
}
}
/** @method flags=dynamic */
@@ -22698,7 +22721,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_page_setup_set_top_margin(setup, margin, unit);
-@@ -8700,8 +8700,8 @@ public static final void gtk_page_setup_set_top_margin(int /*long*/ setup, doubl
+@@ -8722,8 +8722,8 @@ public static final void gtk_page_setup_set_top_margin(int /*long*/ setup, doubl
}
}
/** @method flags=dynamic */
@@ -22709,7 +22732,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_page_setup_get_bottom_margin(setup, unit);
-@@ -8710,8 +8710,8 @@ public static final double gtk_page_setup_get_bottom_margin(int /*long*/ setup,
+@@ -8732,8 +8732,8 @@ public static final double gtk_page_setup_get_bottom_margin(int /*long*/ setup,
}
}
/** @method flags=dynamic */
@@ -22720,7 +22743,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_page_setup_set_bottom_margin(setup, margin, unit);
-@@ -8720,8 +8720,8 @@ public static final void gtk_page_setup_set_bottom_margin(int /*long*/ setup, do
+@@ -8742,8 +8742,8 @@ public static final void gtk_page_setup_set_bottom_margin(int /*long*/ setup, do
}
}
/** @method flags=dynamic */
@@ -22731,7 +22754,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_page_setup_get_left_margin(setup, unit);
-@@ -8730,8 +8730,8 @@ public static final double gtk_page_setup_get_left_margin(int /*long*/ setup, in
+@@ -8752,8 +8752,8 @@ public static final double gtk_page_setup_get_left_margin(int /*long*/ setup, in
}
}
/** @method flags=dynamic */
@@ -22742,7 +22765,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_page_setup_set_left_margin(setup, margin, unit);
-@@ -8740,8 +8740,8 @@ public static final void gtk_page_setup_set_left_margin(int /*long*/ setup, doub
+@@ -8762,8 +8762,8 @@ public static final void gtk_page_setup_set_left_margin(int /*long*/ setup, doub
}
}
/** @method flags=dynamic */
@@ -22753,7 +22776,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_page_setup_get_right_margin(setup, unit);
-@@ -8750,8 +8750,8 @@ public static final double gtk_page_setup_get_right_margin(int /*long*/ setup, i
+@@ -8772,8 +8772,8 @@ public static final double gtk_page_setup_get_right_margin(int /*long*/ setup, i
}
}
/** @method flags=dynamic */
@@ -22764,7 +22787,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_page_setup_set_right_margin(setup, margin, unit);
-@@ -8760,8 +8760,8 @@ public static final void gtk_page_setup_set_right_margin(int /*long*/ setup, dou
+@@ -8782,8 +8782,8 @@ public static final void gtk_page_setup_set_right_margin(int /*long*/ setup, dou
}
}
/** @method flags=dynamic */
@@ -22775,7 +22798,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_page_setup_get_paper_width(setup, unit);
-@@ -8770,8 +8770,8 @@ public static final double gtk_page_setup_get_paper_width(int /*long*/ setup, in
+@@ -8792,8 +8792,8 @@ public static final double gtk_page_setup_get_paper_width(int /*long*/ setup, in
}
}
/** @method flags=dynamic */
@@ -22786,7 +22809,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_page_setup_get_paper_height(setup, unit);
-@@ -8780,8 +8780,8 @@ public static final double gtk_page_setup_get_paper_height(int /*long*/ setup, i
+@@ -8802,8 +8802,8 @@ public static final double gtk_page_setup_get_paper_height(int /*long*/ setup, i
}
}
/** @method flags=dynamic */
@@ -22797,7 +22820,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_page_setup_get_page_width(setup, unit);
-@@ -8790,8 +8790,8 @@ public static final double gtk_page_setup_get_page_width(int /*long*/ setup, int
+@@ -8812,8 +8812,8 @@ public static final double gtk_page_setup_get_page_width(int /*long*/ setup, int
}
}
/** @method flags=dynamic */
@@ -22808,7 +22831,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_page_setup_get_page_height(setup, unit);
-@@ -8806,8 +8806,8 @@ public static final double gtk_page_setup_get_page_height(int /*long*/ setup, in
+@@ -8828,8 +8828,8 @@ public static final double gtk_page_setup_get_page_height(int /*long*/ setup, in
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22819,7 +22842,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_paint_handle(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
-@@ -8821,8 +8821,8 @@ public static final void gtk_paint_handle(int /*long*/ style, int /*long*/ windo
+@@ -8843,8 +8843,8 @@ public static final void gtk_paint_handle(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22830,7 +22853,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_paint_flat_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8837,8 +8837,8 @@ public static final void gtk_paint_flat_box(int /*long*/ style, int /*long*/ win
+@@ -8859,8 +8859,8 @@ public static final void gtk_paint_flat_box(int /*long*/ style, int /*long*/ win
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22841,7 +22864,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_paint_focus(style, window, state_type, area, widget, detail, x, y, width, height);
-@@ -8852,8 +8852,8 @@ public static final void gtk_paint_focus(int /*long*/ style, int /*long*/ window
+@@ -8874,8 +8874,8 @@ public static final void gtk_paint_focus(int /*long*/ style, int /*long*/ window
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22852,7 +22875,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_paint_option(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8867,8 +8867,8 @@ public static final void gtk_paint_option(int /*long*/ style, int /*long*/ windo
+@@ -8889,8 +8889,8 @@ public static final void gtk_paint_option(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22863,7 +22886,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_paint_slider(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
-@@ -8882,8 +8882,8 @@ public static final void gtk_paint_slider(int /*long*/ style, int /*long*/ windo
+@@ -8904,8 +8904,8 @@ public static final void gtk_paint_slider(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22874,7 +22897,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_paint_tab(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8897,8 +8897,8 @@ public static final void gtk_paint_tab(int /*long*/ style, int /*long*/ window,
+@@ -8919,8 +8919,8 @@ public static final void gtk_paint_tab(int /*long*/ style, int /*long*/ window,
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22885,7 +22908,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_paint_arrow(style, window, state_type, shadow_type, area, widget, detail, arrow_type, fill, x, y, width, height);
-@@ -8913,8 +8913,8 @@ public static final void gtk_paint_arrow(int /*long*/ style, int /*long*/ window
+@@ -8935,8 +8935,8 @@ public static final void gtk_paint_arrow(int /*long*/ style, int /*long*/ window
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22896,7 +22919,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_paint_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8928,8 +8928,8 @@ public static final void gtk_paint_box(int /*long*/ style, int /*long*/ window,
+@@ -8950,8 +8950,8 @@ public static final void gtk_paint_box(int /*long*/ style, int /*long*/ window,
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
@@ -22907,7 +22930,7 @@ index ea39bc8..d687398 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);
-@@ -8943,8 +8943,8 @@ public static final void gtk_paint_box_gap(int /*long*/ style, int /*long*/ wind
+@@ -8965,8 +8965,8 @@ public static final void gtk_paint_box_gap(int /*long*/ style, int /*long*/ wind
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22918,7 +22941,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_paint_check(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8958,8 +8958,8 @@ public static final void gtk_paint_check(int /*long*/ style, int /*long*/ window
+@@ -8980,8 +8980,8 @@ public static final void gtk_paint_check(int /*long*/ style, int /*long*/ window
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22929,7 +22952,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_paint_expander(style, window, state_type, area, widget, detail, x, y, expander_style);
-@@ -8973,8 +8973,8 @@ public static final void gtk_paint_expander(int /*long*/ style, int /*long*/ win
+@@ -8995,8 +8995,8 @@ public static final void gtk_paint_expander(int /*long*/ style, int /*long*/ win
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
@@ -22940,7 +22963,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_paint_extension(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side);
-@@ -8988,8 +8988,8 @@ public static final void gtk_paint_extension(int /*long*/ style, int /*long*/ wi
+@@ -9010,8 +9010,8 @@ public static final void gtk_paint_extension(int /*long*/ style, int /*long*/ wi
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22951,7 +22974,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_paint_hline(style, window, state_type, area, widget, detail, x1, x2, y);
-@@ -9004,8 +9004,8 @@ public static final void gtk_paint_hline(int /*long*/ style, int /*long*/ window
+@@ -9026,8 +9026,8 @@ public static final void gtk_paint_hline(int /*long*/ style, int /*long*/ window
* @param detail cast=(const gchar *)
* @param layout cast=(PangoLayout *)
*/
@@ -22962,7 +22985,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_paint_layout(style, window, state_type, use_text, area, widget, detail, x, y, layout);
-@@ -9019,8 +9019,8 @@ public static final void gtk_paint_layout(int /*long*/ style, int /*long*/ windo
+@@ -9041,8 +9041,8 @@ public static final void gtk_paint_layout(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
@@ -22973,7 +22996,7 @@ index ea39bc8..d687398 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);
-@@ -9034,8 +9034,8 @@ public static final void gtk_paint_shadow_gap(int /*long*/ style, int /*long*/ w
+@@ -9056,8 +9056,8 @@ public static final void gtk_paint_shadow_gap(int /*long*/ style, int /*long*/ w
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
@@ -22984,7 +23007,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_paint_shadow(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -9049,8 +9049,8 @@ public static final void gtk_paint_shadow(int /*long*/ style, int /*long*/ windo
+@@ -9071,8 +9071,8 @@ public static final void gtk_paint_shadow(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22995,7 +23018,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_paint_vline(style, window, state_type, area, widget, detail, y1, y2, x);
-@@ -9059,8 +9059,8 @@ public static final void gtk_paint_vline(int /*long*/ style, int /*long*/ window
+@@ -9081,8 +9081,8 @@ public static final void gtk_paint_vline(int /*long*/ style, int /*long*/ window
}
}
/** @method flags=dynamic */
@@ -23006,7 +23029,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_paper_size_free(size);
-@@ -9069,8 +9069,8 @@ public static final void gtk_paper_size_free(int /*long*/ size) {
+@@ -9091,8 +9091,8 @@ public static final void gtk_paper_size_free(int /*long*/ size) {
}
}
/** @method flags=dynamic */
@@ -23017,7 +23040,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_paper_size_new(name);
-@@ -9079,8 +9079,8 @@ public static final int /*long*/ gtk_paper_size_new(byte [] name) {
+@@ -9101,8 +9101,8 @@ public static final int /*long*/ gtk_paper_size_new(byte [] name) {
}
}
/** @method flags=dynamic */
@@ -23028,7 +23051,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_paper_size_new_from_ppd(ppd_name, ppd_display_name, width, height);
-@@ -9089,8 +9089,8 @@ public static final int /*long*/ gtk_paper_size_new_from_ppd(byte [] ppd_name, b
+@@ -9111,8 +9111,8 @@ public static final int /*long*/ gtk_paper_size_new_from_ppd(byte [] ppd_name, b
}
}
/** @method flags=dynamic */
@@ -23039,7 +23062,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_paper_size_new_custom(name, display_name, width, height, unit);
-@@ -9099,8 +9099,8 @@ public static final int /*long*/ gtk_paper_size_new_custom(byte [] name, byte []
+@@ -9121,8 +9121,8 @@ public static final int /*long*/ gtk_paper_size_new_custom(byte [] name, byte []
}
}
/** @method flags=dynamic */
@@ -23050,7 +23073,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_paper_size_get_name(size);
-@@ -9109,8 +9109,8 @@ public static final int /*long*/ gtk_paper_size_get_name(int /*long*/ size) {
+@@ -9131,8 +9131,8 @@ public static final int /*long*/ gtk_paper_size_get_name(int /*long*/ size) {
}
}
/** @method flags=dynamic */
@@ -23061,7 +23084,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_paper_size_get_display_name(size);
-@@ -9119,8 +9119,8 @@ public static final int /*long*/ gtk_paper_size_get_display_name(int /*long*/ si
+@@ -9141,8 +9141,8 @@ public static final int /*long*/ gtk_paper_size_get_display_name(int /*long*/ si
}
}
/** @method flags=dynamic */
@@ -23072,7 +23095,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_paper_size_get_ppd_name(size);
-@@ -9129,8 +9129,8 @@ public static final int /*long*/ gtk_paper_size_get_ppd_name(int /*long*/ size)
+@@ -9151,8 +9151,8 @@ public static final int /*long*/ gtk_paper_size_get_ppd_name(int /*long*/ size)
}
}
/** @method flags=dynamic */
@@ -23083,7 +23106,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_paper_size_get_width(size, unit);
-@@ -9139,8 +9139,8 @@ public static final double gtk_paper_size_get_width(int /*long*/ size, int unit)
+@@ -9161,8 +9161,8 @@ public static final double gtk_paper_size_get_width(int /*long*/ size, int unit)
}
}
/** @method flags=dynamic */
@@ -23094,7 +23117,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_paper_size_get_height(size, unit);
-@@ -9149,8 +9149,8 @@ public static final double gtk_paper_size_get_height(int /*long*/ size, int unit
+@@ -9171,8 +9171,8 @@ public static final double gtk_paper_size_get_height(int /*long*/ size, int unit
}
}
/** @method flags=dynamic */
@@ -23105,7 +23128,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_paper_size_is_custom(size);
-@@ -9159,8 +9159,8 @@ public static final boolean gtk_paper_size_is_custom(int /*long*/ size) {
+@@ -9181,8 +9181,8 @@ public static final boolean gtk_paper_size_is_custom(int /*long*/ size) {
}
}
/** @param plug cast=(GtkPlug *) */
@@ -23116,7 +23139,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_plug_get_id(plug);
-@@ -9168,8 +9168,8 @@ public static final int /*long*/ gtk_plug_get_id(int /*long*/ plug) {
+@@ -9190,8 +9190,8 @@ public static final int /*long*/ gtk_plug_get_id(int /*long*/ plug) {
lock.unlock();
}
}
@@ -23127,7 +23150,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_plug_new(socket_id);
-@@ -9178,8 +9178,8 @@ public static final int /*long*/ gtk_plug_new(int /*long*/ socket_id) {
+@@ -9200,8 +9200,8 @@ public static final int /*long*/ gtk_plug_new(int /*long*/ socket_id) {
}
}
/** @method flags=dynamic */
@@ -23138,7 +23161,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_printer_get_backend(printer);
-@@ -9188,8 +9188,8 @@ public static final int /*long*/ gtk_printer_get_backend(int /*long*/ printer) {
+@@ -9210,8 +9210,8 @@ public static final int /*long*/ gtk_printer_get_backend(int /*long*/ printer) {
}
}
/** @method flags=dynamic */
@@ -23149,7 +23172,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_printer_get_name(printer);
-@@ -9198,8 +9198,8 @@ public static final int /*long*/ gtk_printer_get_name(int /*long*/ printer) {
+@@ -9220,8 +9220,8 @@ public static final int /*long*/ gtk_printer_get_name(int /*long*/ printer) {
}
}
/** @method flags=dynamic */
@@ -23160,7 +23183,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_printer_is_default(printer);
-@@ -9213,8 +9213,8 @@ public static final boolean gtk_printer_is_default(int /*long*/ printer) {
+@@ -9235,8 +9235,8 @@ public static final boolean gtk_printer_is_default(int /*long*/ printer) {
* @param destroy cast=(GDestroyNotify)
* @param wait cast=(gboolean)
*/
@@ -23171,7 +23194,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_enumerate_printers(func, data, destroy, wait);
-@@ -9226,8 +9226,8 @@ public static final void gtk_enumerate_printers(int /*long*/ func, int /*long*/d
+@@ -9248,8 +9248,8 @@ public static final void gtk_enumerate_printers(int /*long*/ func, int /*long*/d
* @method flags=dynamic
* @param title cast=(const gchar *)
*/
@@ -23182,7 +23205,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_job_new(title, printer, settings, page_setup);
-@@ -9236,8 +9236,8 @@ public static final int /*long*/ gtk_print_job_new(byte[] title, int /*long*/ pr
+@@ -9258,8 +9258,8 @@ public static final int /*long*/ gtk_print_job_new(byte[] title, int /*long*/ pr
}
}
/** @method flags=dynamic */
@@ -23193,7 +23216,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_job_get_settings(job);
-@@ -9246,8 +9246,8 @@ public static final int /*long*/ gtk_print_job_get_settings(int /*long*/ job) {
+@@ -9268,8 +9268,8 @@ public static final int /*long*/ gtk_print_job_get_settings(int /*long*/ job) {
}
}
/** @method flags=dynamic */
@@ -23204,7 +23227,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_job_get_printer(job);
-@@ -9256,8 +9256,8 @@ public static final int /*long*/ gtk_print_job_get_printer(int /*long*/ job) {
+@@ -9278,8 +9278,8 @@ public static final int /*long*/ gtk_print_job_get_printer(int /*long*/ job) {
}
}
/** @method flags=dynamic */
@@ -23215,7 +23238,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_job_get_title(job);
-@@ -9266,8 +9266,8 @@ public static final int /*long*/ gtk_print_job_get_title(int /*long*/ job) {
+@@ -9288,8 +9288,8 @@ public static final int /*long*/ gtk_print_job_get_title(int /*long*/ job) {
}
}
/** @method flags=dynamic */
@@ -23226,7 +23249,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_job_get_status(job);
-@@ -9280,8 +9280,8 @@ public static final int gtk_print_job_get_status(int /*long*/ job) {
+@@ -9302,8 +9302,8 @@ public static final int gtk_print_job_get_status(int /*long*/ job) {
* @param filename cast=(const gchar *)
* @param error cast=(GError **)
*/
@@ -23237,7 +23260,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_job_set_source_file(job, filename, error);
-@@ -9293,8 +9293,8 @@ public static final boolean gtk_print_job_set_source_file(int /*long*/ job, byte
+@@ -9315,8 +9315,8 @@ public static final boolean gtk_print_job_set_source_file(int /*long*/ job, byte
* @method flags=dynamic
* @param error cast=(GError **)
*/
@@ -23248,7 +23271,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_job_get_surface(job, error);
-@@ -9307,8 +9307,8 @@ public static final int /*long*/ gtk_print_job_get_surface(int /*long*/ job, int
+@@ -9329,8 +9329,8 @@ public static final int /*long*/ gtk_print_job_get_surface(int /*long*/ job, int
* @param user_data cast=(gpointer)
* @param dnotify cast=(GDestroyNotify)
*/
@@ -23259,7 +23282,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_print_job_send(job, callback, user_data, dnotify);
-@@ -9317,8 +9317,8 @@ public static final void gtk_print_job_send(int /*long*/ job, int /*long*/ callb
+@@ -9339,8 +9339,8 @@ public static final void gtk_print_job_send(int /*long*/ job, int /*long*/ callb
}
}
/** @method flags=dynamic */
@@ -23270,7 +23293,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_settings_new();
-@@ -9330,8 +9330,8 @@ public static final int /*long*/ gtk_print_settings_new() {
+@@ -9352,8 +9352,8 @@ public static final int /*long*/ gtk_print_settings_new() {
* @method flags=dynamic
* @param data cast=(gpointer)
*/
@@ -23281,7 +23304,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_print_settings_foreach(settings, func, data);
-@@ -9343,8 +9343,8 @@ public static final void gtk_print_settings_foreach(int /*long*/ settings, int /
+@@ -9365,8 +9365,8 @@ public static final void gtk_print_settings_foreach(int /*long*/ settings, int /
* @method flags=dynamic
* @param key cast=(const gchar *)
*/
@@ -23292,7 +23315,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_settings_get(settings, key);
-@@ -9357,8 +9357,8 @@ public static final int /*long*/ gtk_print_settings_get(int /*long*/ settings, b
+@@ -9379,8 +9379,8 @@ public static final int /*long*/ gtk_print_settings_get(int /*long*/ settings, b
* @param key cast=(const gchar *)
* @param value cast=(const gchar *)
*/
@@ -23303,7 +23326,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_print_settings_set(settings, key, value);
-@@ -9367,8 +9367,8 @@ public static final void gtk_print_settings_set(int /*long*/ settings, byte [] k
+@@ -9389,8 +9389,8 @@ public static final void gtk_print_settings_set(int /*long*/ settings, byte [] k
}
}
/** @method flags=dynamic */
@@ -23314,7 +23337,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_settings_get_printer(settings);
-@@ -9377,8 +9377,8 @@ public static final int /*long*/ gtk_print_settings_get_printer(int /*long*/ set
+@@ -9399,8 +9399,8 @@ public static final int /*long*/ gtk_print_settings_get_printer(int /*long*/ set
}
}
/** @method flags=dynamic */
@@ -23325,7 +23348,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_print_settings_set_printer(settings, printer);
-@@ -9387,8 +9387,8 @@ public static final void gtk_print_settings_set_printer(int /*long*/ settings, b
+@@ -9409,8 +9409,8 @@ public static final void gtk_print_settings_set_printer(int /*long*/ settings, b
}
}
/** @method flags=dynamic */
@@ -23336,7 +23359,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_settings_get_orientation(settings);
-@@ -9397,8 +9397,8 @@ public static final int gtk_print_settings_get_orientation(int /*long*/ settings
+@@ -9419,8 +9419,8 @@ public static final int gtk_print_settings_get_orientation(int /*long*/ settings
}
}
/** @method flags=dynamic */
@@ -23347,7 +23370,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_print_settings_set_orientation(settings, orientation);
-@@ -9407,8 +9407,8 @@ public static final void gtk_print_settings_set_orientation(int /*long*/ setting
+@@ -9429,8 +9429,8 @@ public static final void gtk_print_settings_set_orientation(int /*long*/ setting
}
}
/** @method flags=dynamic */
@@ -23358,7 +23381,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_settings_get_collate(settings);
-@@ -9420,8 +9420,8 @@ public static final boolean gtk_print_settings_get_collate(int /*long*/ settings
+@@ -9442,8 +9442,8 @@ public static final boolean gtk_print_settings_get_collate(int /*long*/ settings
* @method flags=dynamic
* @param collate cast=(gboolean)
*/
@@ -23369,7 +23392,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_print_settings_set_collate(settings, collate);
-@@ -9430,8 +9430,8 @@ public static final void gtk_print_settings_set_collate(int /*long*/ settings, b
+@@ -9452,8 +9452,8 @@ public static final void gtk_print_settings_set_collate(int /*long*/ settings, b
}
}
/** @method flags=dynamic */
@@ -23380,7 +23403,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_settings_get_duplex(settings);
-@@ -9440,8 +9440,8 @@ public static final int gtk_print_settings_get_duplex(int /*long*/ settings) {
+@@ -9462,8 +9462,8 @@ public static final int gtk_print_settings_get_duplex(int /*long*/ settings) {
}
}
/** @method flags=dynamic */
@@ -23391,7 +23414,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_print_settings_set_duplex(settings, duplex);
-@@ -9450,8 +9450,8 @@ public static final void gtk_print_settings_set_duplex(int /*long*/ settings, in
+@@ -9472,8 +9472,8 @@ public static final void gtk_print_settings_set_duplex(int /*long*/ settings, in
}
}
/** @method flags=dynamic */
@@ -23402,7 +23425,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_settings_get_n_copies(settings);
-@@ -9463,8 +9463,8 @@ public static final int gtk_print_settings_get_n_copies(int /*long*/ settings) {
+@@ -9485,8 +9485,8 @@ public static final int gtk_print_settings_get_n_copies(int /*long*/ settings) {
* @method flags=dynamic
* @param num_copies cast=(gint)
*/
@@ -23413,7 +23436,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_print_settings_set_n_copies(settings, num_copies);
-@@ -9473,8 +9473,8 @@ public static final void gtk_print_settings_set_n_copies(int /*long*/ settings,
+@@ -9495,8 +9495,8 @@ public static final void gtk_print_settings_set_n_copies(int /*long*/ settings,
}
}
/** @method flags=dynamic */
@@ -23424,7 +23447,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_settings_get_print_pages(settings);
-@@ -9483,8 +9483,8 @@ public static final int gtk_print_settings_get_print_pages(int /*long*/ settings
+@@ -9505,8 +9505,8 @@ public static final int gtk_print_settings_get_print_pages(int /*long*/ settings
}
}
/** @method flags=dynamic */
@@ -23435,7 +23458,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_print_settings_set_print_pages(settings, pages);
-@@ -9496,8 +9496,8 @@ public static final void gtk_print_settings_set_print_pages(int /*long*/ setting
+@@ -9518,8 +9518,8 @@ public static final void gtk_print_settings_set_print_pages(int /*long*/ setting
* @method flags=dynamic
* @param num_ranges cast=(gint *)
*/
@@ -23446,7 +23469,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_settings_get_page_ranges(settings, num_ranges);
-@@ -9509,8 +9509,8 @@ public static final int /*long*/ gtk_print_settings_get_page_ranges(int /*long*/
+@@ -9531,8 +9531,8 @@ public static final int /*long*/ gtk_print_settings_get_page_ranges(int /*long*/
* @method flags=dynamic
* @param num_ranges cast=(gint)
*/
@@ -23457,7 +23480,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_print_settings_set_page_ranges(settings, page_ranges, num_ranges);
-@@ -9519,8 +9519,8 @@ public static final void gtk_print_settings_set_page_ranges(int /*long*/ setting
+@@ -9541,8 +9541,8 @@ public static final void gtk_print_settings_set_page_ranges(int /*long*/ setting
}
}
/** @method flags=dynamic */
@@ -23468,7 +23491,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_settings_get_paper_width(settings, unit);
-@@ -9529,8 +9529,8 @@ public static final double gtk_print_settings_get_paper_width(int /*long*/ setti
+@@ -9551,8 +9551,8 @@ public static final double gtk_print_settings_get_paper_width(int /*long*/ setti
}
}
/** @method flags=dynamic */
@@ -23479,7 +23502,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_settings_get_paper_height(settings, unit);
-@@ -9539,8 +9539,8 @@ public static final double gtk_print_settings_get_paper_height(int /*long*/ sett
+@@ -9561,8 +9561,8 @@ public static final double gtk_print_settings_get_paper_height(int /*long*/ sett
}
}
/** @method flags=dynamic */
@@ -23490,7 +23513,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_settings_get_resolution(settings);
-@@ -9553,8 +9553,8 @@ public static final int gtk_print_settings_get_resolution(int /*long*/ settings)
+@@ -9575,8 +9575,8 @@ public static final int gtk_print_settings_get_resolution(int /*long*/ settings)
* @param title cast=(const gchar *)
* @param parent cast=(GtkWindow *)
*/
@@ -23501,7 +23524,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_unix_dialog_new(title, parent);
-@@ -9563,8 +9563,8 @@ public static final int /*long*/ gtk_print_unix_dialog_new(byte[] title, int /*l
+@@ -9585,8 +9585,8 @@ public static final int /*long*/ gtk_print_unix_dialog_new(byte[] title, int /*l
}
}
/** @method flags=dynamic */
@@ -23512,7 +23535,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_print_unix_dialog_set_embed_page_setup(dialog, embed);
-@@ -9573,8 +9573,8 @@ public static final void gtk_print_unix_dialog_set_embed_page_setup(int /*long*/
+@@ -9595,8 +9595,8 @@ public static final void gtk_print_unix_dialog_set_embed_page_setup(int /*long*/
}
}
/** @method flags=dynamic */
@@ -23523,7 +23546,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_print_unix_dialog_set_page_setup(dialog, page_setup);
-@@ -9583,8 +9583,8 @@ public static final void gtk_print_unix_dialog_set_page_setup(int /*long*/ dialo
+@@ -9605,8 +9605,8 @@ public static final void gtk_print_unix_dialog_set_page_setup(int /*long*/ dialo
}
}
/** @method flags=dynamic */
@@ -23534,7 +23557,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_unix_dialog_get_page_setup(dialog);
-@@ -9596,8 +9596,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_page_setup(int /*long
+@@ -9618,8 +9618,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_page_setup(int /*long
* @method flags=dynamic
* @param current_page cast=(gint)
*/
@@ -23545,7 +23568,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_print_unix_dialog_set_current_page(dialog, current_page);
-@@ -9606,8 +9606,8 @@ public static final void gtk_print_unix_dialog_set_current_page(int /*long*/ dia
+@@ -9628,8 +9628,8 @@ public static final void gtk_print_unix_dialog_set_current_page(int /*long*/ dia
}
}
/** @method flags=dynamic */
@@ -23556,7 +23579,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_unix_dialog_get_current_page(dialog);
-@@ -9616,8 +9616,8 @@ public static final int gtk_print_unix_dialog_get_current_page(int /*long*/ dial
+@@ -9638,8 +9638,8 @@ public static final int gtk_print_unix_dialog_get_current_page(int /*long*/ dial
}
}
/** @method flags=dynamic */
@@ -23567,7 +23590,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_print_unix_dialog_set_settings(dialog, settings);
-@@ -9626,8 +9626,8 @@ public static final void gtk_print_unix_dialog_set_settings(int /*long*/ dialog,
+@@ -9648,8 +9648,8 @@ public static final void gtk_print_unix_dialog_set_settings(int /*long*/ dialog,
}
}
/** @method flags=dynamic */
@@ -23578,7 +23601,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_unix_dialog_get_settings(dialog);
-@@ -9636,8 +9636,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_settings(int /*long*/
+@@ -9658,8 +9658,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_settings(int /*long*/
}
}
/** @method flags=dynamic */
@@ -23589,7 +23612,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_print_unix_dialog_get_selected_printer(dialog);
-@@ -9646,8 +9646,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_selected_printer(int
+@@ -9668,8 +9668,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_selected_printer(int
}
}
/** @method flags=dynamic */
@@ -23600,7 +23623,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_print_unix_dialog_set_manual_capabilities(dialog, capabilities);
-@@ -9655,8 +9655,8 @@ public static final void gtk_print_unix_dialog_set_manual_capabilities(int /*lon
+@@ -9677,8 +9677,8 @@ public static final void gtk_print_unix_dialog_set_manual_capabilities(int /*lon
lock.unlock();
}
}
@@ -23611,7 +23634,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_progress_bar_new();
-@@ -9665,8 +9665,8 @@ public static final int /*long*/ gtk_progress_bar_new() {
+@@ -9687,8 +9687,8 @@ public static final int /*long*/ gtk_progress_bar_new() {
}
}
/** @param pbar cast=(GtkProgressBar *) */
@@ -23622,7 +23645,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_progress_bar_pulse(pbar);
-@@ -9678,8 +9678,8 @@ public static final void gtk_progress_bar_pulse(int /*long*/ pbar) {
+@@ -9700,8 +9700,8 @@ public static final void gtk_progress_bar_pulse(int /*long*/ pbar) {
* @param pbar cast=(GtkProgressBar *)
* @param fraction cast=(gdouble)
*/
@@ -23633,7 +23656,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_progress_bar_set_fraction(pbar, fraction);
-@@ -9691,8 +9691,8 @@ public static final void gtk_progress_bar_set_fraction(int /*long*/ pbar, double
+@@ -9713,8 +9713,8 @@ public static final void gtk_progress_bar_set_fraction(int /*long*/ pbar, double
* @param pbar cast=(GtkProgressBar *)
* @param orientation cast=(GtkProgressBarOrientation)
*/
@@ -23644,7 +23667,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_progress_bar_set_orientation(pbar, orientation);
-@@ -9701,8 +9701,8 @@ public static final void gtk_progress_bar_set_orientation(int /*long*/ pbar, int
+@@ -9723,8 +9723,8 @@ public static final void gtk_progress_bar_set_orientation(int /*long*/ pbar, int
}
}
/** @param radio_button cast=(GtkRadioButton *) */
@@ -23655,7 +23678,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_radio_button_get_group(radio_button);
-@@ -9711,8 +9711,8 @@ public static final int /*long*/ gtk_radio_button_get_group(int /*long*/ radio_b
+@@ -9733,8 +9733,8 @@ public static final int /*long*/ gtk_radio_button_get_group(int /*long*/ radio_b
}
}
/** @param group cast=(GSList *) */
@@ -23666,7 +23689,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_radio_button_new(group);
-@@ -9721,8 +9721,8 @@ public static final int /*long*/ gtk_radio_button_new(int /*long*/ group) {
+@@ -9743,8 +9743,8 @@ public static final int /*long*/ gtk_radio_button_new(int /*long*/ group) {
}
}
/** @param radio_menu_item cast=(GtkRadioMenuItem *) */
@@ -23677,7 +23700,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_radio_menu_item_get_group(radio_menu_item);
-@@ -9731,8 +9731,8 @@ public static final int /*long*/ gtk_radio_menu_item_get_group(int /*long*/ radi
+@@ -9753,8 +9753,8 @@ public static final int /*long*/ gtk_radio_menu_item_get_group(int /*long*/ radi
}
}
/** @param group cast=(GSList *) */
@@ -23688,7 +23711,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_radio_menu_item_new(group);
-@@ -9744,8 +9744,8 @@ public static final int /*long*/ gtk_radio_menu_item_new(int /*long*/ group) {
+@@ -9766,8 +9766,8 @@ public static final int /*long*/ gtk_radio_menu_item_new(int /*long*/ group) {
* @param group cast=(GSList *)
* @param label cast=(const gchar *)
*/
@@ -23699,7 +23722,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_radio_menu_item_new_with_label(group, label);
-@@ -9754,8 +9754,8 @@ public static final int /*long*/ gtk_radio_menu_item_new_with_label(int /*long*/
+@@ -9776,8 +9776,8 @@ public static final int /*long*/ gtk_radio_menu_item_new_with_label(int /*long*/
}
}
/** @param range cast=(GtkRange *) */
@@ -23710,7 +23733,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_range_get_adjustment(range);
-@@ -9764,8 +9764,8 @@ public static final int /*long*/ gtk_range_get_adjustment(int /*long*/ range) {
+@@ -9786,8 +9786,8 @@ public static final int /*long*/ gtk_range_get_adjustment(int /*long*/ range) {
}
}
/** @param range cast=(GtkRange *) */
@@ -23721,7 +23744,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_range_set_increments(range, step, page);
-@@ -9774,8 +9774,8 @@ public static final void gtk_range_set_increments(int /*long*/ range, double ste
+@@ -9796,8 +9796,8 @@ public static final void gtk_range_set_increments(int /*long*/ range, double ste
}
}
/** @param range cast=(GtkRange *) */
@@ -23732,7 +23755,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_range_set_inverted(range, setting);
-@@ -9784,8 +9784,8 @@ public static final void gtk_range_set_inverted(int /*long*/ range, boolean sett
+@@ -9806,8 +9806,8 @@ public static final void gtk_range_set_inverted(int /*long*/ range, boolean sett
}
}
/** @param range cast=(GtkRange *) */
@@ -23743,7 +23766,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_range_set_range(range, min, max);
-@@ -9794,8 +9794,8 @@ public static final void gtk_range_set_range(int /*long*/ range, double min, dou
+@@ -9816,8 +9816,8 @@ public static final void gtk_range_set_range(int /*long*/ range, double min, dou
}
}
/** @param range cast=(GtkRange *) */
@@ -23754,7 +23777,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_range_set_value(range, value);
-@@ -9814,8 +9814,8 @@ public static final void gtk_rc_parse_string(byte[] rc_string) {
+@@ -9836,8 +9836,8 @@ public static final void gtk_rc_parse_string(byte[] rc_string) {
}
}
/** @param style cast=(GtkRcStyle *) */
@@ -23765,7 +23788,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_rc_style_get_bg_pixmap_name(style, index);
-@@ -9824,8 +9824,8 @@ public static final int /*long*/ gtk_rc_style_get_bg_pixmap_name(int /*long*/ st
+@@ -9846,8 +9846,8 @@ public static final int /*long*/ gtk_rc_style_get_bg_pixmap_name(int /*long*/ st
}
}
/** @param style cast=(GtkRcStyle *) */
@@ -23776,7 +23799,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_rc_style_get_color_flags(style, index);
-@@ -9837,8 +9837,8 @@ public static final int gtk_rc_style_get_color_flags(int /*long*/ style, int ind
+@@ -9859,8 +9859,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
*/
@@ -23787,7 +23810,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_rc_style_set_bg(style, index, color);
-@@ -9850,8 +9850,8 @@ public static final void gtk_rc_style_set_bg(int /*long*/ style, int index, GdkC
+@@ -9872,8 +9872,8 @@ public static final void gtk_rc_style_set_bg(int /*long*/ style, int index, GdkC
* @param style cast=(GtkRcStyle *)
* @param name cast=(char *)
*/
@@ -23798,7 +23821,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_rc_style_set_bg_pixmap_name(style, index, name);
-@@ -9860,8 +9860,8 @@ public static final void gtk_rc_style_set_bg_pixmap_name(int /*long*/ style, int
+@@ -9882,8 +9882,8 @@ public static final void gtk_rc_style_set_bg_pixmap_name(int /*long*/ style, int
}
}
/** @param style cast=(GtkRcStyle *) */
@@ -23809,7 +23832,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_rc_style_set_color_flags(style, index, flag);
-@@ -9873,8 +9873,8 @@ public static final void gtk_rc_style_set_color_flags(int /*long*/ style, int in
+@@ -9895,8 +9895,8 @@ public static final void gtk_rc_style_set_color_flags(int /*long*/ style, int in
* @param scale cast=(GtkScale *)
* @param digits cast=(gint)
*/
@@ -23820,7 +23843,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_scale_set_digits(scale, digits);
-@@ -9886,8 +9886,8 @@ public static final void gtk_scale_set_digits(int /*long*/ scale, int digits) {
+@@ -9908,8 +9908,8 @@ public static final void gtk_scale_set_digits(int /*long*/ scale, int digits) {
* @param scale cast=(GtkScale *)
* @param draw_value cast=(gboolean)
*/
@@ -23831,7 +23854,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_scale_set_draw_value(scale, draw_value);
-@@ -9899,8 +9899,8 @@ public static final void gtk_scale_set_draw_value(int /*long*/ scale, boolean dr
+@@ -9921,8 +9921,8 @@ public static final void gtk_scale_set_draw_value(int /*long*/ scale, boolean dr
* @param style cast=(GtkRcStyle *)
* @param color flags=no_out
*/
@@ -23842,7 +23865,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_rc_style_set_fg(style, index, color);
-@@ -9912,8 +9912,8 @@ public static final void gtk_rc_style_set_fg(int /*long*/ style, int index, GdkC
+@@ -9934,8 +9934,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
*/
@@ -23853,7 +23876,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_rc_style_set_text(style, index, color);
-@@ -9925,8 +9925,8 @@ public static final void gtk_rc_style_set_text(int /*long*/ style, int index, Gd
+@@ -9947,8 +9947,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 *)
*/
@@ -23864,7 +23887,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_scrolled_window_add_with_viewport(scrolled_window, child);
-@@ -9935,8 +9935,8 @@ public static final void gtk_scrolled_window_add_with_viewport(int /*long*/ scro
+@@ -9957,8 +9957,8 @@ public static final void gtk_scrolled_window_add_with_viewport(int /*long*/ scro
}
}
/** @param scrolled_window cast=(GtkScrolledWindow *) */
@@ -23875,7 +23898,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_scrolled_window_get_hadjustment(scrolled_window);
-@@ -9949,8 +9949,8 @@ public static final int /*long*/ gtk_scrolled_window_get_hadjustment(int /*long*
+@@ -9971,8 +9971,8 @@ public static final int /*long*/ gtk_scrolled_window_get_hadjustment(int /*long*
* @param hscrollbar_policy cast=(GtkPolicyType *)
* @param vscrollbar_policy cast=(GtkPolicyType *)
*/
@@ -23886,7 +23909,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_scrolled_window_get_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy);
-@@ -9959,8 +9959,8 @@ public static final void gtk_scrolled_window_get_policy(int /*long*/ scrolled_wi
+@@ -9981,8 +9981,8 @@ public static final void gtk_scrolled_window_get_policy(int /*long*/ scrolled_wi
}
}
/** @param scrolled_window cast=(GtkScrolledWindow *) */
@@ -23897,7 +23920,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_scrolled_window_get_shadow_type(scrolled_window);
-@@ -9969,8 +9969,8 @@ public static final int gtk_scrolled_window_get_shadow_type(int /*long*/ scrolle
+@@ -9991,8 +9991,8 @@ public static final int gtk_scrolled_window_get_shadow_type(int /*long*/ scrolle
}
}
/** @param scrolled_window cast=(GtkScrolledWindow *) */
@@ -23908,7 +23931,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_scrolled_window_get_vadjustment(scrolled_window);
-@@ -9982,8 +9982,8 @@ public static final int /*long*/ gtk_scrolled_window_get_vadjustment(int /*long*
+@@ -10004,8 +10004,8 @@ public static final int /*long*/ gtk_scrolled_window_get_vadjustment(int /*long*
* @param hadjustment cast=(GtkAdjustment *)
* @param vadjustment cast=(GtkAdjustment *)
*/
@@ -23919,7 +23942,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_scrolled_window_new(hadjustment, vadjustment);
-@@ -9995,8 +9995,8 @@ public static final int /*long*/ gtk_scrolled_window_new(int /*long*/ hadjustmen
+@@ -10017,8 +10017,8 @@ public static final int /*long*/ gtk_scrolled_window_new(int /*long*/ hadjustmen
* @param scrolled_window cast=(GtkScrolledWindow *)
* @param placement cast=(GtkCornerType)
*/
@@ -23930,7 +23953,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_scrolled_window_set_placement(scrolled_window, placement);
-@@ -10009,8 +10009,8 @@ public static final void gtk_scrolled_window_set_placement(int /*long*/ scrolled
+@@ -10031,8 +10031,8 @@ public static final void gtk_scrolled_window_set_placement(int /*long*/ scrolled
* @param hscrollbar_policy cast=(GtkPolicyType)
* @param vscrollbar_policy cast=(GtkPolicyType)
*/
@@ -23941,7 +23964,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_scrolled_window_set_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy);
-@@ -10022,8 +10022,8 @@ public static final void gtk_scrolled_window_set_policy(int /*long*/ scrolled_wi
+@@ -10044,8 +10044,8 @@ public static final void gtk_scrolled_window_set_policy(int /*long*/ scrolled_wi
* @param scrolled_window cast=(GtkScrolledWindow *)
* @param type cast=(GtkShadowType)
*/
@@ -23952,7 +23975,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_scrolled_window_set_shadow_type(scrolled_window, type);
-@@ -10031,8 +10031,8 @@ public static final void gtk_scrolled_window_set_shadow_type(int /*long*/ scroll
+@@ -10053,8 +10053,8 @@ public static final void gtk_scrolled_window_set_shadow_type(int /*long*/ scroll
lock.unlock();
}
}
@@ -23963,7 +23986,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_settings_get_default();
-@@ -10046,8 +10046,8 @@ public static final int /*long*/ gtk_settings_get_default() {
+@@ -10068,8 +10068,8 @@ public static final int /*long*/ gtk_settings_get_default() {
* @param v_string cast=(const gchar *)
* @param origin cast=(const gchar *)
*/
@@ -23974,7 +23997,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_settings_set_string_property(settings, name, v_string, origin);
-@@ -10056,8 +10056,8 @@ public static final void gtk_settings_set_string_property(int /*long*/ settings,
+@@ -10078,8 +10078,8 @@ public static final void gtk_settings_set_string_property(int /*long*/ settings,
}
}
/** @param selection_data cast=(GtkSelectionData *) */
@@ -23985,7 +24008,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_selection_data_free(selection_data);
-@@ -10072,8 +10072,8 @@ public static final void gtk_selection_data_free(int /*long*/ selection_data) {
+@@ -10094,8 +10094,8 @@ public static final void gtk_selection_data_free(int /*long*/ selection_data) {
* @param data cast=(const guchar *)
* @param length cast=(gint)
*/
@@ -23996,7 +24019,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_selection_data_set(selection_data, type, format, data, length);
-@@ -10081,8 +10081,8 @@ public static final void gtk_selection_data_set(int /*long*/ selection_data, int
+@@ -10103,8 +10103,8 @@ public static final void gtk_selection_data_set(int /*long*/ selection_data, int
lock.unlock();
}
}
@@ -24007,7 +24030,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_separator_menu_item_new();
-@@ -10090,8 +10090,8 @@ public static final int /*long*/ gtk_separator_menu_item_new() {
+@@ -10112,8 +10112,8 @@ public static final int /*long*/ gtk_separator_menu_item_new() {
lock.unlock();
}
}
@@ -24018,7 +24041,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_separator_tool_item_new();
-@@ -10103,8 +10103,8 @@ public static final int /*long*/ gtk_separator_tool_item_new() {
+@@ -10125,8 +10125,8 @@ public static final int /*long*/ gtk_separator_tool_item_new() {
* @param item cast=(GtkSeparatorToolItem *)
* @param draw cast=(gboolean)
*/
@@ -24029,7 +24052,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_separator_tool_item_set_draw(item, draw);
-@@ -10113,8 +10113,8 @@ public static final void gtk_separator_tool_item_set_draw(int /*long*/ item, boo
+@@ -10135,8 +10135,8 @@ public static final void gtk_separator_tool_item_set_draw(int /*long*/ item, boo
}
}
/** @method flags=dynamic */
@@ -24040,7 +24063,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_set_locale();
-@@ -10123,8 +10123,8 @@ public static final int /*long*/ gtk_set_locale() {
+@@ -10145,8 +10145,8 @@ public static final int /*long*/ gtk_set_locale() {
}
}
/** @param socket cast=(GtkSocket *) */
@@ -24051,7 +24074,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_socket_get_id(socket);
-@@ -10132,8 +10132,8 @@ public static final int /*long*/ gtk_socket_get_id(int /*long*/ socket) {
+@@ -10154,8 +10154,8 @@ public static final int /*long*/ gtk_socket_get_id(int /*long*/ socket) {
lock.unlock();
}
}
@@ -24062,7 +24085,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_socket_new();
-@@ -10142,8 +10142,8 @@ public static final int /*long*/ gtk_socket_new() {
+@@ -10164,8 +10164,8 @@ public static final int /*long*/ gtk_socket_new() {
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -24073,7 +24096,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_spin_button_new(adjustment, climb_rate, digits);
-@@ -10155,8 +10155,8 @@ public static final int /*long*/ gtk_spin_button_new(int /*long*/ adjustment, do
+@@ -10177,8 +10177,8 @@ public static final int /*long*/ gtk_spin_button_new(int /*long*/ adjustment, do
* @param spin_button cast=(GtkSpinButton*)
* @param adjustment cast=(GtkAdjustment *)
**/
@@ -24084,7 +24107,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_spin_button_configure(spin_button, adjustment, climb_rate, digits);
-@@ -10165,8 +10165,8 @@ public static final void gtk_spin_button_configure(int /*long*/ spin_button, int
+@@ -10187,8 +10187,8 @@ public static final void gtk_spin_button_configure(int /*long*/ spin_button, int
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -24095,7 +24118,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_spin_button_get_adjustment(spin_button);
-@@ -10176,8 +10176,8 @@ public static final int /*long*/ gtk_spin_button_get_adjustment(int /*long*/ spi
+@@ -10198,8 +10198,8 @@ public static final int /*long*/ gtk_spin_button_get_adjustment(int /*long*/ spi
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -24106,7 +24129,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_spin_button_get_digits(spin_button);
-@@ -10186,8 +10186,8 @@ public static final int gtk_spin_button_get_digits(int /*long*/ spin_button) {
+@@ -10208,8 +10208,8 @@ public static final int gtk_spin_button_get_digits(int /*long*/ spin_button) {
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -24117,7 +24140,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_spin_button_set_digits(spin_button, digits);
-@@ -10196,8 +10196,8 @@ public static final void gtk_spin_button_set_digits(int /*long*/ spin_button, in
+@@ -10218,8 +10218,8 @@ public static final void gtk_spin_button_set_digits(int /*long*/ spin_button, in
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -24128,7 +24151,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_spin_button_set_increments(spin_button, step, page);
-@@ -10206,8 +10206,8 @@ public static final void gtk_spin_button_set_increments(int /*long*/ spin_button
+@@ -10228,8 +10228,8 @@ public static final void gtk_spin_button_set_increments(int /*long*/ spin_button
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -24139,7 +24162,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_spin_button_set_range(spin_button, max, min);
-@@ -10216,8 +10216,8 @@ public static final void gtk_spin_button_set_range(int /*long*/ spin_button, dou
+@@ -10238,8 +10238,8 @@ public static final void gtk_spin_button_set_range(int /*long*/ spin_button, dou
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -24150,7 +24173,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_spin_button_set_value(spin_button, value);
-@@ -10226,8 +10226,8 @@ public static final void gtk_spin_button_set_value(int /*long*/ spin_button, dou
+@@ -10248,8 +10248,8 @@ public static final void gtk_spin_button_set_value(int /*long*/ spin_button, dou
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -24161,7 +24184,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_spin_button_set_wrap(spin_button, wrap);
-@@ -10236,8 +10236,8 @@ public static final void gtk_spin_button_set_wrap(int /*long*/ spin_button, bool
+@@ -10258,8 +10258,8 @@ public static final void gtk_spin_button_set_wrap(int /*long*/ spin_button, bool
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -24172,7 +24195,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_spin_button_update(spin_button);
-@@ -10248,8 +10248,8 @@ public static final void gtk_spin_button_update(int /*long*/ spin_button) {
+@@ -10270,8 +10270,8 @@ public static final void gtk_spin_button_update(int /*long*/ spin_button) {
/**
* @method flags=dynamic
*/
@@ -24183,7 +24206,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_status_icon_get_geometry(handle, screen, area, orientation);
-@@ -10260,8 +10260,8 @@ public static final boolean gtk_status_icon_get_geometry(int /*long*/ handle, in
+@@ -10282,8 +10282,8 @@ public static final boolean gtk_status_icon_get_geometry(int /*long*/ handle, in
/**
* @method flags=dynamic
*/
@@ -24194,7 +24217,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_status_icon_get_visible(handle);
-@@ -10270,8 +10270,8 @@ public static final boolean gtk_status_icon_get_visible(int /*long*/ handle) {
+@@ -10292,8 +10292,8 @@ public static final boolean gtk_status_icon_get_visible(int /*long*/ handle) {
}
}
/** @method flags=dynamic */
@@ -24205,7 +24228,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_status_icon_new();
-@@ -10282,8 +10282,8 @@ public static final int /*long*/ gtk_status_icon_new() {
+@@ -10304,8 +10304,8 @@ public static final int /*long*/ gtk_status_icon_new() {
/**
* @method flags=dynamic
*/
@@ -24216,7 +24239,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_status_icon_set_from_pixbuf(handle, pixbuf);
-@@ -10294,8 +10294,8 @@ public static final void gtk_status_icon_set_from_pixbuf(int /*long*/ handle, in
+@@ -10316,8 +10316,8 @@ public static final void gtk_status_icon_set_from_pixbuf(int /*long*/ handle, in
/**
* @method flags=dynamic
*/
@@ -24227,7 +24250,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_status_icon_set_visible(handle, visible);
-@@ -10306,8 +10306,8 @@ public static final void gtk_status_icon_set_visible(int /*long*/ handle, boolea
+@@ -10328,8 +10328,8 @@ public static final void gtk_status_icon_set_visible(int /*long*/ handle, boolea
/**
* @method flags=dynamic
*/
@@ -24238,7 +24261,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_status_icon_set_tooltip(handle, tip_text);
-@@ -10319,8 +10319,8 @@ public static final void gtk_status_icon_set_tooltip(int /*long*/ handle, byte[]
+@@ -10341,8 +10341,8 @@ public static final void gtk_status_icon_set_tooltip(int /*long*/ handle, byte[]
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -24249,7 +24272,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_style_get_base(style, index, color);
-@@ -10332,8 +10332,8 @@ public static final void gtk_style_get_base(int /*long*/ style, int index, GdkCo
+@@ -10354,8 +10354,8 @@ public static final void gtk_style_get_base(int /*long*/ style, int index, GdkCo
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -24260,7 +24283,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_style_get_black(style, color);
-@@ -10345,8 +10345,8 @@ public static final void gtk_style_get_black(int /*long*/ style, GdkColor color)
+@@ -10367,8 +10367,8 @@ public static final void gtk_style_get_black(int /*long*/ style, GdkColor color)
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -24271,7 +24294,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_style_get_bg(style, index, color);
-@@ -10358,8 +10358,8 @@ public static final void gtk_style_get_bg(int /*long*/ style, int index, GdkColo
+@@ -10380,8 +10380,8 @@ public static final void gtk_style_get_bg(int /*long*/ style, int index, GdkColo
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -24282,7 +24305,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_style_get_dark(style, index, color);
-@@ -10371,8 +10371,8 @@ public static final void gtk_style_get_dark(int /*long*/ style, int index, GdkCo
+@@ -10393,8 +10393,8 @@ public static final void gtk_style_get_dark(int /*long*/ style, int index, GdkCo
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -24293,7 +24316,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_style_get_fg(style, index, color);
-@@ -10384,8 +10384,8 @@ public static final void gtk_style_get_fg(int /*long*/ style, int index, GdkColo
+@@ -10406,8 +10406,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
*/
@@ -24304,7 +24327,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_style_get_fg_gc(style, index, gc);
-@@ -10397,8 +10397,8 @@ public static final void gtk_style_get_fg_gc(int /*long*/ style, int index, int
+@@ -10419,8 +10419,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
*/
@@ -24315,7 +24338,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_style_get_bg_gc(style, index, gc);
-@@ -10410,8 +10410,8 @@ public static final void gtk_style_get_bg_gc(int /*long*/ style, int index, int
+@@ -10432,8 +10432,8 @@ public static final void gtk_style_get_bg_gc(int /*long*/ style, int index, int
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -24326,7 +24349,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_style_get_light_gc(style, index, gc);
-@@ -10423,8 +10423,8 @@ public static final void gtk_style_get_light_gc(int /*long*/ style, int index, i
+@@ -10445,8 +10445,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
*/
@@ -24337,7 +24360,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_style_get_dark_gc(style, index, gc);
-@@ -10436,8 +10436,8 @@ public static final void gtk_style_get_dark_gc(int /*long*/ style, int index, in
+@@ -10458,8 +10458,8 @@ public static final void gtk_style_get_dark_gc(int /*long*/ style, int index, in
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -24348,7 +24371,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_style_get_mid_gc(style, index, gc);
-@@ -10449,8 +10449,8 @@ public static final void gtk_style_get_mid_gc(int /*long*/ style, int index, int
+@@ -10471,8 +10471,8 @@ public static final void gtk_style_get_mid_gc(int /*long*/ style, int index, int
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -24359,7 +24382,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_style_get_text_gc(style, index, gc);
-@@ -10462,8 +10462,8 @@ public static final void gtk_style_get_text_gc(int /*long*/ style, int index, in
+@@ -10484,8 +10484,8 @@ public static final void gtk_style_get_text_gc(int /*long*/ style, int index, in
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -24370,7 +24393,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_style_get_text_aa_gc(style, index, gc);
-@@ -10475,8 +10475,8 @@ public static final void gtk_style_get_text_aa_gc(int /*long*/ style, int index,
+@@ -10497,8 +10497,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
*/
@@ -24381,7 +24404,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_style_get_black_gc(style, gc);
-@@ -10488,8 +10488,8 @@ public static final void gtk_style_get_black_gc(int /*long*/ style, int /*long*/
+@@ -10510,8 +10510,8 @@ public static final void gtk_style_get_black_gc(int /*long*/ style, int /*long*/
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -24392,7 +24415,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_style_get_white_gc(style, gc);
-@@ -10498,8 +10498,8 @@ public static final void gtk_style_get_white_gc(int /*long*/ style, int /*long*/
+@@ -10520,8 +10520,8 @@ public static final void gtk_style_get_white_gc(int /*long*/ style, int /*long*/
}
}
/** @param style cast=(GtkStyle *) */
@@ -24403,7 +24426,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_style_get_font_desc(style);
-@@ -10511,8 +10511,8 @@ public static final int /*long*/ gtk_style_get_font_desc(int /*long*/ style) {
+@@ -10533,8 +10533,8 @@ public static final int /*long*/ gtk_style_get_font_desc(int /*long*/ style) {
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -24414,7 +24437,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_style_get_light(style, index, color);
-@@ -10524,8 +10524,8 @@ public static final void gtk_style_get_light(int /*long*/ style, int index, GdkC
+@@ -10546,8 +10546,8 @@ public static final void gtk_style_get_light(int /*long*/ style, int index, GdkC
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -24425,7 +24448,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_style_get_text(style, index, color);
-@@ -10534,8 +10534,8 @@ public static final void gtk_style_get_text(int /*long*/ style, int index, GdkCo
+@@ -10556,8 +10556,8 @@ public static final void gtk_style_get_text(int /*long*/ style, int index, GdkCo
}
}
/** @param style cast=(GtkStyle *) */
@@ -24436,7 +24459,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_style_get_xthickness(style);
-@@ -10544,8 +10544,8 @@ public static final int gtk_style_get_xthickness(int /*long*/ style) {
+@@ -10566,8 +10566,8 @@ public static final int gtk_style_get_xthickness(int /*long*/ style) {
}
}
/** @param style cast=(GtkStyle *) */
@@ -24447,7 +24470,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_style_get_ythickness(style);
-@@ -10559,8 +10559,8 @@ public static final int gtk_style_get_ythickness(int /*long*/ style) {
+@@ -10581,8 +10581,8 @@ public static final int gtk_style_get_ythickness(int /*long*/ style) {
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -24458,7 +24481,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_style_render_icon(style, source, direction, state, size, widget, detail);
-@@ -10572,8 +10572,8 @@ public static final int /*long*/ gtk_style_render_icon(int /*long*/ style, int /
+@@ -10594,8 +10594,8 @@ public static final int /*long*/ gtk_style_render_icon(int /*long*/ style, int /
* @param targets cast=(const GtkTargetEntry *)
* @param ntargets cast=(guint)
*/
@@ -24469,7 +24492,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_target_list_new(targets, ntargets);
-@@ -10582,8 +10582,8 @@ public static final int /*long*/ gtk_target_list_new(int /*long*/ targets, int n
+@@ -10604,8 +10604,8 @@ public static final int /*long*/ gtk_target_list_new(int /*long*/ targets, int n
}
}
/** @param list cast=(GtkTargetList *) */
@@ -24480,7 +24503,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_target_list_unref(list);
-@@ -10595,8 +10595,8 @@ public static final void gtk_target_list_unref(int /*long*/ list) {
+@@ -10617,8 +10617,8 @@ public static final void gtk_target_list_unref(int /*long*/ list) {
* @param buffer cast=(GtkTextBuffer *)
* @param clipboard cast=(GtkClipboard *)
*/
@@ -24491,7 +24514,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_buffer_copy_clipboard(buffer, clipboard);
-@@ -10609,8 +10609,8 @@ public static final void gtk_text_buffer_copy_clipboard(int /*long*/ buffer, int
+@@ -10631,8 +10631,8 @@ public static final void gtk_text_buffer_copy_clipboard(int /*long*/ buffer, int
* @param clipboard cast=(GtkClipboard *)
* @param default_editable cast=(gboolean)
*/
@@ -24502,7 +24525,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_buffer_cut_clipboard(buffer, clipboard, default_editable);
-@@ -10623,8 +10623,8 @@ public static final void gtk_text_buffer_cut_clipboard(int /*long*/ buffer, int
+@@ -10645,8 +10645,8 @@ public static final void gtk_text_buffer_cut_clipboard(int /*long*/ buffer, int
* @param start cast=(GtkTextIter *)
* @param end cast=(GtkTextIter *)
*/
@@ -24513,7 +24536,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_buffer_delete(buffer, start, end);
-@@ -10637,8 +10637,8 @@ public static final void gtk_text_buffer_delete(int /*long*/ buffer, byte[] star
+@@ -10659,8 +10659,8 @@ public static final void gtk_text_buffer_delete(int /*long*/ buffer, byte[] star
* @param start cast=(GtkTextIter *)
* @param end cast=(GtkTextIter *)
*/
@@ -24524,7 +24547,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_buffer_get_bounds(buffer, start, end);
-@@ -10647,8 +10647,8 @@ public static final void gtk_text_buffer_get_bounds(int /*long*/ buffer, byte[]
+@@ -10669,8 +10669,8 @@ public static final void gtk_text_buffer_get_bounds(int /*long*/ buffer, byte[]
}
}
/** @param buffer cast=(GtkTextBuffer *) */
@@ -24535,7 +24558,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_text_buffer_get_char_count(buffer);
-@@ -10660,8 +10660,8 @@ public static final int gtk_text_buffer_get_char_count(int /*long*/ buffer) {
+@@ -10682,8 +10682,8 @@ public static final int gtk_text_buffer_get_char_count(int /*long*/ buffer) {
* @param buffer cast=(GtkTextBuffer *)
* @param iter cast=(GtkTextIter *)
*/
@@ -24546,7 +24569,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_buffer_get_end_iter(buffer, iter);
-@@ -10670,8 +10670,8 @@ public static final void gtk_text_buffer_get_end_iter(int /*long*/ buffer, byte[
+@@ -10692,8 +10692,8 @@ public static final void gtk_text_buffer_get_end_iter(int /*long*/ buffer, byte[
}
}
/** @param buffer cast=(GtkTextBuffer *) */
@@ -24557,7 +24580,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_text_buffer_get_insert(buffer);
-@@ -10684,8 +10684,8 @@ public static final int /*long*/ gtk_text_buffer_get_insert(int /*long*/ buffer)
+@@ -10706,8 +10706,8 @@ public static final int /*long*/ gtk_text_buffer_get_insert(int /*long*/ buffer)
* @param iter cast=(GtkTextIter *)
* @param line_number cast=(gint)
*/
@@ -24568,7 +24591,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_buffer_get_iter_at_line(buffer, iter, line_number);
-@@ -10698,8 +10698,8 @@ public static final void gtk_text_buffer_get_iter_at_line(int /*long*/ buffer, b
+@@ -10720,8 +10720,8 @@ public static final void gtk_text_buffer_get_iter_at_line(int /*long*/ buffer, b
* @param iter cast=(GtkTextIter *)
* @param mark cast=(GtkTextMark *)
*/
@@ -24579,7 +24602,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
-@@ -10712,8 +10712,8 @@ public static final void gtk_text_buffer_get_iter_at_mark(int /*long*/ buffer, b
+@@ -10734,8 +10734,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)
*/
@@ -24590,7 +24613,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_buffer_get_iter_at_offset(buffer, iter, char_offset);
-@@ -10722,8 +10722,8 @@ public static final void gtk_text_buffer_get_iter_at_offset(int /*long*/ buffer,
+@@ -10744,8 +10744,8 @@ public static final void gtk_text_buffer_get_iter_at_offset(int /*long*/ buffer,
}
}
/** @param buffer cast=(GtkTextBuffer *) */
@@ -24601,7 +24624,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_text_buffer_get_line_count(buffer);
-@@ -10732,8 +10732,8 @@ public static final int gtk_text_buffer_get_line_count(int /*long*/ buffer) {
+@@ -10754,8 +10754,8 @@ public static final int gtk_text_buffer_get_line_count(int /*long*/ buffer) {
}
}
/** @param buffer cast=(GtkTextBuffer *) */
@@ -24612,7 +24635,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_text_buffer_get_selection_bound(buffer);
-@@ -10746,8 +10746,8 @@ public static final int /*long*/ gtk_text_buffer_get_selection_bound(int /*long*
+@@ -10768,8 +10768,8 @@ public static final int /*long*/ gtk_text_buffer_get_selection_bound(int /*long*
* @param start cast=(GtkTextIter *)
* @param end cast=(GtkTextIter *)
*/
@@ -24623,7 +24646,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_text_buffer_get_selection_bounds(buffer, start, end);
-@@ -10761,8 +10761,8 @@ public static final boolean gtk_text_buffer_get_selection_bounds(int /*long*/ bu
+@@ -10783,8 +10783,8 @@ public static final boolean gtk_text_buffer_get_selection_bounds(int /*long*/ bu
* @param end cast=(GtkTextIter *)
* @param include_hidden_chars cast=(gboolean)
*/
@@ -24634,7 +24657,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_text_buffer_get_text(buffer, start, end, include_hidden_chars);
-@@ -10776,8 +10776,8 @@ public static final int /*long*/ gtk_text_buffer_get_text(int /*long*/ buffer, b
+@@ -10798,8 +10798,8 @@ public static final int /*long*/ gtk_text_buffer_get_text(int /*long*/ buffer, b
* @param text cast=(const gchar *)
* @param len cast=(gint)
*/
@@ -24645,7 +24668,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_buffer_insert(buffer, iter, text, len);
-@@ -10791,8 +10791,8 @@ public static final void gtk_text_buffer_insert(int /*long*/ buffer, byte[] iter
+@@ -10813,8 +10813,8 @@ public static final void gtk_text_buffer_insert(int /*long*/ buffer, byte[] iter
* @param text cast=(const gchar *)
* @param len cast=(gint)
*/
@@ -24656,7 +24679,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_buffer_insert(buffer, iter, text, len);
-@@ -10805,8 +10805,8 @@ public static final void gtk_text_buffer_insert(int /*long*/ buffer, int /*long*
+@@ -10827,8 +10827,8 @@ public static final void gtk_text_buffer_insert(int /*long*/ buffer, int /*long*
* @param mark cast=(GtkTextMark *)
* @param where cast=(const GtkTextIter *)
*/
@@ -24667,7 +24690,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_buffer_move_mark(buffer, mark, where);
-@@ -10820,8 +10820,8 @@ public static final void gtk_text_buffer_move_mark(int /*long*/ buffer, int /*lo
+@@ -10842,8 +10842,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)
*/
@@ -24678,7 +24701,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_buffer_paste_clipboard(buffer, clipboard, override_location, default_editable);
-@@ -10833,8 +10833,8 @@ public static final void gtk_text_buffer_paste_clipboard(int /*long*/ buffer, in
+@@ -10855,8 +10855,8 @@ public static final void gtk_text_buffer_paste_clipboard(int /*long*/ buffer, in
* @param buffer cast=(GtkTextBuffer *)
* @param where cast=(const GtkTextIter *)
*/
@@ -24689,7 +24712,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_buffer_place_cursor(buffer, where);
-@@ -10847,8 +10847,8 @@ public static final void gtk_text_buffer_place_cursor(int /*long*/ buffer, byte[
+@@ -10869,8 +10869,8 @@ public static final void gtk_text_buffer_place_cursor(int /*long*/ buffer, byte[
* @param text cast=(const gchar *)
* @param len cast=(gint)
*/
@@ -24700,7 +24723,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_buffer_set_text(buffer, text, len);
-@@ -10884,8 +10884,8 @@ public static final int gtk_text_iter_get_offset(byte[] iter) {
+@@ -10906,8 +10906,8 @@ public static final int gtk_text_iter_get_offset(byte[] iter) {
* @param window_x cast=(gint *)
* @param window_y cast=(gint *)
*/
@@ -24711,7 +24734,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_view_buffer_to_window_coords(text_view, win, buffer_x, buffer_y, window_x, window_y);
-@@ -10894,8 +10894,8 @@ public static final void gtk_text_view_buffer_to_window_coords(int /*long*/ text
+@@ -10916,8 +10916,8 @@ public static final void gtk_text_view_buffer_to_window_coords(int /*long*/ text
}
}
/** @param text_view cast=(GtkTextView *) */
@@ -24722,7 +24745,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_text_view_get_buffer(text_view);
-@@ -10904,8 +10904,8 @@ public static final int /*long*/ gtk_text_view_get_buffer(int /*long*/ text_view
+@@ -10926,8 +10926,8 @@ public static final int /*long*/ gtk_text_view_get_buffer(int /*long*/ text_view
}
}
/** @param text_view cast=(GtkTextView *) */
@@ -24733,7 +24756,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_text_view_get_editable(text_view);
-@@ -10919,8 +10919,8 @@ public static final boolean gtk_text_view_get_editable(int /*long*/ text_view) {
+@@ -10941,8 +10941,8 @@ public static final boolean gtk_text_view_get_editable(int /*long*/ text_view) {
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -24744,7 +24767,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_view_get_iter_at_location(text_view, iter, x, y);
-@@ -10933,8 +10933,8 @@ public static final void gtk_text_view_get_iter_at_location(int /*long*/ text_vi
+@@ -10955,8 +10955,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
*/
@@ -24755,7 +24778,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_view_get_iter_location(text_view, iter, location);
-@@ -10948,8 +10948,8 @@ public static final void gtk_text_view_get_iter_location(int /*long*/ text_view,
+@@ -10970,8 +10970,8 @@ public static final void gtk_text_view_get_iter_location(int /*long*/ text_view,
* @param y cast=(gint)
* @param line_top cast=(gint *)
*/
@@ -24766,7 +24789,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_view_get_line_at_y(text_view, target_iter, y, line_top);
-@@ -10961,8 +10961,8 @@ public static final void gtk_text_view_get_line_at_y(int /*long*/ text_view, byt
+@@ -10983,8 +10983,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
*/
@@ -24777,7 +24800,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_view_get_visible_rect(text_view, visible_rect);
-@@ -10974,8 +10974,8 @@ public static final void gtk_text_view_get_visible_rect(int /*long*/ text_view,
+@@ -10996,8 +10996,8 @@ public static final void gtk_text_view_get_visible_rect(int /*long*/ text_view,
* @param text_view cast=(GtkTextView *)
* @param win cast=(GtkTextWindowType)
*/
@@ -24788,7 +24811,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_text_view_get_window(text_view, win);
-@@ -10983,8 +10983,8 @@ public static final int /*long*/ gtk_text_view_get_window(int /*long*/ text_view
+@@ -11005,8 +11005,8 @@ public static final int /*long*/ gtk_text_view_get_window(int /*long*/ text_view
lock.unlock();
}
}
@@ -24799,7 +24822,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_text_view_new();
-@@ -10996,8 +10996,8 @@ public static final int /*long*/ gtk_text_view_new() {
+@@ -11018,8 +11018,8 @@ public static final int /*long*/ gtk_text_view_new() {
* @param text_view cast=(GtkTextView *)
* @param mark cast=(GtkTextMark *)
*/
@@ -24810,7 +24833,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_view_scroll_mark_onscreen(text_view, mark);
-@@ -11013,8 +11013,8 @@ public static final void gtk_text_view_scroll_mark_onscreen(int /*long*/ text_vi
+@@ -11035,8 +11035,8 @@ public static final void gtk_text_view_scroll_mark_onscreen(int /*long*/ text_vi
* @param xalign cast=(gdouble)
* @param yalign cast=(gdouble)
*/
@@ -24821,7 +24844,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_text_view_scroll_to_iter(text_view, iter, within_margin, use_align, xalign, yalign);
-@@ -11026,8 +11026,8 @@ public static final boolean gtk_text_view_scroll_to_iter(int /*long*/ text_view,
+@@ -11048,8 +11048,8 @@ public static final boolean gtk_text_view_scroll_to_iter(int /*long*/ text_view,
* @param text_view cast=(GtkTextView *)
* @param setting cast=(gboolean)
*/
@@ -24832,7 +24855,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_view_set_editable(text_view, setting);
-@@ -11036,8 +11036,8 @@ public static final void gtk_text_view_set_editable(int /*long*/ text_view, bool
+@@ -11058,8 +11058,8 @@ public static final void gtk_text_view_set_editable(int /*long*/ text_view, bool
}
}
/** @param text_view cast=(GtkTextView *) */
@@ -24843,7 +24866,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_view_set_justification(text_view, justification);
-@@ -11049,8 +11049,8 @@ public static final void gtk_text_view_set_justification(int /*long*/ text_view,
+@@ -11071,8 +11071,8 @@ public static final void gtk_text_view_set_justification(int /*long*/ text_view,
* @param text_view cast=(GtkTextView *)
* @param tabs cast=(PangoTabArray *)
*/
@@ -24854,7 +24877,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_view_set_tabs(text_view, tabs);
-@@ -11059,8 +11059,8 @@ public static final void gtk_text_view_set_tabs(int /*long*/ text_view, int /*lo
+@@ -11081,8 +11081,8 @@ public static final void gtk_text_view_set_tabs(int /*long*/ text_view, int /*lo
}
}
/** @param text_view cast=(GtkTextView *) */
@@ -24865,7 +24888,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_view_set_wrap_mode(text_view, wrap_mode);
-@@ -11076,8 +11076,8 @@ public static final void gtk_text_view_set_wrap_mode(int /*long*/ text_view, int
+@@ -11098,8 +11098,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 *)
*/
@@ -24876,7 +24899,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_text_view_window_to_buffer_coords(text_view, win, window_x, window_y, buffer_x, buffer_y);
-@@ -11090,8 +11090,8 @@ public static final void gtk_text_view_window_to_buffer_coords(int /*long*/ text
+@@ -11112,8 +11112,8 @@ public static final void gtk_text_view_window_to_buffer_coords(int /*long*/ text
* @param function cast=(GSourceFunc)
* @param data cast=(gpointer)
*/
@@ -24887,7 +24910,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _g_timeout_add(interval, function, data);
-@@ -11100,8 +11100,8 @@ public static final int g_timeout_add(int interval, int /*long*/ function, int /
+@@ -11122,8 +11122,8 @@ public static final int g_timeout_add(int interval, int /*long*/ function, int /
}
}
/** @param toggle_button cast=(GtkToggleButton *) */
@@ -24898,7 +24921,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_toggle_button_get_active(toggle_button);
-@@ -11109,8 +11109,8 @@ public static final boolean gtk_toggle_button_get_active(int /*long*/ toggle_but
+@@ -11131,8 +11131,8 @@ public static final boolean gtk_toggle_button_get_active(int /*long*/ toggle_but
lock.unlock();
}
}
@@ -24909,7 +24932,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_toggle_button_new();
-@@ -11119,8 +11119,8 @@ public static final int /*long*/ gtk_toggle_button_new() {
+@@ -11141,8 +11141,8 @@ public static final int /*long*/ gtk_toggle_button_new() {
}
}
/** @param toggle_button cast=(GtkToggleButton *) */
@@ -24920,7 +24943,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_toggle_button_get_inconsistent(toggle_button);
-@@ -11132,8 +11132,8 @@ public static final boolean gtk_toggle_button_get_inconsistent(int /*long*/ togg
+@@ -11154,8 +11154,8 @@ public static final boolean gtk_toggle_button_get_inconsistent(int /*long*/ togg
* @param toggle_button cast=(GtkToggleButton *)
* @param is_active cast=(gboolean)
*/
@@ -24931,7 +24954,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_toggle_button_set_active(toggle_button, is_active);
-@@ -11145,8 +11145,8 @@ public static final void gtk_toggle_button_set_active(int /*long*/ toggle_button
+@@ -11167,8 +11167,8 @@ public static final void gtk_toggle_button_set_active(int /*long*/ toggle_button
* @param toggle_button cast=(GtkToggleButton *)
* @param setting cast=(gboolean)
*/
@@ -24942,7 +24965,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_toggle_button_set_inconsistent(toggle_button, setting);
-@@ -11158,8 +11158,8 @@ public static final void gtk_toggle_button_set_inconsistent(int /*long*/ toggle_
+@@ -11180,8 +11180,8 @@ public static final void gtk_toggle_button_set_inconsistent(int /*long*/ toggle_
* @param toggle_button cast=(GtkToggleButton *)
* @param draw_indicator cast=(gboolean)
*/
@@ -24953,7 +24976,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_toggle_button_set_mode(toggle_button, draw_indicator);
-@@ -11168,8 +11168,8 @@ public static final void gtk_toggle_button_set_mode(int /*long*/ toggle_button,
+@@ -11190,8 +11190,8 @@ public static final void gtk_toggle_button_set_mode(int /*long*/ toggle_button,
}
}
/** @param button cast=(GtkToggleToolButton *) */
@@ -24964,7 +24987,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_toggle_tool_button_get_active(button);
-@@ -11177,8 +11177,8 @@ public static final boolean gtk_toggle_tool_button_get_active(int /*long*/ butto
+@@ -11199,8 +11199,8 @@ public static final boolean gtk_toggle_tool_button_get_active(int /*long*/ butto
lock.unlock();
}
}
@@ -24975,7 +24998,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_toggle_tool_button_new();
-@@ -11190,8 +11190,8 @@ public static final int /*long*/ gtk_toggle_tool_button_new() {
+@@ -11212,8 +11212,8 @@ public static final int /*long*/ gtk_toggle_tool_button_new() {
* @param item cast=(GtkToggleToolButton *)
* @param selected cast=(gboolean)
*/
@@ -24986,7 +25009,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_toggle_tool_button_set_active(item, selected);
-@@ -11203,8 +11203,8 @@ public static final void gtk_toggle_tool_button_set_active(int /*long*/ item, bo
+@@ -11225,8 +11225,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 *)
*/
@@ -24997,7 +25020,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tool_button_new(icon_widget, label);
-@@ -11216,8 +11216,8 @@ public static final int /*long*/ gtk_tool_button_new(int /*long*/ icon_widget, b
+@@ -11238,8 +11238,8 @@ public static final int /*long*/ gtk_tool_button_new(int /*long*/ icon_widget, b
* @param button cast=(GtkToolButton *)
* @param widget cast=(GtkWidget *)
*/
@@ -25008,7 +25031,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tool_button_set_icon_widget(button, widget);
-@@ -11229,8 +11229,8 @@ public static final void gtk_tool_button_set_icon_widget(int /*long*/ button, in
+@@ -11251,8 +11251,8 @@ public static final void gtk_tool_button_set_icon_widget(int /*long*/ button, in
* @param button cast=(GtkToolButton *)
* @param label cast=(const gchar *)
*/
@@ -25019,7 +25042,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tool_button_set_label(button, label);
-@@ -11242,8 +11242,8 @@ public static final void gtk_tool_button_set_label(int /*long*/ button, byte[]
+@@ -11264,8 +11264,8 @@ public static final void gtk_tool_button_set_label(int /*long*/ button, byte[]
* @param button cast=(GtkToolButton *)
* @param widget cast=(GtkWidget *)
*/
@@ -25030,7 +25053,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tool_button_set_label_widget(button, widget);
-@@ -11255,8 +11255,8 @@ public static final void gtk_tool_button_set_label_widget(int /*long*/ button,
+@@ -11277,8 +11277,8 @@ public static final void gtk_tool_button_set_label_widget(int /*long*/ button,
* @param item cast=(GtkToolButton *)
* @param underline cast=(gboolean)
*/
@@ -25041,7 +25064,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tool_button_set_use_underline(item, underline);
-@@ -11268,8 +11268,8 @@ public static final void gtk_tool_button_set_use_underline(int /*long*/ item, bo
+@@ -11290,8 +11290,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 *)
*/
@@ -25052,7 +25075,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tool_item_get_proxy_menu_item(item, menu_id);
-@@ -11278,8 +11278,8 @@ public static final int /*long*/ gtk_tool_item_get_proxy_menu_item(int /*long*/
+@@ -11300,8 +11300,8 @@ public static final int /*long*/ gtk_tool_item_get_proxy_menu_item(int /*long*/
}
}
/** @param item cast=(GtkToolItem *) */
@@ -25063,7 +25086,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tool_item_retrieve_proxy_menu_item(item);
-@@ -11291,8 +11291,8 @@ public static final int /*long*/ gtk_tool_item_retrieve_proxy_menu_item(int /*lo
+@@ -11313,8 +11313,8 @@ public static final int /*long*/ gtk_tool_item_retrieve_proxy_menu_item(int /*lo
* @param item cast=(GtkToolItem *)
* @param important cast=(gboolean)
*/
@@ -25074,7 +25097,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tool_item_set_is_important(item, important);
-@@ -11305,8 +11305,8 @@ public static final void gtk_tool_item_set_is_important(int /*long*/ item, boole
+@@ -11327,8 +11327,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 *)
*/
@@ -25085,7 +25108,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tool_item_set_proxy_menu_item(item, menu_id, widget);
-@@ -11318,8 +11318,8 @@ public static final void gtk_tool_item_set_proxy_menu_item(int /*long*/ item, by
+@@ -11340,8 +11340,8 @@ public static final void gtk_tool_item_set_proxy_menu_item(int /*long*/ item, by
* @param toolbar cast=(GtkToolbar *)
* @param item cast=(GtkToolItem *)
*/
@@ -25096,7 +25119,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_toolbar_insert(toolbar, item, pos);
-@@ -11334,8 +11334,8 @@ public static final void gtk_toolbar_insert(int /*long*/ toolbar, int /*long*/ i
+@@ -11356,8 +11356,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)
*/
@@ -25107,7 +25130,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_toolbar_insert_widget(toolbar, widget, tooltip_text, tooltip_private_text, position);
-@@ -11343,8 +11343,8 @@ public static final void gtk_toolbar_insert_widget(int /*long*/ toolbar, int /*l
+@@ -11365,8 +11365,8 @@ public static final void gtk_toolbar_insert_widget(int /*long*/ toolbar, int /*l
lock.unlock();
}
}
@@ -25118,7 +25141,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_toolbar_new();
-@@ -11357,8 +11357,8 @@ public static final int /*long*/ gtk_toolbar_new() {
+@@ -11379,8 +11379,8 @@ public static final int /*long*/ gtk_toolbar_new() {
* @param toolbar cast=(GtkToolbar *)
* @param orientation cast=(GtkOrientation)
*/
@@ -25129,7 +25152,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_toolbar_set_orientation(toolbar, orientation);
-@@ -11370,8 +11370,8 @@ public static final void gtk_toolbar_set_orientation(int /*long*/ toolbar, int o
+@@ -11392,8 +11392,8 @@ public static final void gtk_toolbar_set_orientation(int /*long*/ toolbar, int o
* @param toolbar cast=(GtkToolbar *)
* @param show_arrow cast=(gboolean)
*/
@@ -25140,7 +25163,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_toolbar_set_show_arrow(toolbar, show_arrow);
-@@ -11382,8 +11382,8 @@ public static final void gtk_toolbar_set_show_arrow(int /*long*/ toolbar, boolea
+@@ -11404,8 +11404,8 @@ public static final void gtk_toolbar_set_show_arrow(int /*long*/ toolbar, boolea
/** @param toolbar cast=(GtkToolbar *)
* @param style cast=(GtkToolbarStyle)
*/
@@ -25151,7 +25174,18 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_toolbar_set_style(toolbar, style);
-@@ -11392,8 +11392,8 @@ public static final void gtk_toolbar_set_style(int /*long*/ toolbar, int style)
+@@ -11415,8 +11415,8 @@ public static final void gtk_toolbar_set_style(int /*long*/ toolbar, int style)
+ }
+ /** @param toolbar cast=(GtkToolbar *)
+ */
+-public static final native void _gtk_toolbar_set_icon_size(int /*long*/ toolbar, int size);
+-public static final void gtk_toolbar_set_icon_size(int /*long*/ toolbar, int size) {
++public static final native void _gtk_toolbar_set_icon_size(long /*int*/ toolbar, int size);
++public static final void gtk_toolbar_set_icon_size(long /*int*/ toolbar, int size) {
+ lock.lock();
+ try {
+ _gtk_toolbar_set_icon_size(toolbar, size);
+@@ -11425,8 +11425,8 @@ public static final void gtk_toolbar_set_icon_size(int /*long*/ toolbar, int siz
}
}
/** @method flags=dynamic */
@@ -25162,7 +25196,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tooltips_data_get(widget);
-@@ -11402,8 +11402,8 @@ public static final int /*long*/ gtk_tooltips_data_get(int /*long*/ widget) {
+@@ -11435,8 +11435,8 @@ public static final int /*long*/ gtk_tooltips_data_get(int /*long*/ widget) {
}
}
/** @method flags=dynamic */
@@ -25173,7 +25207,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tooltips_disable(tooltips);
-@@ -11412,8 +11412,8 @@ public static final void gtk_tooltips_disable(int /*long*/ tooltips) {
+@@ -11445,8 +11445,8 @@ public static final void gtk_tooltips_disable(int /*long*/ tooltips) {
}
}
/** @method flags=dynamic */
@@ -25184,7 +25218,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tooltips_enable(tooltips);
-@@ -11421,8 +11421,8 @@ public static final void gtk_tooltips_enable(int /*long*/ tooltips) {
+@@ -11454,8 +11454,8 @@ public static final void gtk_tooltips_enable(int /*long*/ tooltips) {
lock.unlock();
}
}
@@ -25195,7 +25229,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tooltips_new();
-@@ -11431,8 +11431,8 @@ public static final int /*long*/ gtk_tooltips_new() {
+@@ -11464,8 +11464,8 @@ public static final int /*long*/ gtk_tooltips_new() {
}
}
/** @method flags=dynamic */
@@ -25206,7 +25240,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tooltips_force_window(tooltips);
-@@ -11443,8 +11443,8 @@ public static final void gtk_tooltips_force_window(int /*long*/ tooltips) {
+@@ -11476,8 +11476,8 @@ public static final void gtk_tooltips_force_window(int /*long*/ tooltips) {
/**
* @method flags=dynamic
*/
@@ -25217,7 +25251,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tooltips_set_tip(tooltips, widget, tip_text, tip_private);
-@@ -11456,8 +11456,8 @@ public static final void gtk_tooltips_set_tip(int /*long*/ tooltips, int /*long*
+@@ -11489,8 +11489,8 @@ public static final void gtk_tooltips_set_tip(int /*long*/ tooltips, int /*long*
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25228,7 +25262,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_model_get(tree_model, iter, column, value, terminator);
-@@ -11469,8 +11469,8 @@ public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*
+@@ -11502,8 +11502,8 @@ public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25239,7 +25273,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_model_get(tree_model, iter, column, value, terminator);
-@@ -11483,8 +11483,8 @@ public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*
+@@ -11516,8 +11516,8 @@ public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*
* @param iter cast=(GtkTreeIter *)
* @param path cast=(GtkTreePath *)
*/
@@ -25250,7 +25284,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_model_get_iter(tree_model, iter, path);
-@@ -11496,8 +11496,8 @@ public static final boolean gtk_tree_model_get_iter(int /*long*/ tree_model, int
+@@ -11529,8 +11529,8 @@ public static final boolean gtk_tree_model_get_iter(int /*long*/ tree_model, int
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25261,7 +25295,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_model_get_iter_first(tree_model, iter);
-@@ -11506,8 +11506,8 @@ public static final boolean gtk_tree_model_get_iter_first(int /*long*/ tree_mode
+@@ -11539,8 +11539,8 @@ public static final boolean gtk_tree_model_get_iter_first(int /*long*/ tree_mode
}
}
/** @param tree_model cast=(GtkTreeModel *) */
@@ -25272,7 +25306,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_model_get_n_columns(tree_model);
-@@ -11519,8 +11519,8 @@ public static final int gtk_tree_model_get_n_columns(int /*long*/ tree_model) {
+@@ -11552,8 +11552,8 @@ public static final int gtk_tree_model_get_n_columns(int /*long*/ tree_model) {
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25283,7 +25317,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_model_get_path(tree_model, iter);
-@@ -11528,8 +11528,8 @@ public static final int /*long*/ gtk_tree_model_get_path(int /*long*/ tree_model
+@@ -11561,8 +11561,8 @@ public static final int /*long*/ gtk_tree_model_get_path(int /*long*/ tree_model
lock.unlock();
}
}
@@ -25294,7 +25328,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_model_get_type();
-@@ -11542,8 +11542,8 @@ public static final int /*long*/ gtk_tree_model_get_type() {
+@@ -11575,8 +11575,8 @@ public static final int /*long*/ gtk_tree_model_get_type() {
* @param iter cast=(GtkTreeIter *)
* @param parent cast=(GtkTreeIter *)
*/
@@ -25305,7 +25339,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_model_iter_children(model, iter, parent);
-@@ -11555,8 +11555,8 @@ public static final boolean gtk_tree_model_iter_children(int /*long*/ model, int
+@@ -11588,8 +11588,8 @@ public static final boolean gtk_tree_model_iter_children(int /*long*/ model, int
* @param model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25316,7 +25350,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_model_iter_n_children(model, iter);
-@@ -11568,8 +11568,8 @@ public static final int gtk_tree_model_iter_n_children(int /*long*/ model, int /
+@@ -11601,8 +11601,8 @@ public static final int gtk_tree_model_iter_n_children(int /*long*/ model, int /
* @param model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25327,7 +25361,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_model_iter_next(model, iter);
-@@ -11582,8 +11582,8 @@ public static final boolean gtk_tree_model_iter_next(int /*long*/ model, int /*l
+@@ -11615,8 +11615,8 @@ public static final boolean gtk_tree_model_iter_next(int /*long*/ model, int /*l
* @param iter cast=(GtkTreeIter *)
* @param parent cast=(GtkTreeIter *)
*/
@@ -25338,7 +25372,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_model_iter_nth_child(tree_model, iter, parent, n);
-@@ -11592,8 +11592,8 @@ public static final boolean gtk_tree_model_iter_nth_child(int /*long*/ tree_mode
+@@ -11625,8 +11625,8 @@ public static final boolean gtk_tree_model_iter_nth_child(int /*long*/ tree_mode
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25349,7 +25383,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_path_append_index(path, index);
-@@ -11605,8 +11605,8 @@ public static final void gtk_tree_path_append_index(int /*long*/ path, int index
+@@ -11638,8 +11638,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 *)
*/
@@ -25360,7 +25394,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_path_compare(a, b);
-@@ -11615,8 +11615,8 @@ public static final int /*long*/ gtk_tree_path_compare(int /*long*/ a, int /*lon
+@@ -11648,8 +11648,8 @@ public static final int /*long*/ gtk_tree_path_compare(int /*long*/ a, int /*lon
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25371,7 +25405,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_path_down(path);
-@@ -11625,8 +11625,8 @@ public static final void gtk_tree_path_down(int /*long*/ path) {
+@@ -11658,8 +11658,8 @@ public static final void gtk_tree_path_down(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25382,7 +25416,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_path_free(path);
-@@ -11635,8 +11635,8 @@ public static final void gtk_tree_path_free(int /*long*/ path) {
+@@ -11668,8 +11668,8 @@ public static final void gtk_tree_path_free(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25393,7 +25427,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_path_get_depth(path);
-@@ -11645,8 +11645,8 @@ public static final int gtk_tree_path_get_depth(int /*long*/ path) {
+@@ -11678,8 +11678,8 @@ public static final int gtk_tree_path_get_depth(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25404,7 +25438,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_path_get_indices(path);
-@@ -11654,8 +11654,8 @@ public static final int /*long*/ gtk_tree_path_get_indices(int /*long*/ path) {
+@@ -11687,8 +11687,8 @@ public static final int /*long*/ gtk_tree_path_get_indices(int /*long*/ path) {
lock.unlock();
}
}
@@ -25415,7 +25449,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_path_new();
-@@ -11663,8 +11663,8 @@ public static final int /*long*/ gtk_tree_path_new() {
+@@ -11696,8 +11696,8 @@ public static final int /*long*/ gtk_tree_path_new() {
lock.unlock();
}
}
@@ -25426,7 +25460,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_path_new_first();
-@@ -11673,8 +11673,8 @@ public static final int /*long*/ gtk_tree_path_new_first() {
+@@ -11706,8 +11706,8 @@ public static final int /*long*/ gtk_tree_path_new_first() {
}
}
/** @param path cast=(const gchar *) */
@@ -25437,7 +25471,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_path_new_from_string(path);
-@@ -11683,8 +11683,8 @@ public static final int /*long*/ gtk_tree_path_new_from_string(byte[] path) {
+@@ -11716,8 +11716,8 @@ public static final int /*long*/ gtk_tree_path_new_from_string(byte[] path) {
}
}
/** @param path cast=(const gchar *) */
@@ -25448,7 +25482,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_path_new_from_string(path);
-@@ -11693,8 +11693,8 @@ public static final int /*long*/ gtk_tree_path_new_from_string(int /*long*/ path
+@@ -11726,8 +11726,8 @@ public static final int /*long*/ gtk_tree_path_new_from_string(int /*long*/ path
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25459,7 +25493,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_path_next(path);
-@@ -11703,8 +11703,8 @@ public static final void gtk_tree_path_next(int /*long*/ path) {
+@@ -11736,8 +11736,8 @@ public static final void gtk_tree_path_next(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25470,7 +25504,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_path_prev(path);
-@@ -11713,8 +11713,8 @@ public static final boolean gtk_tree_path_prev(int /*long*/ path) {
+@@ -11746,8 +11746,8 @@ public static final boolean gtk_tree_path_prev(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25481,7 +25515,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_path_up(path);
-@@ -11726,8 +11726,8 @@ public static final boolean gtk_tree_path_up(int /*long*/ path) {
+@@ -11759,8 +11759,8 @@ public static final boolean gtk_tree_path_up(int /*long*/ path) {
* @method flags=dynamic
* @param selection cast=(GtkTreeSelection *)
*/
@@ -25492,7 +25526,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_selection_count_selected_rows(selection);
-@@ -11740,8 +11740,8 @@ public static final int gtk_tree_selection_count_selected_rows(int /*long*/ sele
+@@ -11773,8 +11773,8 @@ public static final int gtk_tree_selection_count_selected_rows(int /*long*/ sele
* @param model cast=(GtkTreeModel **)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25503,7 +25537,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_selection_get_selected(selection, model, iter);
-@@ -11754,8 +11754,8 @@ public static final boolean gtk_tree_selection_get_selected(int /*long*/ selecti
+@@ -11787,8 +11787,8 @@ public static final boolean gtk_tree_selection_get_selected(int /*long*/ selecti
* @param selection cast=(GtkTreeSelection *)
* @param model cast=(GtkTreeModel **)
*/
@@ -25514,7 +25548,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_selection_get_selected_rows(selection, model);
-@@ -11767,8 +11767,8 @@ public static final int /*long*/ gtk_tree_selection_get_selected_rows(int /*long
+@@ -11800,8 +11800,8 @@ public static final int /*long*/ gtk_tree_selection_get_selected_rows(int /*long
* @param selection cast=(GtkTreeSelection *)
* @param path cast=(GtkTreePath *)
*/
@@ -25525,7 +25559,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_selection_path_is_selected(selection, path);
-@@ -11777,8 +11777,8 @@ public static final boolean gtk_tree_selection_path_is_selected(int /*long*/ sel
+@@ -11810,8 +11810,8 @@ public static final boolean gtk_tree_selection_path_is_selected(int /*long*/ sel
}
}
/** @param selection cast=(GtkTreeSelection *) */
@@ -25536,7 +25570,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_selection_select_all(selection);
-@@ -11790,8 +11790,8 @@ public static final void gtk_tree_selection_select_all(int /*long*/ selection) {
+@@ -11823,8 +11823,8 @@ public static final void gtk_tree_selection_select_all(int /*long*/ selection) {
* @param selection cast=(GtkTreeSelection *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25547,7 +25581,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_selection_select_iter(selection, iter);
-@@ -11804,8 +11804,8 @@ public static final void gtk_tree_selection_select_iter(int /*long*/ selection,
+@@ -11837,8 +11837,8 @@ public static final void gtk_tree_selection_select_iter(int /*long*/ selection,
* @param func cast=(GtkTreeSelectionForeachFunc)
* @param data cast=(gpointer)
*/
@@ -25558,7 +25592,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_selection_selected_foreach(selection, func, data);
-@@ -11817,8 +11817,8 @@ public static final void gtk_tree_selection_selected_foreach(int /*long*/ select
+@@ -11850,8 +11850,8 @@ public static final void gtk_tree_selection_selected_foreach(int /*long*/ select
* @param selection cast=(GtkTreeSelection *)
* @param mode cast=(GtkSelectionMode)
*/
@@ -25569,7 +25603,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_selection_set_mode(selection, mode);
-@@ -11827,8 +11827,8 @@ public static final void gtk_tree_selection_set_mode(int /*long*/ selection, int
+@@ -11860,8 +11860,8 @@ public static final void gtk_tree_selection_set_mode(int /*long*/ selection, int
}
}
/** @param selection cast=(GtkTreeSelection *) */
@@ -25580,7 +25614,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_selection_unselect_all(selection);
-@@ -11840,8 +11840,8 @@ public static final void gtk_tree_selection_unselect_all(int /*long*/ selection)
+@@ -11873,8 +11873,8 @@ public static final void gtk_tree_selection_unselect_all(int /*long*/ selection)
* @param selection cast=(GtkTreeSelection *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25591,7 +25625,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_selection_unselect_iter(selection, iter);
-@@ -11854,8 +11854,8 @@ public static final void gtk_tree_selection_unselect_iter(int /*long*/ selection
+@@ -11887,8 +11887,8 @@ public static final void gtk_tree_selection_unselect_iter(int /*long*/ selection
* @param iter cast=(GtkTreeIter *)
* @param parent cast=(GtkTreeIter *)
*/
@@ -25602,7 +25636,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_store_append(store, iter, parent);
-@@ -11864,8 +11864,8 @@ public static final void gtk_tree_store_append(int /*long*/ store, int /*long*/
+@@ -11897,8 +11897,8 @@ public static final void gtk_tree_store_append(int /*long*/ store, int /*long*/
}
}
/** @param store cast=(GtkTreeStore *) */
@@ -25613,7 +25647,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_store_clear(store);
-@@ -11879,8 +11879,8 @@ public static final void gtk_tree_store_clear(int /*long*/ store) {
+@@ -11912,8 +11912,8 @@ public static final void gtk_tree_store_clear(int /*long*/ store) {
* @param parent cast=(GtkTreeIter *)
* @param position cast=(gint)
*/
@@ -25624,7 +25658,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_store_insert(store, iter, parent, position);
-@@ -11889,8 +11889,8 @@ public static final void gtk_tree_store_insert(int /*long*/ store, int /*long*/
+@@ -11922,8 +11922,8 @@ public static final void gtk_tree_store_insert(int /*long*/ store, int /*long*/
}
}
/** @param types cast=(GType *) */
@@ -25635,7 +25669,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_store_newv(numColumns, types);
-@@ -11902,8 +11902,8 @@ public static final int /*long*/ gtk_tree_store_newv(int numColumns, int /*long*
+@@ -11935,8 +11935,8 @@ public static final int /*long*/ gtk_tree_store_newv(int numColumns, int /*long*
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25646,7 +25680,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_store_remove(store, iter);
-@@ -11915,8 +11915,8 @@ public static final void gtk_tree_store_remove(int /*long*/ store, int /*long*/
+@@ -11948,8 +11948,8 @@ public static final void gtk_tree_store_remove(int /*long*/ store, int /*long*/
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25657,7 +25691,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -11928,8 +11928,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
+@@ -11961,8 +11961,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25668,7 +25702,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -11941,8 +11941,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
+@@ -11974,8 +11974,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25679,7 +25713,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -11955,8 +11955,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
+@@ -11988,8 +11988,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param iter cast=(GtkTreeIter *)
* @param value flags=no_out
*/
@@ -25690,7 +25724,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -11968,8 +11968,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
+@@ -12001,8 +12001,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25701,7 +25735,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -11981,8 +11981,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
+@@ -12014,8 +12014,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
@@ -25712,7 +25746,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_create_row_drag_icon(view, path);
-@@ -11994,8 +11994,8 @@ public static final int /*long*/ gtk_tree_view_create_row_drag_icon(int /*long*/
+@@ -12027,8 +12027,8 @@ public static final int /*long*/ gtk_tree_view_create_row_drag_icon(int /*long*/
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
@@ -25723,7 +25757,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_collapse_row(view, path);
-@@ -12009,8 +12009,8 @@ public static final boolean gtk_tree_view_collapse_row(int /*long*/ view, int /*
+@@ -12042,8 +12042,8 @@ public static final boolean gtk_tree_view_collapse_row(int /*long*/ view, int /*
* @param attribute cast=(const gchar *)
* @param column cast=(gint)
*/
@@ -25734,7 +25768,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_column_add_attribute(treeColumn, cellRenderer, attribute, column);
-@@ -12025,8 +12025,8 @@ public static final void gtk_tree_view_column_add_attribute(int /*long*/ treeCol
+@@ -12058,8 +12058,8 @@ public static final void gtk_tree_view_column_add_attribute(int /*long*/ treeCol
* @param start_pos cast=(gint *)
* @param width cast=(gint *)
*/
@@ -25745,7 +25779,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_column_cell_get_position(tree_column, cell_renderer, start_pos, width);
-@@ -12042,8 +12042,8 @@ public static final boolean gtk_tree_view_column_cell_get_position(int /*long*/
+@@ -12075,8 +12075,8 @@ public static final boolean gtk_tree_view_column_cell_get_position(int /*long*/
* @param width cast=(gint *)
* @param height cast=(gint *)
*/
@@ -25756,7 +25790,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_column_cell_get_size(tree_column, cell_area, x_offset, y_offset, width, height);
-@@ -12056,8 +12056,8 @@ public static final void gtk_tree_view_column_cell_get_size(int /*long*/ tree_co
+@@ -12089,8 +12089,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 *)
*/
@@ -25767,7 +25801,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_column_cell_set_cell_data(tree_column, tree_model, iter, is_expander, is_expanded);
-@@ -12066,8 +12066,8 @@ public static final void gtk_tree_view_column_cell_set_cell_data(int /*long*/ tr
+@@ -12099,8 +12099,8 @@ public static final void gtk_tree_view_column_cell_set_cell_data(int /*long*/ tr
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -25778,7 +25812,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_column_clear(tree_column);
-@@ -12079,8 +12079,8 @@ public static final void gtk_tree_view_column_clear(int /*long*/ tree_column) {
+@@ -12112,8 +12112,8 @@ public static final void gtk_tree_view_column_clear(int /*long*/ tree_column) {
* @method flags=dynamic
* @param tree_column cast=(GtkTreeViewColumn *)
*/
@@ -25789,7 +25823,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_column_get_cell_renderers(tree_column);
-@@ -12089,8 +12089,8 @@ public static final int /*long*/ gtk_tree_view_column_get_cell_renderers(int /*l
+@@ -12122,8 +12122,8 @@ public static final int /*long*/ gtk_tree_view_column_get_cell_renderers(int /*l
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -25800,7 +25834,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_column_get_fixed_width(column);
-@@ -12099,8 +12099,8 @@ public static final int gtk_tree_view_column_get_fixed_width(int /*long*/ column
+@@ -12132,8 +12132,8 @@ public static final int gtk_tree_view_column_get_fixed_width(int /*long*/ column
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -25811,7 +25845,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_column_get_reorderable(column);
-@@ -12109,8 +12109,8 @@ public static final boolean gtk_tree_view_column_get_reorderable(int /*long*/ co
+@@ -12142,8 +12142,8 @@ public static final boolean gtk_tree_view_column_get_reorderable(int /*long*/ co
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -25822,7 +25856,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_column_get_resizable(column);
-@@ -12119,8 +12119,8 @@ public static final boolean gtk_tree_view_column_get_resizable(int /*long*/ colu
+@@ -12152,8 +12152,8 @@ public static final boolean gtk_tree_view_column_get_resizable(int /*long*/ colu
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -25833,7 +25867,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_column_get_sizing(tree_column);
-@@ -12129,8 +12129,8 @@ public static final int gtk_tree_view_column_get_sizing(int /*long*/ tree_column
+@@ -12162,8 +12162,8 @@ public static final int gtk_tree_view_column_get_sizing(int /*long*/ tree_column
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -25844,7 +25878,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_column_get_spacing(tree_column);
-@@ -12139,8 +12139,8 @@ public static final int gtk_tree_view_column_get_spacing(int /*long*/ tree_colum
+@@ -12172,8 +12172,8 @@ public static final int gtk_tree_view_column_get_spacing(int /*long*/ tree_colum
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -25855,7 +25889,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_column_get_visible(column);
-@@ -12149,8 +12149,8 @@ public static final boolean gtk_tree_view_column_get_visible(int /*long*/ column
+@@ -12182,8 +12182,8 @@ public static final boolean gtk_tree_view_column_get_visible(int /*long*/ column
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -25866,7 +25900,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_column_get_sort_indicator(tree_column);
-@@ -12159,8 +12159,8 @@ public static final boolean gtk_tree_view_column_get_sort_indicator(int /*long*/
+@@ -12192,8 +12192,8 @@ public static final boolean gtk_tree_view_column_get_sort_indicator(int /*long*/
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -25877,7 +25911,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_column_get_sort_order(tree_column);
-@@ -12169,8 +12169,8 @@ public static final int gtk_tree_view_column_get_sort_order(int /*long*/ tree_co
+@@ -12202,8 +12202,8 @@ public static final int gtk_tree_view_column_get_sort_order(int /*long*/ tree_co
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -25888,7 +25922,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_column_get_width(column);
-@@ -12178,8 +12178,8 @@ public static final int gtk_tree_view_column_get_width(int /*long*/ column) {
+@@ -12211,8 +12211,8 @@ public static final int gtk_tree_view_column_get_width(int /*long*/ column) {
lock.unlock();
}
}
@@ -25899,7 +25933,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_column_new();
-@@ -12192,8 +12192,8 @@ public static final int /*long*/ gtk_tree_view_column_new() {
+@@ -12225,8 +12225,8 @@ public static final int /*long*/ gtk_tree_view_column_new() {
* @param cell_renderer cast=(GtkCellRenderer *)
* @param expand cast=(gboolean)
*/
@@ -25910,7 +25944,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_column_pack_start(tree_column, cell_renderer, expand);
-@@ -12206,8 +12206,8 @@ public static final void gtk_tree_view_column_pack_start(int /*long*/ tree_colum
+@@ -12239,8 +12239,8 @@ public static final void gtk_tree_view_column_pack_start(int /*long*/ tree_colum
* @param cell_renderer cast=(GtkCellRenderer *)
* @param expand cast=(gboolean)
*/
@@ -25921,7 +25955,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_column_pack_end(tree_column, cell_renderer, expand);
-@@ -12216,8 +12216,8 @@ public static final void gtk_tree_view_column_pack_end(int /*long*/ tree_column,
+@@ -12249,8 +12249,8 @@ public static final void gtk_tree_view_column_pack_end(int /*long*/ tree_column,
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -25932,7 +25966,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_column_set_alignment(tree_column, xalign);
-@@ -12232,8 +12232,8 @@ public static final void gtk_tree_view_column_set_alignment(int /*long*/ tree_co
+@@ -12265,8 +12265,8 @@ public static final void gtk_tree_view_column_set_alignment(int /*long*/ tree_co
* @param func_data cast=(gpointer)
* @param destroy cast=(GDestroyNotify)
*/
@@ -25943,7 +25977,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_column_set_cell_data_func(tree_column, cell_renderer, func, func_data, destroy);
-@@ -12245,8 +12245,8 @@ public static final void gtk_tree_view_column_set_cell_data_func(int /*long*/ tr
+@@ -12278,8 +12278,8 @@ public static final void gtk_tree_view_column_set_cell_data_func(int /*long*/ tr
* @param column cast=(GtkTreeViewColumn *)
* @param clickable cast=(gboolean)
*/
@@ -25954,7 +25988,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_column_set_clickable(column, clickable);
-@@ -12258,8 +12258,8 @@ public static final void gtk_tree_view_column_set_clickable(int /*long*/ column,
+@@ -12291,8 +12291,8 @@ public static final void gtk_tree_view_column_set_clickable(int /*long*/ column,
* @param column cast=(GtkTreeViewColumn *)
* @param fixed_width cast=(gint)
*/
@@ -25965,7 +25999,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_column_set_fixed_width(column, fixed_width);
-@@ -12271,8 +12271,8 @@ public static final void gtk_tree_view_column_set_fixed_width(int /*long*/ colum
+@@ -12304,8 +12304,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)
*/
@@ -25976,7 +26010,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_column_set_min_width(tree_column, min_width);
-@@ -12284,8 +12284,8 @@ public static final void gtk_tree_view_column_set_min_width(int /*long*/ tree_co
+@@ -12317,8 +12317,8 @@ public static final void gtk_tree_view_column_set_min_width(int /*long*/ tree_co
* @param column cast=(GtkTreeViewColumn *)
* @param reorderable cast=(gboolean)
*/
@@ -25987,7 +26021,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_column_set_reorderable(column, reorderable);
-@@ -12297,8 +12297,8 @@ public static final void gtk_tree_view_column_set_reorderable(int /*long*/ colum
+@@ -12330,8 +12330,8 @@ public static final void gtk_tree_view_column_set_reorderable(int /*long*/ colum
* @param column cast=(GtkTreeViewColumn *)
* @param resizable cast=(gboolean)
*/
@@ -25998,7 +26032,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_column_set_resizable(column, resizable);
-@@ -12310,8 +12310,8 @@ public static final void gtk_tree_view_column_set_resizable(int /*long*/ column,
+@@ -12343,8 +12343,8 @@ public static final void gtk_tree_view_column_set_resizable(int /*long*/ column,
* @param column cast=(GtkTreeViewColumn *)
* @param type cast=(GtkTreeViewColumnSizing)
*/
@@ -26009,7 +26043,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_column_set_sizing(column, type);
-@@ -12323,8 +12323,8 @@ public static final void gtk_tree_view_column_set_sizing(int /*long*/ column, in
+@@ -12356,8 +12356,8 @@ public static final void gtk_tree_view_column_set_sizing(int /*long*/ column, in
* @param tree_column cast=(GtkTreeViewColumn *)
* @param setting cast=(gboolean)
*/
@@ -26020,7 +26054,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_column_set_sort_indicator(tree_column, setting);
-@@ -12336,8 +12336,8 @@ public static final void gtk_tree_view_column_set_sort_indicator(int /*long*/ tr
+@@ -12369,8 +12369,8 @@ public static final void gtk_tree_view_column_set_sort_indicator(int /*long*/ tr
* @param tree_column cast=(GtkTreeViewColumn *)
* @param order cast=(GtkSortType)
*/
@@ -26031,7 +26065,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_column_set_sort_order(tree_column, order);
-@@ -12349,8 +12349,8 @@ public static final void gtk_tree_view_column_set_sort_order(int /*long*/ tree_c
+@@ -12382,8 +12382,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 *)
*/
@@ -26042,7 +26076,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_column_set_title(tree_column, title);
-@@ -12359,8 +12359,8 @@ public static final void gtk_tree_view_column_set_title(int /*long*/ tree_column
+@@ -12392,8 +12392,8 @@ public static final void gtk_tree_view_column_set_title(int /*long*/ tree_column
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -26053,7 +26087,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_column_set_visible(tree_column, visible);
-@@ -12372,8 +12372,8 @@ public static final void gtk_tree_view_column_set_visible (int /*long*/ tree_col
+@@ -12405,8 +12405,8 @@ public static final void gtk_tree_view_column_set_visible (int /*long*/ tree_col
* @param tree_column cast=(GtkTreeViewColumn *)
* @param widget cast=(GtkWidget *)
*/
@@ -26064,7 +26098,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_column_set_widget(tree_column, widget);
-@@ -12385,8 +12385,8 @@ public static final void gtk_tree_view_column_set_widget(int /*long*/ tree_colum
+@@ -12418,8 +12418,8 @@ public static final void gtk_tree_view_column_set_widget(int /*long*/ tree_colum
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
@@ -26075,7 +26109,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_set_drag_dest_row(view, path, pos);
-@@ -12395,8 +12395,8 @@ public static final void gtk_tree_view_set_drag_dest_row(int /*long*/ view, int
+@@ -12428,8 +12428,8 @@ public static final void gtk_tree_view_set_drag_dest_row(int /*long*/ view, int
}
}
/** @param view cast=(GtkTreeView *) */
@@ -26086,7 +26120,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_set_enable_search(view, enable_search);
-@@ -12409,8 +12409,8 @@ public static final void gtk_tree_view_set_enable_search (int /*long*/ view, boo
+@@ -12442,8 +12442,8 @@ public static final void gtk_tree_view_set_enable_search (int /*long*/ view, boo
* @param path cast=(GtkTreePath *)
* @param open_all cast=(gboolean)
*/
@@ -26097,7 +26131,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_expand_row(view, path, open_all);
-@@ -12424,8 +12424,8 @@ public static final boolean gtk_tree_view_expand_row(int /*long*/ view, int /*lo
+@@ -12457,8 +12457,8 @@ public static final boolean gtk_tree_view_expand_row(int /*long*/ view, int /*lo
* @param column cast=(GtkTreeViewColumn *)
* @param rect cast=(GdkRectangle *)
*/
@@ -26108,7 +26142,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_get_background_area(tree_view, path, column, rect);
-@@ -12434,8 +12434,8 @@ public static final void gtk_tree_view_get_background_area(int /*long*/ tree_vie
+@@ -12467,8 +12467,8 @@ public static final void gtk_tree_view_get_background_area(int /*long*/ tree_vie
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -26119,7 +26153,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_get_bin_window(tree_view);
-@@ -12449,8 +12449,8 @@ public static final int /*long*/ gtk_tree_view_get_bin_window(int /*long*/ tree_
+@@ -12482,8 +12482,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
*/
@@ -26130,7 +26164,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_get_cell_area(tree_view, path, column, rect);
-@@ -12459,8 +12459,8 @@ public static final void gtk_tree_view_get_cell_area(int /*long*/ tree_view, int
+@@ -12492,8 +12492,8 @@ public static final void gtk_tree_view_get_cell_area(int /*long*/ tree_view, int
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -26141,7 +26175,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_get_expander_column(tree_view);
-@@ -12472,8 +12472,8 @@ public static final int /*long*/gtk_tree_view_get_expander_column(int /*long*/ t
+@@ -12505,8 +12505,8 @@ public static final int /*long*/gtk_tree_view_get_expander_column(int /*long*/ t
* @param tree_view cast=(GtkTreeView *)
* @param n cast=(gint)
*/
@@ -26152,7 +26186,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_get_column(tree_view, n);
-@@ -12482,8 +12482,8 @@ public static final int /*long*/ gtk_tree_view_get_column(int /*long*/ tree_view
+@@ -12515,8 +12515,8 @@ public static final int /*long*/ gtk_tree_view_get_column(int /*long*/ tree_view
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -26163,7 +26197,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_get_columns(tree_view);
-@@ -12496,8 +12496,8 @@ public static final int /*long*/ gtk_tree_view_get_columns(int /*long*/ tree_vie
+@@ -12529,8 +12529,8 @@ public static final int /*long*/ gtk_tree_view_get_columns(int /*long*/ tree_vie
* @param path cast=(GtkTreePath **)
* @param focus_column cast=(GtkTreeViewColumn **)
*/
@@ -26174,7 +26208,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_get_cursor(tree_view, path, focus_column);
-@@ -12506,8 +12506,8 @@ public static final void gtk_tree_view_get_cursor(int /*long*/ tree_view, int /*
+@@ -12539,8 +12539,8 @@ public static final void gtk_tree_view_get_cursor(int /*long*/ tree_view, int /*
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -26185,7 +26219,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_get_headers_visible(tree_view);
-@@ -12524,8 +12524,8 @@ public static final boolean gtk_tree_view_get_headers_visible(int /*long*/ tree_
+@@ -12557,8 +12557,8 @@ public static final boolean gtk_tree_view_get_headers_visible(int /*long*/ tree_
* @param cell_x cast=(gint *)
* @param cell_y cast=(gint *)
*/
@@ -26196,7 +26230,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_get_path_at_pos(tree_view, x, y, path, column, cell_x, cell_y);
-@@ -12534,8 +12534,8 @@ public static final boolean gtk_tree_view_get_path_at_pos(int /*long*/ tree_view
+@@ -12567,8 +12567,8 @@ public static final boolean gtk_tree_view_get_path_at_pos(int /*long*/ tree_view
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -26207,7 +26241,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_get_rules_hint(tree_view);
-@@ -12544,8 +12544,8 @@ public static final boolean gtk_tree_view_get_rules_hint(int /*long*/ tree_view)
+@@ -12577,8 +12577,8 @@ public static final boolean gtk_tree_view_get_rules_hint(int /*long*/ tree_view)
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -26218,7 +26252,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_get_selection(tree_view);
-@@ -12557,8 +12557,8 @@ public static final int /*long*/ gtk_tree_view_get_selection(int /*long*/ tree_v
+@@ -12590,8 +12590,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
*/
@@ -26229,7 +26263,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_get_visible_rect(tree_view, visible_rect);
-@@ -12571,8 +12571,8 @@ public static final void gtk_tree_view_get_visible_rect(int /*long*/ tree_view,
+@@ -12604,8 +12604,8 @@ public static final void gtk_tree_view_get_visible_rect(int /*long*/ tree_view,
* @param column cast=(GtkTreeViewColumn *)
* @param position cast=(gint)
*/
@@ -26240,7 +26274,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_insert_column(tree_view, column, position);
-@@ -12585,8 +12585,8 @@ public static final int gtk_tree_view_insert_column(int /*long*/ tree_view, int
+@@ -12618,8 +12618,8 @@ public static final int gtk_tree_view_insert_column(int /*long*/ tree_view, int
* @param column cast=(GtkTreeViewColumn *)
* @param base_column cast=(GtkTreeViewColumn *)
*/
@@ -26251,7 +26285,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_move_column_after(tree_view, column, base_column);
-@@ -12595,8 +12595,8 @@ public static final void gtk_tree_view_move_column_after(int /*long*/ tree_view,
+@@ -12628,8 +12628,8 @@ public static final void gtk_tree_view_move_column_after(int /*long*/ tree_view,
}
}
/** @param model cast=(GtkTreeModel *) */
@@ -26262,7 +26296,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_new_with_model(model);
-@@ -12608,8 +12608,8 @@ public static final int /*long*/ gtk_tree_view_new_with_model(int /*long*/ model
+@@ -12641,8 +12641,8 @@ public static final int /*long*/ gtk_tree_view_new_with_model(int /*long*/ model
* @param tree_view cast=(GtkTreeView *)
* @param column cast=(GtkTreeViewColumn *)
*/
@@ -26273,7 +26307,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_remove_column(tree_view, column);
-@@ -12621,8 +12621,8 @@ public static final void gtk_tree_view_remove_column(int /*long*/ tree_view, int
+@@ -12654,8 +12654,8 @@ public static final void gtk_tree_view_remove_column(int /*long*/ tree_view, int
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
@@ -26284,7 +26318,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_tree_view_row_expanded(view, path);
-@@ -12638,8 +12638,8 @@ public static final boolean gtk_tree_view_row_expanded(int /*long*/ view, int /*
+@@ -12671,8 +12671,8 @@ public static final boolean gtk_tree_view_row_expanded(int /*long*/ view, int /*
* @param row_aligh cast=(gfloat)
* @param column_align cast=(gfloat)
*/
@@ -26295,7 +26329,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_scroll_to_cell(tree_view, path, column, use_align, row_aligh, column_align);
-@@ -12652,8 +12652,8 @@ public static final void gtk_tree_view_scroll_to_cell(int /*long*/ tree_view, in
+@@ -12685,8 +12685,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)
*/
@@ -26306,7 +26340,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_scroll_to_point(tree_view, tree_x, tree_y);
-@@ -12666,8 +12666,8 @@ public static final void gtk_tree_view_scroll_to_point (int /*long*/ tree_view,
+@@ -12699,8 +12699,8 @@ public static final void gtk_tree_view_scroll_to_point (int /*long*/ tree_view,
* @param path cast=(GtkTreePath *)
* @param focus_column cast=(GtkTreeViewColumn *)
*/
@@ -26317,7 +26351,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_set_cursor(tree_view, path, focus_column, start_editing);
-@@ -12679,8 +12679,8 @@ public static final void gtk_tree_view_set_cursor(int /*long*/ tree_view, int /*
+@@ -12712,8 +12712,8 @@ public static final void gtk_tree_view_set_cursor(int /*long*/ tree_view, int /*
* @method flags=dynamic
* @param tree_view cast=(GtkTreeView*)
*/
@@ -26328,7 +26362,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_set_grid_lines(tree_view, grid_lines);
-@@ -12692,8 +12692,8 @@ public static final void gtk_tree_view_set_grid_lines(int /*long*/ tree_view, in
+@@ -12725,8 +12725,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)
*/
@@ -26339,7 +26373,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_set_headers_visible(tree_view, visible);
-@@ -12705,8 +12705,8 @@ public static final void gtk_tree_view_set_headers_visible(int /*long*/ tree_vie
+@@ -12738,8 +12738,8 @@ public static final void gtk_tree_view_set_headers_visible(int /*long*/ tree_vie
* @param tree_view cast=(GtkTreeView *)
* @param model cast=(GtkTreeModel *)
*/
@@ -26350,7 +26384,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_set_model(tree_view, model);
-@@ -12715,8 +12715,8 @@ public static final void gtk_tree_view_set_model(int /*long*/ tree_view, int /*l
+@@ -12748,8 +12748,8 @@ public static final void gtk_tree_view_set_model(int /*long*/ tree_view, int /*l
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -26361,7 +26395,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_set_rules_hint(tree_view, setting);
-@@ -12728,8 +12728,8 @@ public static final void gtk_tree_view_set_rules_hint(int /*long*/ tree_view, bo
+@@ -12761,8 +12761,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)
*/
@@ -26372,7 +26406,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_set_search_column(tree_view, column);
-@@ -12738,8 +12738,8 @@ public static final void gtk_tree_view_set_search_column(int /*long*/ tree_view,
+@@ -12771,8 +12771,8 @@ public static final void gtk_tree_view_set_search_column(int /*long*/ tree_view,
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -26383,7 +26417,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_unset_rows_drag_dest(tree_view);
-@@ -12751,8 +12751,8 @@ public static final void gtk_tree_view_unset_rows_drag_dest(int /*long*/ tree_vi
+@@ -12784,8 +12784,8 @@ public static final void gtk_tree_view_unset_rows_drag_dest(int /*long*/ tree_vi
* @method flags=dynamic
* @param tree_view cast=(GtkTreeView *)
*/
@@ -26394,18 +26428,18 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_tree_view_widget_to_tree_coords(tree_view, wx, wy, tx, ty);
-@@ -12764,8 +12764,8 @@ public static final void gtk_tree_view_widget_to_tree_coords(int /*long*/ tree_v
+@@ -12797,8 +12797,8 @@ public static final void gtk_tree_view_widget_to_tree_coords(int /*long*/ tree_v
* @method flags=dynamic
* @param tree_view cast=(GtkTreeView *)
*/
--public static final native void _gtk_tree_view_convert_widget_to_bin_window_coords(int /*long*/ tree_view, int wx, int wy, int[] tx, int[] ty);
--public static final void gtk_tree_view_convert_widget_to_bin_window_coords(int /*long*/ tree_view, int wx, int wy, int[] tx, int[] ty) {
-+public static final native void _gtk_tree_view_convert_widget_to_bin_window_coords(long /*int*/ tree_view, int wx, int wy, int[] tx, int[] ty);
-+public static final void gtk_tree_view_convert_widget_to_bin_window_coords(long /*int*/ tree_view, int wx, int wy, int[] tx, int[] ty) {
+-public static final native void _gtk_tree_view_convert_bin_window_to_tree_coords(int /*long*/ tree_view, int bx, int by, int[] tx, int[] ty);
+-public static final void gtk_tree_view_convert_bin_window_to_tree_coords(int /*long*/ tree_view, int bx, int by, int[] tx, int[] ty) {
++public static final native void _gtk_tree_view_convert_bin_window_to_tree_coords(long /*int*/ tree_view, int bx, int by, int[] tx, int[] ty);
++public static final void gtk_tree_view_convert_bin_window_to_tree_coords(long /*int*/ tree_view, int bx, int by, int[] tx, int[] ty) {
lock.lock();
try {
- _gtk_tree_view_convert_widget_to_bin_window_coords(tree_view, wx, wy, tx, ty);
-@@ -12777,8 +12777,8 @@ public static final void gtk_tree_view_convert_widget_to_bin_window_coords(int /
+ _gtk_tree_view_convert_bin_window_to_tree_coords(tree_view, bx, by, tx, ty);
+@@ -12810,8 +12810,8 @@ public static final void gtk_tree_view_convert_bin_window_to_tree_coords(int /*l
* @param homogeneous cast=(gboolean)
* @param spacing cast=(gint)
*/
@@ -26416,7 +26450,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_vbox_new(homogeneous, spacing);
-@@ -12787,8 +12787,8 @@ public static final int /*long*/ gtk_vbox_new(boolean homogeneous, int spacing)
+@@ -12820,8 +12820,8 @@ public static final int /*long*/ gtk_vbox_new(boolean homogeneous, int spacing)
}
}
/** @param viewport cast=(GtkViewport *) */
@@ -26427,7 +26461,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_viewport_get_shadow_type(viewport);
-@@ -12800,8 +12800,8 @@ public static final int gtk_viewport_get_shadow_type(int /*long*/ viewport) {
+@@ -12833,8 +12833,8 @@ public static final int gtk_viewport_get_shadow_type(int /*long*/ viewport) {
* @param viewport cast=(GtkViewport *)
* @param type cast=(GtkShadowType)
*/
@@ -26438,7 +26472,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_viewport_set_shadow_type(viewport, type);
-@@ -12810,8 +12810,8 @@ public static final void gtk_viewport_set_shadow_type(int /*long*/ viewport, int
+@@ -12843,8 +12843,8 @@ public static final void gtk_viewport_set_shadow_type(int /*long*/ viewport, int
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -26449,7 +26483,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_vscale_new(adjustment);
-@@ -12820,8 +12820,8 @@ public static final int /*long*/ gtk_vscale_new(int /*long*/ adjustment) {
+@@ -12853,8 +12853,8 @@ public static final int /*long*/ gtk_vscale_new(int /*long*/ adjustment) {
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -26460,7 +26494,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_vscrollbar_new(adjustment);
-@@ -12829,8 +12829,8 @@ public static final int /*long*/ gtk_vscrollbar_new(int /*long*/ adjustment) {
+@@ -12862,8 +12862,8 @@ public static final int /*long*/ gtk_vscrollbar_new(int /*long*/ adjustment) {
lock.unlock();
}
}
@@ -26471,7 +26505,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_vseparator_new();
-@@ -12845,8 +12845,8 @@ public static final int /*long*/ gtk_vseparator_new() {
+@@ -12878,8 +12878,8 @@ public static final int /*long*/ gtk_vseparator_new() {
* @param accel_key cast=(guint)
* @param accel_mods cast=(GdkModifierType)
*/
@@ -26482,7 +26516,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_add_accelerator(widget, accel_signal, accel_group, accel_key, accel_mods, accel_flags);
-@@ -12858,8 +12858,8 @@ public static final void gtk_widget_add_accelerator(int /*long*/ widget, byte[]
+@@ -12891,8 +12891,8 @@ public static final void gtk_widget_add_accelerator(int /*long*/ widget, byte[]
* @param widget cast=(GtkWidget *)
* @param events cast=(gint)
*/
@@ -26493,7 +26527,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_add_events(widget, events);
-@@ -12868,8 +12868,8 @@ public static final void gtk_widget_add_events(int /*long*/ widget, int events)
+@@ -12901,8 +12901,8 @@ public static final void gtk_widget_add_events(int /*long*/ widget, int events)
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26504,7 +26538,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_widget_child_focus(widget, direction);
-@@ -12881,8 +12881,8 @@ public static final boolean gtk_widget_child_focus(int /*long*/ widget, int dire
+@@ -12914,8 +12914,8 @@ public static final boolean gtk_widget_child_focus(int /*long*/ widget, int dire
* @param widget cast=(GtkWidget *)
* @param text cast=(const gchar *)
*/
@@ -26515,7 +26549,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_widget_create_pango_layout(widget, text);
-@@ -12894,8 +12894,8 @@ public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ wid
+@@ -12927,8 +12927,8 @@ public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ wid
* @param widget cast=(GtkWidget *)
* @param text cast=(const gchar *)
*/
@@ -26526,7 +26560,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_widget_create_pango_layout(widget, text);
-@@ -12904,8 +12904,8 @@ public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ wid
+@@ -12937,8 +12937,8 @@ public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ wid
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26537,7 +26571,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_destroy(widget);
-@@ -12917,8 +12917,8 @@ public static final void gtk_widget_destroy(int /*long*/ widget) {
+@@ -12950,8 +12950,8 @@ public static final void gtk_widget_destroy(int /*long*/ widget) {
* @param widget cast=(GtkWidget *)
* @param event cast=(GdkEvent *)
*/
@@ -26548,7 +26582,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_widget_event(widget, event);
-@@ -12927,8 +12927,8 @@ public static final boolean gtk_widget_event(int /*long*/ widget, int /*long*/ e
+@@ -12960,8 +12960,8 @@ public static final boolean gtk_widget_event(int /*long*/ widget, int /*long*/ e
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26559,7 +26593,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_widget_get_accessible(widget);
-@@ -12937,8 +12937,8 @@ public static final int /*long*/ gtk_widget_get_accessible (int /*long*/ widget)
+@@ -12970,8 +12970,8 @@ public static final int /*long*/ gtk_widget_get_accessible (int /*long*/ widget)
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26570,7 +26604,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_widget_get_child_visible(widget);
-@@ -12955,8 +12955,8 @@ public static final int gtk_widget_get_default_direction() {
+@@ -12988,8 +12988,8 @@ public static final int gtk_widget_get_default_direction() {
lock.unlock();
}
}
@@ -26581,7 +26615,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_widget_get_default_style();
-@@ -12965,8 +12965,8 @@ public static final int /*long*/ gtk_widget_get_default_style() {
+@@ -12998,8 +12998,8 @@ public static final int /*long*/ gtk_widget_get_default_style() {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26592,7 +26626,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_widget_get_direction(widget);
-@@ -12975,8 +12975,8 @@ public static final int gtk_widget_get_direction(int /*long*/ widget) {
+@@ -13008,8 +13008,8 @@ public static final int gtk_widget_get_direction(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26603,7 +26637,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_widget_get_events(widget);
-@@ -12985,8 +12985,8 @@ public static final int gtk_widget_get_events(int /*long*/ widget) {
+@@ -13018,8 +13018,8 @@ public static final int gtk_widget_get_events(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26614,7 +26648,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_widget_get_modifier_style(widget);
-@@ -12995,8 +12995,8 @@ public static final int /*long*/ gtk_widget_get_modifier_style(int /*long*/ widg
+@@ -13028,8 +13028,8 @@ public static final int /*long*/ gtk_widget_get_modifier_style(int /*long*/ widg
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26625,7 +26659,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_widget_get_pango_context(widget);
-@@ -13005,8 +13005,8 @@ public static final int /*long*/ gtk_widget_get_pango_context(int /*long*/ widge
+@@ -13038,8 +13038,8 @@ public static final int /*long*/ gtk_widget_get_pango_context(int /*long*/ widge
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26636,7 +26670,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_widget_get_parent(widget);
-@@ -13015,8 +13015,8 @@ public static final int /*long*/ gtk_widget_get_parent(int /*long*/ widget) {
+@@ -13048,8 +13048,8 @@ public static final int /*long*/ gtk_widget_get_parent(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26647,7 +26681,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_widget_get_parent_window(widget);
-@@ -13025,8 +13025,8 @@ public static final int /*long*/ gtk_widget_get_parent_window(int /*long*/ widge
+@@ -13058,8 +13058,8 @@ public static final int /*long*/ gtk_widget_get_parent_window(int /*long*/ widge
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26658,7 +26692,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_widget_get_style(widget);
-@@ -13039,8 +13039,8 @@ public static final int /*long*/ gtk_widget_get_style(int /*long*/ widget) {
+@@ -13072,8 +13072,8 @@ public static final int /*long*/ gtk_widget_get_style(int /*long*/ widget) {
* @param width cast=(gint *)
* @param height cast=(gint *)
*/
@@ -26669,7 +26703,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_get_size_request(widget, width, height);
-@@ -13049,8 +13049,8 @@ public static final void gtk_widget_get_size_request(int /*long*/ widget, int []
+@@ -13082,8 +13082,8 @@ public static final void gtk_widget_get_size_request(int /*long*/ widget, int []
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26680,7 +26714,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_widget_get_toplevel(widget);
-@@ -13059,8 +13059,8 @@ public static final int /*long*/ gtk_widget_get_toplevel (int /*long*/ widget) {
+@@ -13092,8 +13092,8 @@ public static final int /*long*/ gtk_widget_get_toplevel (int /*long*/ widget) {
}
}
/** @method flags=dynamic */
@@ -26691,7 +26725,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_widget_get_tooltip_text(widget);
-@@ -13069,8 +13069,8 @@ public static final int /*long*/ gtk_widget_get_tooltip_text (int /*long*/ widge
+@@ -13102,8 +13102,8 @@ public static final int /*long*/ gtk_widget_get_tooltip_text (int /*long*/ widge
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26702,7 +26736,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_grab_focus(widget);
-@@ -13079,8 +13079,8 @@ public static final void gtk_widget_grab_focus(int /*long*/ widget) {
+@@ -13112,8 +13112,8 @@ public static final void gtk_widget_grab_focus(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26713,7 +26747,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_hide(widget);
-@@ -13092,8 +13092,8 @@ public static final void gtk_widget_hide(int /*long*/ widget) {
+@@ -13125,8 +13125,8 @@ public static final void gtk_widget_hide(int /*long*/ widget) {
* @method flags=dynamic
* @param widget cast=(GtkWidget *)
*/
@@ -26724,7 +26758,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_widget_is_composited(widget);
-@@ -13102,8 +13102,8 @@ public static final boolean gtk_widget_is_composited(int /*long*/ widget) {
+@@ -13135,8 +13135,8 @@ public static final boolean gtk_widget_is_composited(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26735,7 +26769,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_widget_is_focus(widget);
-@@ -13112,8 +13112,8 @@ public static final boolean gtk_widget_is_focus(int /*long*/ widget) {
+@@ -13145,8 +13145,8 @@ public static final boolean gtk_widget_is_focus(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26746,7 +26780,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_map(widget);
-@@ -13125,8 +13125,8 @@ public static final void gtk_widget_map(int /*long*/ widget) {
+@@ -13158,8 +13158,8 @@ public static final void gtk_widget_map(int /*long*/ widget) {
* @param widget cast=(GtkWidget *)
* @param group_cycling cast=(gboolean)
*/
@@ -26757,7 +26791,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_widget_mnemonic_activate(widget, group_cycling);
-@@ -13139,8 +13139,8 @@ public static final boolean gtk_widget_mnemonic_activate(int /*long*/ widget, bo
+@@ -13172,8 +13172,8 @@ public static final boolean gtk_widget_mnemonic_activate(int /*long*/ widget, bo
* @param state cast=(GtkStateType)
* @param color cast=(GdkColor *),flags=no_out
*/
@@ -26768,7 +26802,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_modify_base(widget, state, color);
-@@ -13153,8 +13153,8 @@ public static final void gtk_widget_modify_base(int /*long*/ widget, int state,
+@@ -13186,8 +13186,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
*/
@@ -26779,7 +26813,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_modify_bg(widget, state, color);
-@@ -13167,8 +13167,8 @@ public static final void gtk_widget_modify_bg(int /*long*/ widget, int state, Gd
+@@ -13200,8 +13200,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
*/
@@ -26790,7 +26824,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_modify_fg(widget, state, color);
-@@ -13180,8 +13180,8 @@ public static final void gtk_widget_modify_fg(int /*long*/ widget, int state, Gd
+@@ -13213,8 +13213,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 *)
*/
@@ -26801,7 +26835,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_modify_font(widget, pango_font_descr);
-@@ -13193,8 +13193,8 @@ public static final void gtk_widget_modify_font(int /*long*/ widget, int /*long*
+@@ -13226,8 +13226,8 @@ public static final void gtk_widget_modify_font(int /*long*/ widget, int /*long*
* @param widget cast=(GtkWidget *)
* @param style cast=(GtkRcStyle *)
*/
@@ -26812,7 +26846,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_modify_style(widget, style);
-@@ -13207,8 +13207,8 @@ public static final void gtk_widget_modify_style(int /*long*/ widget, int /*long
+@@ -13240,8 +13240,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
*/
@@ -26823,7 +26857,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_modify_text(widget, state, color);
-@@ -13217,8 +13217,8 @@ public static final void gtk_widget_modify_text(int /*long*/ widget, int state,
+@@ -13250,8 +13250,8 @@ public static final void gtk_widget_modify_text(int /*long*/ widget, int state,
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26834,7 +26868,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_queue_resize(widget);
-@@ -13227,8 +13227,8 @@ public static final void gtk_widget_queue_resize(int /*long*/ widget) {
+@@ -13260,8 +13260,8 @@ public static final void gtk_widget_queue_resize(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26845,7 +26879,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_realize(widget);
-@@ -13242,8 +13242,8 @@ public static final void gtk_widget_realize(int /*long*/ widget) {
+@@ -13275,8 +13275,8 @@ public static final void gtk_widget_realize(int /*long*/ widget) {
* @param accel_key cast=(guint)
* @param accel_mods cast=(GdkModifierType)
*/
@@ -26856,7 +26890,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_remove_accelerator(widget, accel_group, accel_key, accel_mods);
-@@ -13255,8 +13255,8 @@ public static final void gtk_widget_remove_accelerator(int /*long*/ widget, int
+@@ -13288,8 +13288,8 @@ public static final void gtk_widget_remove_accelerator(int /*long*/ widget, int
* @param widget cast=(GtkWidget *)
* @param new_parent cast=(GtkWidget *)
*/
@@ -26867,7 +26901,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_reparent(widget, new_parent);
-@@ -13268,8 +13268,8 @@ public static final void gtk_widget_reparent(int /*long*/ widget, int /*long*/ n
+@@ -13301,8 +13301,8 @@ public static final void gtk_widget_reparent(int /*long*/ widget, int /*long*/ n
* @param widget cast=(GtkWidget *)
* @param event cast=(GdkEvent *)
*/
@@ -26878,7 +26912,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_widget_send_expose(widget, event);
-@@ -13278,8 +13278,8 @@ public static final int gtk_widget_send_expose(int /*long*/ widget, int /*long*/
+@@ -13311,8 +13311,8 @@ public static final int gtk_widget_send_expose(int /*long*/ widget, int /*long*/
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26889,7 +26923,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_set_app_paintable(widget, app_paintable);
-@@ -13301,8 +13301,8 @@ public static final void gtk_widget_set_default_direction(int dir) {
+@@ -13334,8 +13334,8 @@ public static final void gtk_widget_set_default_direction(int dir) {
* @param widget cast=(GtkWidget *)
* @param dir cast=(GtkTextDirection)
*/
@@ -26900,7 +26934,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_set_direction(widget, dir);
-@@ -13314,8 +13314,8 @@ public static final void gtk_widget_set_direction(int /*long*/ widget, int dir)
+@@ -13347,8 +13347,8 @@ public static final void gtk_widget_set_direction(int /*long*/ widget, int dir)
* @param widget cast=(GtkWidget *)
* @param double_buffered cast=(gboolean)
*/
@@ -26911,7 +26945,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_set_double_buffered(widget, double_buffered);
-@@ -13327,8 +13327,8 @@ public static final void gtk_widget_set_double_buffered(int /*long*/ widget, boo
+@@ -13360,8 +13360,8 @@ public static final void gtk_widget_set_double_buffered(int /*long*/ widget, boo
* @param widget cast=(GtkWidget *)
* @param name cast=(const char *)
*/
@@ -26922,7 +26956,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_set_name(widget, name);
-@@ -13340,8 +13340,8 @@ public static final void gtk_widget_set_name(int /*long*/ widget, byte[] name) {
+@@ -13373,8 +13373,8 @@ public static final void gtk_widget_set_name(int /*long*/ widget, byte[] name) {
* @param widget cast=(GtkWidget *)
* @param redraw cast=(gboolean)
*/
@@ -26933,7 +26967,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_set_redraw_on_allocate(widget, redraw);
-@@ -13353,8 +13353,8 @@ public static final void gtk_widget_set_redraw_on_allocate(int /*long*/ widget,
+@@ -13386,8 +13386,8 @@ public static final void gtk_widget_set_redraw_on_allocate(int /*long*/ widget,
* @param widget cast=(GtkWidget *)
* @param sensitive cast=(gboolean)
*/
@@ -26944,7 +26978,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_set_sensitive(widget, sensitive);
-@@ -13367,8 +13367,8 @@ public static final void gtk_widget_set_sensitive(int /*long*/ widget, boolean s
+@@ -13400,8 +13400,8 @@ public static final void gtk_widget_set_sensitive(int /*long*/ widget, boolean s
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -26955,7 +26989,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_set_size_request(widget, width, height);
-@@ -13380,8 +13380,8 @@ public static final void gtk_widget_set_size_request(int /*long*/ widget, int wi
+@@ -13413,8 +13413,8 @@ public static final void gtk_widget_set_size_request(int /*long*/ widget, int wi
* @param widget cast=(GtkWidget *)
* @param state cast=(GtkStateType)
*/
@@ -26966,7 +27000,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_set_state(widget, state);
-@@ -13393,8 +13393,8 @@ public static final void gtk_widget_set_state(int /*long*/ widget, int state) {
+@@ -13426,8 +13426,8 @@ public static final void gtk_widget_set_state(int /*long*/ widget, int state) {
* @param widget cast=(GtkWidget *)
* @param style cast=(GtkStyle *)
*/
@@ -26977,7 +27011,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_set_style(widget, style);
-@@ -13408,8 +13408,8 @@ public static final void gtk_widget_set_style(int /*long*/ widget, int /*long*/
+@@ -13441,8 +13441,8 @@ public static final void gtk_widget_set_style(int /*long*/ widget, int /*long*/
* @param offset_x cast=(gint)
* @param offset_y cast=(gint)
*/
@@ -26988,7 +27022,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_shape_combine_mask(widget, shape_mask, offset_x, offset_y);
-@@ -13418,8 +13418,8 @@ public static final void gtk_widget_shape_combine_mask(int /*long*/ widget, int
+@@ -13451,8 +13451,8 @@ public static final void gtk_widget_shape_combine_mask(int /*long*/ widget, int
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26999,7 +27033,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_show(widget);
-@@ -13428,8 +13428,8 @@ public static final void gtk_widget_show(int /*long*/ widget) {
+@@ -13461,8 +13461,8 @@ public static final void gtk_widget_show(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -27010,7 +27044,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_show_now(widget);
-@@ -13441,8 +13441,8 @@ public static final void gtk_widget_show_now(int /*long*/ widget) {
+@@ -13474,8 +13474,8 @@ public static final void gtk_widget_show_now(int /*long*/ widget) {
* @param widget cast=(GtkWidget *)
* @param allocation cast=(GtkAllocation *),flags=no_out
*/
@@ -27021,7 +27055,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_size_allocate(widget, allocation);
-@@ -13454,8 +13454,8 @@ public static final void gtk_widget_size_allocate(int /*long*/ widget, GtkAlloca
+@@ -13487,8 +13487,8 @@ public static final void gtk_widget_size_allocate(int /*long*/ widget, GtkAlloca
* @param widget cast=(GtkWidget *)
* @param requisition cast=(GtkRequisition *),flags=no_in
*/
@@ -27032,7 +27066,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_size_request(widget, requisition);
-@@ -13468,8 +13468,8 @@ public static final void gtk_widget_size_request(int /*long*/ widget, GtkRequisi
+@@ -13501,8 +13501,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
*/
@@ -27043,7 +27077,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_style_get(widget, property_name, value, terminator);
-@@ -13482,8 +13482,8 @@ public static final void gtk_widget_style_get(int /*long*/ widget, byte[] proper
+@@ -13515,8 +13515,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
*/
@@ -27054,7 +27088,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_style_get(widget, property_name, value, terminator);
-@@ -13495,8 +13495,8 @@ public static final void gtk_widget_style_get(int /*long*/ widget, byte[] proper
+@@ -13528,8 +13528,8 @@ public static final void gtk_widget_style_get(int /*long*/ widget, byte[] proper
* @param src_widget cast=(GtkWidget *)
* @param dest_widget cast=(GtkWidget *)
*/
@@ -27065,7 +27099,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_widget_translate_coordinates(src_widget, dest_widget, src_x, src_y, dest_x, dest_y);
-@@ -13505,8 +13505,8 @@ public static final boolean gtk_widget_translate_coordinates(int /*long*/ src_wi
+@@ -13538,8 +13538,8 @@ public static final boolean gtk_widget_translate_coordinates(int /*long*/ src_wi
}
}
/** @param widget cast=(GtkWidget *) */
@@ -27076,7 +27110,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_unrealize(widget);
-@@ -13515,8 +13515,8 @@ public static final void gtk_widget_unrealize(int /*long*/ widget) {
+@@ -13548,8 +13548,8 @@ public static final void gtk_widget_unrealize(int /*long*/ widget) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -27087,7 +27121,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_window_activate_default(window);
-@@ -13528,8 +13528,8 @@ public static final boolean gtk_window_activate_default(int /*long*/ window) {
+@@ -13561,8 +13561,8 @@ public static final boolean gtk_window_activate_default(int /*long*/ window) {
* @param window cast=(GtkWindow *)
* @param accel_group cast=(GtkAccelGroup *)
*/
@@ -27098,7 +27132,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_add_accel_group(window, accel_group);
-@@ -13538,8 +13538,8 @@ public static final void gtk_window_add_accel_group(int /*long*/ window, int /*l
+@@ -13571,8 +13571,8 @@ public static final void gtk_window_add_accel_group(int /*long*/ window, int /*l
}
}
/** @param handle cast=(GtkWindow *) */
@@ -27109,7 +27143,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_deiconify(handle);
-@@ -13548,8 +13548,8 @@ public static final void gtk_window_deiconify(int /*long*/ handle) {
+@@ -13581,8 +13581,8 @@ public static final void gtk_window_deiconify(int /*long*/ handle) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -27120,7 +27154,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_window_get_focus(window);
-@@ -13561,8 +13561,8 @@ public static final int /*long*/ gtk_window_get_focus(int /*long*/ window) {
+@@ -13594,8 +13594,8 @@ public static final int /*long*/ gtk_window_get_focus(int /*long*/ window) {
* @method flags=dynamic
* @param window cast=(GtkWindow *)
*/
@@ -27131,7 +27165,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_window_get_group(window);
-@@ -13571,8 +13571,8 @@ public static final int /*long*/ gtk_window_get_group(int /*long*/ window) {
+@@ -13604,8 +13604,8 @@ public static final int /*long*/ gtk_window_get_group(int /*long*/ window) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -27142,7 +27176,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_window_get_icon_list(window);
-@@ -13581,8 +13581,8 @@ public static final int /*long*/ gtk_window_get_icon_list(int /*long*/ window) {
+@@ -13614,8 +13614,8 @@ public static final int /*long*/ gtk_window_get_icon_list(int /*long*/ window) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -27153,7 +27187,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_window_get_modal(window);
-@@ -13591,8 +13591,8 @@ public static final boolean gtk_window_get_modal(int /*long*/ window) {
+@@ -13624,8 +13624,8 @@ public static final boolean gtk_window_get_modal(int /*long*/ window) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -27164,7 +27198,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_window_get_mnemonic_modifier(window);
-@@ -13604,8 +13604,8 @@ public static final int gtk_window_get_mnemonic_modifier(int /*long*/ window) {
+@@ -13637,8 +13637,8 @@ public static final int gtk_window_get_mnemonic_modifier(int /*long*/ window) {
* @method flags=dynamic
* @param window cast=(GtkWindow *)
*/
@@ -27175,7 +27209,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_window_get_opacity (window);
-@@ -13618,8 +13618,8 @@ public static final double gtk_window_get_opacity (int /*long*/ window) {
+@@ -13651,8 +13651,8 @@ public static final double gtk_window_get_opacity (int /*long*/ window) {
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
@@ -27186,7 +27220,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_get_position(handle, x, y);
-@@ -13632,8 +13632,8 @@ public static final void gtk_window_get_position(int /*long*/ handle, int[] x, i
+@@ -13665,8 +13665,8 @@ public static final void gtk_window_get_position(int /*long*/ handle, int[] x, i
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
@@ -27197,7 +27231,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_get_size(handle, x, y);
-@@ -13645,8 +13645,8 @@ public static final void gtk_window_get_size(int /*long*/ handle, int[] x, int[]
+@@ -13678,8 +13678,8 @@ public static final void gtk_window_get_size(int /*long*/ handle, int[] x, int[]
* @param group cast=(GtkWindowGroup*)
* @param window cast=(GtkWindow*)
*/
@@ -27208,7 +27242,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_group_add_window(group, window);
-@@ -13658,8 +13658,8 @@ public static final void gtk_window_group_add_window(int /*long*/ group, int /*l
+@@ -13691,8 +13691,8 @@ public static final void gtk_window_group_add_window(int /*long*/ group, int /*l
* @param group cast=(GtkWindowGroup*)
* @param window cast=(GtkWindow*)
*/
@@ -27219,7 +27253,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_group_remove_window(group, window);
-@@ -13667,8 +13667,8 @@ public static final void gtk_window_group_remove_window(int /*long*/ group, int
+@@ -13700,8 +13700,8 @@ public static final void gtk_window_group_remove_window(int /*long*/ group, int
lock.unlock();
}
}
@@ -27230,7 +27264,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_window_group_new();
-@@ -13677,8 +13677,8 @@ public static final int /*long*/ gtk_window_group_new() {
+@@ -13710,8 +13710,8 @@ public static final int /*long*/ gtk_window_group_new() {
}
}
/** @param handle cast=(GtkWindow *) */
@@ -27241,7 +27275,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_window_is_active(handle);
-@@ -13687,8 +13687,8 @@ public static final boolean gtk_window_is_active(int /*long*/ handle) {
+@@ -13720,8 +13720,8 @@ public static final boolean gtk_window_is_active(int /*long*/ handle) {
}
}
/** @param handle cast=(GtkWindow *) */
@@ -27252,7 +27286,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_iconify(handle);
-@@ -13696,8 +13696,8 @@ public static final void gtk_window_iconify(int /*long*/ handle) {
+@@ -13729,8 +13729,8 @@ public static final void gtk_window_iconify(int /*long*/ handle) {
lock.unlock();
}
}
@@ -27263,7 +27297,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_window_list_toplevels ();
-@@ -13706,8 +13706,8 @@ public static final int /*long*/ gtk_window_list_toplevels () {
+@@ -13739,8 +13739,8 @@ public static final int /*long*/ gtk_window_list_toplevels () {
}
}
/** @param handle cast=(GtkWindow *) */
@@ -27274,7 +27308,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_maximize(handle);
-@@ -13716,8 +13716,8 @@ public static final void gtk_window_maximize(int /*long*/ handle) {
+@@ -13749,8 +13749,8 @@ public static final void gtk_window_maximize(int /*long*/ handle) {
}
}
/** @param handle cast=(GtkWindow *) */
@@ -27285,7 +27319,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_fullscreen(handle);
-@@ -13726,8 +13726,8 @@ public static final void gtk_window_fullscreen(int /*long*/ handle) {
+@@ -13759,8 +13759,8 @@ public static final void gtk_window_fullscreen(int /*long*/ handle) {
}
}
/** @param handle cast=(GtkWindow *) */
@@ -27296,7 +27330,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_unfullscreen(handle);
-@@ -13740,8 +13740,8 @@ public static final void gtk_window_unfullscreen(int /*long*/ handle) {
+@@ -13773,8 +13773,8 @@ public static final void gtk_window_unfullscreen(int /*long*/ handle) {
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -27307,7 +27341,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_move(handle, x, y);
-@@ -13750,8 +13750,8 @@ public static final void gtk_window_move(int /*long*/ handle, int x, int y) {
+@@ -13783,8 +13783,8 @@ public static final void gtk_window_move(int /*long*/ handle, int x, int y) {
}
}
/** @param type cast=(GtkWindowType) */
@@ -27318,7 +27352,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _gtk_window_new(type);
-@@ -13760,8 +13760,8 @@ public static final int /*long*/ gtk_window_new(int type) {
+@@ -13793,8 +13793,8 @@ public static final int /*long*/ gtk_window_new(int type) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -27329,7 +27363,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_present(window);
-@@ -13773,8 +13773,8 @@ public static final void gtk_window_present(int /*long*/ window) {
+@@ -13806,8 +13806,8 @@ public static final void gtk_window_present(int /*long*/ window) {
* @param window cast=(GtkWindow *)
* @param accel_group cast=(GtkAccelGroup *)
*/
@@ -27340,7 +27374,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_remove_accel_group(window, accel_group);
-@@ -13787,8 +13787,8 @@ public static final void gtk_window_remove_accel_group(int /*long*/ window, int
+@@ -13820,8 +13820,8 @@ public static final void gtk_window_remove_accel_group(int /*long*/ window, int
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -27351,7 +27385,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_resize(handle, x, y);
-@@ -13800,8 +13800,8 @@ public static final void gtk_window_resize(int /*long*/ handle, int x, int y) {
+@@ -13833,8 +13833,8 @@ public static final void gtk_window_resize(int /*long*/ handle, int x, int y) {
* @param window cast=(GtkWindow *)
* @param widget cast=(GtkWidget *)
*/
@@ -27362,7 +27396,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_set_default(window, widget);
-@@ -13813,8 +13813,8 @@ public static final void gtk_window_set_default(int /*long*/ window, int /*long*
+@@ -13846,8 +13846,8 @@ public static final void gtk_window_set_default(int /*long*/ window, int /*long*
* @param window cast=(GtkWindow *)
* @param setting cast=(gboolean)
*/
@@ -27373,7 +27407,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_set_destroy_with_parent(window, setting);
-@@ -13827,8 +13827,8 @@ public static final void gtk_window_set_destroy_with_parent(int /*long*/ window,
+@@ -13860,8 +13860,8 @@ public static final void gtk_window_set_destroy_with_parent(int /*long*/ window,
* @param window cast=(GtkWindow *)
* @param setting cast=(gboolean)
*/
@@ -27384,7 +27418,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_set_keep_below(window, setting);
-@@ -13841,8 +13841,8 @@ public static final void gtk_window_set_keep_below(int /*long*/ window, boolean
+@@ -13874,8 +13874,8 @@ public static final void gtk_window_set_keep_below(int /*long*/ window, boolean
* @param geometry_widget cast=(GtkWidget *)
* @param geometry flags=no_out
*/
@@ -27395,7 +27429,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_set_geometry_hints(window, geometry_widget, geometry, geom_mask);
-@@ -13854,8 +13854,8 @@ public static final void gtk_window_set_geometry_hints(int /*long*/ window, int
+@@ -13887,8 +13887,8 @@ public static final void gtk_window_set_geometry_hints(int /*long*/ window, int
* @param window cast=(GtkWindow *)
* @param list cast=(GList *)
*/
@@ -27406,7 +27440,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_set_icon_list(window, list);
-@@ -13867,8 +13867,8 @@ public static final void gtk_window_set_icon_list(int /*long*/ window, int /*lon
+@@ -13900,8 +13900,8 @@ public static final void gtk_window_set_icon_list(int /*long*/ window, int /*lon
* @param window cast=(GtkWindow *)
* @param modal cast=(gboolean)
*/
@@ -27417,7 +27451,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_set_modal(window, modal);
-@@ -13880,8 +13880,8 @@ public static final void gtk_window_set_modal(int /*long*/ window, boolean modal
+@@ -13913,8 +13913,8 @@ public static final void gtk_window_set_modal(int /*long*/ window, boolean modal
* @method flags=dynamic
* @param window cast=(GtkWindow *)
*/
@@ -27428,7 +27462,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_set_opacity(window, opacity);
-@@ -13894,8 +13894,8 @@ public static final void gtk_window_set_opacity(int /*long*/ window, double opac
+@@ -13927,8 +13927,8 @@ public static final void gtk_window_set_opacity(int /*long*/ window, double opac
* @param widget cast=(GtkWidget *)
* @param tip_text cast=(const gchar *)
*/
@@ -27439,7 +27473,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_set_tooltip_text(widget, tip_text);
-@@ -13907,8 +13907,8 @@ public static final void gtk_widget_set_tooltip_text(int /*long*/ widget, byte[]
+@@ -13940,8 +13940,8 @@ public static final void gtk_widget_set_tooltip_text(int /*long*/ widget, byte[]
* @param widget cast=(GtkWidget *)
* @param parent_window cast=(GdkWindow *)
*/
@@ -27450,7 +27484,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_widget_set_parent_window(widget, parent_window);
-@@ -13920,8 +13920,8 @@ public static final void gtk_widget_set_parent_window(int /*long*/ widget, int /
+@@ -13953,8 +13953,8 @@ public static final void gtk_widget_set_parent_window(int /*long*/ widget, int /
* @param window cast=(GtkWindow *)
* @param resizable cast=(gboolean)
*/
@@ -27461,7 +27495,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_set_resizable(window, resizable);
-@@ -13933,8 +13933,8 @@ public static final void gtk_window_set_resizable(int /*long*/ window, boolean r
+@@ -13966,8 +13966,8 @@ public static final void gtk_window_set_resizable(int /*long*/ window, boolean r
* @param window cast=(GtkWindow *)
* @param title cast=(const gchar *)
*/
@@ -27472,7 +27506,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_set_title(window, title);
-@@ -13947,8 +13947,8 @@ public static final void gtk_window_set_title(int /*long*/ window, byte[] title)
+@@ -13980,8 +13980,8 @@ public static final void gtk_window_set_title(int /*long*/ window, byte[] title)
* @param window cast=(GtkWindow *)
* @param skips_taskbar cast=(gboolean)
*/
@@ -27483,7 +27517,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_set_skip_taskbar_hint(window, skips_taskbar);
-@@ -13957,8 +13957,8 @@ public static final void gtk_window_set_skip_taskbar_hint(int /*long*/ window, b
+@@ -13990,8 +13990,8 @@ public static final void gtk_window_set_skip_taskbar_hint(int /*long*/ window, b
}
}
/** @param window cast=(GtkWindow *) */
@@ -27494,7 +27528,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_set_type_hint(window, hint);
-@@ -13970,8 +13970,8 @@ public static final void gtk_window_set_type_hint(int /*long*/ window, int hint)
+@@ -14003,8 +14003,8 @@ public static final void gtk_window_set_type_hint(int /*long*/ window, int hint)
* @param window cast=(GtkWindow *)
* @param parent cast=(GtkWindow *)
*/
@@ -27505,7 +27539,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_set_transient_for(window, parent);
-@@ -13980,8 +13980,8 @@ public static final void gtk_window_set_transient_for(int /*long*/ window, int /
+@@ -14013,8 +14013,8 @@ public static final void gtk_window_set_transient_for(int /*long*/ window, int /
}
}
/** @param handle cast=(GtkWindow *) */
@@ -27516,7 +27550,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_gtk_window_unmaximize(handle);
-@@ -13994,258 +13994,258 @@ public static final void gtk_window_unmaximize(int /*long*/ handle) {
+@@ -14027,258 +14027,258 @@ public static final void gtk_window_unmaximize(int /*long*/ handle) {
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
@@ -27824,7 +27858,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_attribute_copy(attribute);
-@@ -14253,8 +14253,8 @@ public static final int /*long*/ pango_attribute_copy (int /*long*/ attribute) {
+@@ -14286,8 +14286,8 @@ public static final int /*long*/ pango_attribute_copy (int /*long*/ attribute) {
lock.unlock();
}
}
@@ -27835,7 +27869,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_attr_background_new(red, green, blue);
-@@ -14263,8 +14263,8 @@ public static final int /*long*/ pango_attr_background_new (short red, short gre
+@@ -14296,8 +14296,8 @@ public static final int /*long*/ pango_attr_background_new (short red, short gre
}
}
/** @param desc cast=(const PangoFontDescription *) */
@@ -27846,7 +27880,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_attr_font_desc_new(desc);
-@@ -14272,8 +14272,8 @@ public static final int /*long*/ pango_attr_font_desc_new(int /*long*/ desc) {
+@@ -14305,8 +14305,8 @@ public static final int /*long*/ pango_attr_font_desc_new(int /*long*/ desc) {
lock.unlock();
}
}
@@ -27857,7 +27891,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_attr_foreground_new(red, green, blue);
-@@ -14281,8 +14281,8 @@ public static final int /*long*/ pango_attr_foreground_new (short red, short gre
+@@ -14314,8 +14314,8 @@ public static final int /*long*/ pango_attr_foreground_new (short red, short gre
lock.unlock();
}
}
@@ -27868,7 +27902,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_attr_rise_new(rise);
-@@ -14294,8 +14294,8 @@ public static final int /*long*/ pango_attr_rise_new(int rise) {
+@@ -14327,8 +14327,8 @@ public static final int /*long*/ pango_attr_rise_new(int rise) {
* @param ink_rect flags=no_out
* @param logical_rect flags=no_out
*/
@@ -27879,7 +27913,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_attr_shape_new(ink_rect, logical_rect);
-@@ -14307,8 +14307,8 @@ public static final int /*long*/ pango_attr_shape_new(PangoRectangle ink_rect, P
+@@ -14340,8 +14340,8 @@ public static final int /*long*/ pango_attr_shape_new(PangoRectangle ink_rect, P
* @param list cast=(PangoAttrList *)
* @param attr cast=(PangoAttribute *)
*/
@@ -27890,7 +27924,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_attr_list_insert(list, attr);
-@@ -14320,8 +14320,8 @@ public static final void pango_attr_list_insert(int /*long*/ list, int /*long*/
+@@ -14353,8 +14353,8 @@ public static final void pango_attr_list_insert(int /*long*/ list, int /*long*/
* @param list cast=(PangoAttrList *)
* @param attr cast=(PangoAttribute *)
*/
@@ -27901,7 +27935,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_attr_list_change(list, attr);
-@@ -14330,8 +14330,8 @@ public static final void pango_attr_list_change(int /*long*/ list, int /*long*/
+@@ -14363,8 +14363,8 @@ public static final void pango_attr_list_change(int /*long*/ list, int /*long*/
}
}
/** @param list cast=(PangoAttrList *) */
@@ -27912,7 +27946,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_attr_list_get_iterator(list);
-@@ -14340,8 +14340,8 @@ public static final int /*long*/ pango_attr_list_get_iterator(int /*long*/ list)
+@@ -14373,8 +14373,8 @@ public static final int /*long*/ pango_attr_list_get_iterator(int /*long*/ list)
}
}
/** @param iterator cast=(PangoAttrIterator *) */
@@ -27923,7 +27957,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_attr_iterator_next(iterator);
-@@ -14350,8 +14350,8 @@ public static final boolean pango_attr_iterator_next(int /*long*/ iterator) {
+@@ -14383,8 +14383,8 @@ public static final boolean pango_attr_iterator_next(int /*long*/ iterator) {
}
}
/** @param iterator cast=(PangoAttrIterator *) */
@@ -27934,7 +27968,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_attr_iterator_range(iterator, start, end);
-@@ -14363,8 +14363,8 @@ public static final void pango_attr_iterator_range(int /*long*/ iterator, int[]
+@@ -14396,8 +14396,8 @@ public static final void pango_attr_iterator_range(int /*long*/ iterator, int[]
* @param iterator cast=(PangoAttrIterator *)
* @param type cast=(PangoAttrType)
*/
@@ -27945,7 +27979,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_attr_iterator_get(iterator, type);
-@@ -14373,8 +14373,8 @@ public static final int /*long*/ pango_attr_iterator_get(int /*long*/ iterator,
+@@ -14406,8 +14406,8 @@ public static final int /*long*/ pango_attr_iterator_get(int /*long*/ iterator,
}
}
/** @param iterator cast=(PangoAttrIterator *) */
@@ -27956,7 +27990,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_attr_iterator_get_attrs(iterator);
-@@ -14384,8 +14384,8 @@ public static final int /*long*/ pango_attr_iterator_get_attrs(int /*long*/ iter
+@@ -14417,8 +14417,8 @@ public static final int /*long*/ pango_attr_iterator_get_attrs(int /*long*/ iter
}
/** @param iterator cast=(PangoAttrIterator *) */
@@ -27967,7 +28001,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_attr_iterator_destroy(iterator);
-@@ -14393,8 +14393,8 @@ public static final void pango_attr_iterator_destroy(int /*long*/ iterator) {
+@@ -14426,8 +14426,8 @@ public static final void pango_attr_iterator_destroy(int /*long*/ iterator) {
lock.unlock();
}
}
@@ -27978,7 +28012,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_attr_list_new();
-@@ -14403,8 +14403,8 @@ public static final int /*long*/ pango_attr_list_new() {
+@@ -14436,8 +14436,8 @@ public static final int /*long*/ pango_attr_list_new() {
}
}
/** @param list cast=(PangoAttrList *) */
@@ -27989,7 +28023,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_attr_list_unref(list);
-@@ -14413,8 +14413,8 @@ public static final void pango_attr_list_unref(int /*long*/ list) {
+@@ -14446,8 +14446,8 @@ public static final void pango_attr_list_unref(int /*long*/ list) {
}
}
/** @method flags=dynamic */
@@ -28000,7 +28034,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_attr_strikethrough_color_new(red, green, blue);
-@@ -14422,8 +14422,8 @@ public static final int /*long*/ pango_attr_strikethrough_color_new(short red, s
+@@ -14455,8 +14455,8 @@ public static final int /*long*/ pango_attr_strikethrough_color_new(short red, s
lock.unlock();
}
}
@@ -28011,7 +28045,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_attr_strikethrough_new(strikethrough);
-@@ -14432,8 +14432,8 @@ public static final int /*long*/ pango_attr_strikethrough_new(boolean strikethro
+@@ -14465,8 +14465,8 @@ public static final int /*long*/ pango_attr_strikethrough_new(boolean strikethro
}
}
/** @method flags=dynamic */
@@ -28022,7 +28056,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_attr_underline_color_new(red, green, blue);
-@@ -14441,8 +14441,8 @@ public static final int /*long*/ pango_attr_underline_color_new(short red, short
+@@ -14474,8 +14474,8 @@ public static final int /*long*/ pango_attr_underline_color_new(short red, short
lock.unlock();
}
}
@@ -28033,7 +28067,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_attr_underline_new(underline);
-@@ -14450,8 +14450,8 @@ public static final int /*long*/ pango_attr_underline_new(int underline) {
+@@ -14483,8 +14483,8 @@ public static final int /*long*/ pango_attr_underline_new(int underline) {
lock.unlock();
}
}
@@ -28044,7 +28078,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_attr_weight_new(weight);
-@@ -14460,8 +14460,8 @@ public static final int /*long*/ pango_attr_weight_new(int weight) {
+@@ -14493,8 +14493,8 @@ public static final int /*long*/ pango_attr_weight_new(int weight) {
}
}
/** @method flags=dynamic */
@@ -28055,7 +28089,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_cairo_font_map_get_default();
-@@ -14470,8 +14470,8 @@ public static final int /*long*/ pango_cairo_font_map_get_default() {
+@@ -14503,8 +14503,8 @@ public static final int /*long*/ pango_cairo_font_map_get_default() {
}
}
/** @method flags=dynamic */
@@ -28066,7 +28100,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_cairo_font_map_new();
-@@ -14480,8 +14480,8 @@ public static final int /*long*/ pango_cairo_font_map_new() {
+@@ -14513,8 +14513,8 @@ public static final int /*long*/ pango_cairo_font_map_new() {
}
}
/** @method flags=dynamic */
@@ -28077,7 +28111,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_cairo_font_map_create_context(fontmap);
-@@ -14490,8 +14490,8 @@ public static final int /*long*/ pango_cairo_font_map_create_context(int /*long*
+@@ -14523,8 +14523,8 @@ public static final int /*long*/ pango_cairo_font_map_create_context(int /*long*
}
}
/** @method flags=dynamic */
@@ -28088,7 +28122,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_cairo_create_layout(cairo);
-@@ -14503,8 +14503,8 @@ public static final int /*long*/ pango_cairo_create_layout(int /*long*/ cairo) {
+@@ -14536,8 +14536,8 @@ public static final int /*long*/ pango_cairo_create_layout(int /*long*/ cairo) {
* @method flags=dynamic
* @param context cast=(PangoContext *)
*/
@@ -28099,7 +28133,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_cairo_context_get_font_options(context);
-@@ -14516,8 +14516,8 @@ public static final int /*long*/ pango_cairo_context_get_font_options(int /*long
+@@ -14549,8 +14549,8 @@ public static final int /*long*/ pango_cairo_context_get_font_options(int /*long
* @method flags=dynamic
* @param context cast=(PangoContext *)
*/
@@ -28110,7 +28144,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_cairo_context_set_font_options(context, options);
-@@ -14526,8 +14526,8 @@ public static final void pango_cairo_context_set_font_options(int /*long*/ conte
+@@ -14559,8 +14559,8 @@ public static final void pango_cairo_context_set_font_options(int /*long*/ conte
}
}
/** @method flags=dynamic */
@@ -28121,7 +28155,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_cairo_font_map_set_resolution(fontmap, dpi);
-@@ -14536,8 +14536,8 @@ public static final void pango_cairo_font_map_set_resolution(int /*long*/ fontma
+@@ -14569,8 +14569,8 @@ public static final void pango_cairo_font_map_set_resolution(int /*long*/ fontma
}
}
/** @method flags=dynamic */
@@ -28132,7 +28166,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_cairo_layout_path(cairo, layout);
-@@ -14546,8 +14546,8 @@ public static final void pango_cairo_layout_path(int /*long*/ cairo, int /*long*
+@@ -14579,8 +14579,8 @@ public static final void pango_cairo_layout_path(int /*long*/ cairo, int /*long*
}
}
/** @method flags=dynamic */
@@ -28143,7 +28177,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_cairo_show_layout(cairo, layout);
-@@ -14556,8 +14556,8 @@ public static final void pango_cairo_show_layout(int /*long*/ cairo, int /*long*
+@@ -14589,8 +14589,8 @@ public static final void pango_cairo_show_layout(int /*long*/ cairo, int /*long*
}
}
/** @param context cast=(PangoContext *) */
@@ -28154,7 +28188,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_context_get_base_dir(context);
-@@ -14566,8 +14566,8 @@ public static final int pango_context_get_base_dir(int /*long*/ context) {
+@@ -14599,8 +14599,8 @@ public static final int pango_context_get_base_dir(int /*long*/ context) {
}
}
/** @param context cast=(PangoContext *) */
@@ -28165,7 +28199,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_context_get_language(context);
-@@ -14580,8 +14580,8 @@ public static final int /*long*/ pango_context_get_language(int /*long*/ context
+@@ -14613,8 +14613,8 @@ public static final int /*long*/ pango_context_get_language(int /*long*/ context
* @param desc cast=(const PangoFontDescription *)
* @param language cast=(PangoLanguage *)
*/
@@ -28176,7 +28210,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_context_get_metrics(context, desc, language);
-@@ -14594,8 +14594,8 @@ public static final int /*long*/ pango_context_get_metrics(int /*long*/ context,
+@@ -14627,8 +14627,8 @@ public static final int /*long*/ pango_context_get_metrics(int /*long*/ context,
* @param families cast=(PangoFontFamily ***)
* @param n_families cast=(int *)
*/
@@ -28187,7 +28221,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_context_list_families(context, families, n_families);
-@@ -14604,8 +14604,8 @@ public static final void pango_context_list_families(int /*long*/ context, int /
+@@ -14637,8 +14637,8 @@ public static final void pango_context_list_families(int /*long*/ context, int /
}
}
/** @param context cast=(PangoContext *) */
@@ -28198,7 +28232,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_context_set_base_dir(context, direction);
-@@ -14617,8 +14617,8 @@ public static final void pango_context_set_base_dir(int /*long*/ context, int di
+@@ -14650,8 +14650,8 @@ public static final void pango_context_set_base_dir(int /*long*/ context, int di
* @param context cast=(PangoContext *)
* @param language cast=(PangoLanguage *)
*/
@@ -28209,7 +28243,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_context_set_language(context, language);
-@@ -14627,8 +14627,8 @@ public static final void pango_context_set_language(int /*long*/ context, int /*
+@@ -14660,8 +14660,8 @@ public static final void pango_context_set_language(int /*long*/ context, int /*
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -28220,7 +28254,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_font_description_copy(desc);
-@@ -14637,8 +14637,8 @@ public static final int /*long*/ pango_font_description_copy(int /*long*/ desc)
+@@ -14670,8 +14670,8 @@ public static final int /*long*/ pango_font_description_copy(int /*long*/ desc)
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -28231,7 +28265,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_font_description_free(desc);
-@@ -14647,8 +14647,8 @@ public static final void pango_font_description_free(int /*long*/ desc) {
+@@ -14680,8 +14680,8 @@ public static final void pango_font_description_free(int /*long*/ desc) {
}
}
/** @param str cast=(const char *),flags=no_out critical */
@@ -28242,7 +28276,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_font_description_from_string(str);
-@@ -14657,8 +14657,8 @@ public static final int /*long*/ pango_font_description_from_string(byte[] str)
+@@ -14690,8 +14690,8 @@ public static final int /*long*/ pango_font_description_from_string(byte[] str)
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -28253,7 +28287,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_font_description_get_family(desc);
-@@ -14667,8 +14667,8 @@ public static final int /*long*/ pango_font_description_get_family(int /*long*/
+@@ -14700,8 +14700,8 @@ public static final int /*long*/ pango_font_description_get_family(int /*long*/
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -28264,7 +28298,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_font_description_get_size(desc);
-@@ -14677,8 +14677,8 @@ public static final int pango_font_description_get_size(int /*long*/ desc) {
+@@ -14710,8 +14710,8 @@ public static final int pango_font_description_get_size(int /*long*/ desc) {
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -28275,7 +28309,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_font_description_get_stretch(desc);
-@@ -14687,8 +14687,8 @@ public static final int pango_font_description_get_stretch(int /*long*/ desc) {
+@@ -14720,8 +14720,8 @@ public static final int pango_font_description_get_stretch(int /*long*/ desc) {
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -28286,7 +28320,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_font_description_get_variant(desc);
-@@ -14697,8 +14697,8 @@ public static final int pango_font_description_get_variant(int /*long*/ desc) {
+@@ -14730,8 +14730,8 @@ public static final int pango_font_description_get_variant(int /*long*/ desc) {
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -28297,7 +28331,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_font_description_get_style(desc);
-@@ -14707,8 +14707,8 @@ public static final int pango_font_description_get_style(int /*long*/ desc) {
+@@ -14740,8 +14740,8 @@ public static final int pango_font_description_get_style(int /*long*/ desc) {
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -28308,7 +28342,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_font_description_get_weight(desc);
-@@ -14716,8 +14716,8 @@ public static final int pango_font_description_get_weight(int /*long*/ desc) {
+@@ -14749,8 +14749,8 @@ public static final int pango_font_description_get_weight(int /*long*/ desc) {
lock.unlock();
}
}
@@ -28319,7 +28353,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_font_description_new();
-@@ -14729,8 +14729,8 @@ public static final int /*long*/ pango_font_description_new() {
+@@ -14762,8 +14762,8 @@ public static final int /*long*/ pango_font_description_new() {
* @param desc cast=(PangoFontDescription *)
* @param family cast=(const char *),flags=no_out critical
*/
@@ -28330,7 +28364,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_font_description_set_family(desc, family);
-@@ -14742,8 +14742,8 @@ public static final void pango_font_description_set_family(int /*long*/ desc, by
+@@ -14775,8 +14775,8 @@ public static final void pango_font_description_set_family(int /*long*/ desc, by
* @param desc cast=(PangoFontDescription *)
* @param size cast=(gint)
*/
@@ -28341,7 +28375,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_font_description_set_size(desc, size);
-@@ -14755,8 +14755,8 @@ public static final void pango_font_description_set_size(int /*long*/ desc, int
+@@ -14788,8 +14788,8 @@ public static final void pango_font_description_set_size(int /*long*/ desc, int
* @param desc cast=(PangoFontDescription *)
* @param stretch cast=(PangoStretch)
*/
@@ -28352,7 +28386,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_font_description_set_stretch(desc, stretch);
-@@ -14768,8 +14768,8 @@ public static final void pango_font_description_set_stretch(int /*long*/ desc, i
+@@ -14801,8 +14801,8 @@ public static final void pango_font_description_set_stretch(int /*long*/ desc, i
* @param desc cast=(PangoFontDescription *)
* @param weight cast=(PangoStyle)
*/
@@ -28363,7 +28397,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_font_description_set_style(desc, weight);
-@@ -14781,8 +14781,8 @@ public static final void pango_font_description_set_style(int /*long*/ desc, int
+@@ -14814,8 +14814,8 @@ public static final void pango_font_description_set_style(int /*long*/ desc, int
* @param desc cast=(PangoFontDescription *)
* @param weight cast=(PangoWeight)
*/
@@ -28374,7 +28408,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_font_description_set_weight(desc, weight);
-@@ -14794,8 +14794,8 @@ public static final void pango_font_description_set_weight(int /*long*/ desc, in
+@@ -14827,8 +14827,8 @@ public static final void pango_font_description_set_weight(int /*long*/ desc, in
* @param desc cast=(PangoFontDescription *)
* @param variant cast=(PangoVariant)
*/
@@ -28385,7 +28419,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_font_description_set_variant(desc, variant);
-@@ -14804,8 +14804,8 @@ public static final void pango_font_description_set_variant(int /*long*/ desc, i
+@@ -14837,8 +14837,8 @@ public static final void pango_font_description_set_variant(int /*long*/ desc, i
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -28396,7 +28430,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_font_description_to_string(desc);
-@@ -14814,8 +14814,8 @@ public static final int /*long*/ pango_font_description_to_string(int /*long*/ d
+@@ -14847,8 +14847,8 @@ public static final int /*long*/ pango_font_description_to_string(int /*long*/ d
}
}
/** @param face cast=(PangoFontFace *) */
@@ -28407,7 +28441,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_font_face_describe(face);
-@@ -14824,8 +14824,8 @@ public static final int /*long*/ pango_font_face_describe(int /*long*/ face) {
+@@ -14857,8 +14857,8 @@ public static final int /*long*/ pango_font_face_describe(int /*long*/ face) {
}
}
/** @param family cast=(PangoFontFamily *) */
@@ -28418,7 +28452,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_font_family_get_name(family);
-@@ -14838,8 +14838,8 @@ public static final int /*long*/ pango_font_family_get_name(int /*long*/ family)
+@@ -14871,8 +14871,8 @@ public static final int /*long*/ pango_font_family_get_name(int /*long*/ family)
* @param faces cast=(PangoFontFace ***)
* @param n_faces cast=(int *)
*/
@@ -28429,7 +28463,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_font_family_list_faces(family, faces, n_faces);
-@@ -14851,8 +14851,8 @@ public static final void pango_font_family_list_faces(int /*long*/ family, int /
+@@ -14884,8 +14884,8 @@ public static final void pango_font_family_list_faces(int /*long*/ family, int /
* @param font cast=(PangoFont *)
* @param language cast=(PangoLanguage *)
*/
@@ -28440,7 +28474,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_font_get_metrics(font, language);
-@@ -14861,8 +14861,8 @@ public static final int /*long*/ pango_font_get_metrics(int /*long*/ font, int /
+@@ -14894,8 +14894,8 @@ public static final int /*long*/ pango_font_get_metrics(int /*long*/ font, int /
}
}
/** @param metrics cast=(PangoFontMetrics *) */
@@ -28451,7 +28485,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_font_metrics_get_approximate_char_width(metrics);
-@@ -14871,8 +14871,8 @@ public static final int pango_font_metrics_get_approximate_char_width(int /*long
+@@ -14904,8 +14904,8 @@ public static final int pango_font_metrics_get_approximate_char_width(int /*long
}
}
/** @param metrics cast=(PangoFontMetrics *) */
@@ -28462,7 +28496,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_font_metrics_get_ascent(metrics);
-@@ -14881,8 +14881,8 @@ public static final int pango_font_metrics_get_ascent(int /*long*/ metrics) {
+@@ -14914,8 +14914,8 @@ public static final int pango_font_metrics_get_ascent(int /*long*/ metrics) {
}
}
/** @param metrics cast=(PangoFontMetrics *) */
@@ -28473,7 +28507,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_font_metrics_get_descent(metrics);
-@@ -14891,8 +14891,8 @@ public static final int pango_font_metrics_get_descent(int /*long*/ metrics) {
+@@ -14924,8 +14924,8 @@ public static final int pango_font_metrics_get_descent(int /*long*/ metrics) {
}
}
/** @method flags=dynamic */
@@ -28484,7 +28518,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_font_metrics_get_underline_thickness(metrics);
-@@ -14901,8 +14901,8 @@ public static final int pango_font_metrics_get_underline_thickness(int /*long*/
+@@ -14934,8 +14934,8 @@ public static final int pango_font_metrics_get_underline_thickness(int /*long*/
}
}
/** @method flags=dynamic */
@@ -28495,7 +28529,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_font_metrics_get_underline_position(metrics);
-@@ -14911,8 +14911,8 @@ public static final int pango_font_metrics_get_underline_position(int /*long*/ m
+@@ -14944,8 +14944,8 @@ public static final int pango_font_metrics_get_underline_position(int /*long*/ m
}
}
/** @method flags=dynamic */
@@ -28506,7 +28540,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_font_metrics_get_strikethrough_thickness(metrics);
-@@ -14921,8 +14921,8 @@ public static final int pango_font_metrics_get_strikethrough_thickness(int /*lon
+@@ -14954,8 +14954,8 @@ public static final int pango_font_metrics_get_strikethrough_thickness(int /*lon
}
}
/** @method flags=dynamic */
@@ -28517,7 +28551,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_font_metrics_get_strikethrough_position(metrics);
-@@ -14931,8 +14931,8 @@ public static final int pango_font_metrics_get_strikethrough_position(int /*long
+@@ -14964,8 +14964,8 @@ public static final int pango_font_metrics_get_strikethrough_position(int /*long
}
}
/** @param metrics cast=(PangoFontMetrics *) */
@@ -28528,7 +28562,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_font_metrics_unref(metrics);
-@@ -14941,8 +14941,8 @@ public static final void pango_font_metrics_unref(int /*long*/ metrics) {
+@@ -14974,8 +14974,8 @@ public static final void pango_font_metrics_unref(int /*long*/ metrics) {
}
}
/** @param language cast=(const char *),flags=no_out */
@@ -28539,7 +28573,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_language_from_string(language);
-@@ -14951,8 +14951,8 @@ public static final int /*long*/ pango_language_from_string(byte[] language) {
+@@ -14984,8 +14984,8 @@ public static final int /*long*/ pango_language_from_string(byte[] language) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28550,7 +28584,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_layout_context_changed(layout);
-@@ -14961,8 +14961,8 @@ public static final void pango_layout_context_changed(int /*long*/ layout) {
+@@ -14994,8 +14994,8 @@ public static final void pango_layout_context_changed(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28561,7 +28595,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_layout_get_alignment(layout);
-@@ -14971,8 +14971,8 @@ public static final int pango_layout_get_alignment(int /*long*/ layout) {
+@@ -15004,8 +15004,8 @@ public static final int pango_layout_get_alignment(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28572,7 +28606,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_layout_get_context(layout);
-@@ -14981,8 +14981,8 @@ public static final int /*long*/ pango_layout_get_context(int /*long*/ layout) {
+@@ -15014,8 +15014,8 @@ public static final int /*long*/ pango_layout_get_context(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28583,7 +28617,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_layout_get_attributes(layout);
-@@ -14991,8 +14991,8 @@ public static final int /*long*/ pango_layout_get_attributes(int /*long*/ layout
+@@ -15024,8 +15024,8 @@ public static final int /*long*/ pango_layout_get_attributes(int /*long*/ layout
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28594,7 +28628,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_layout_get_indent(layout);
-@@ -15001,8 +15001,8 @@ public static final int pango_layout_get_indent(int /*long*/ layout) {
+@@ -15034,8 +15034,8 @@ public static final int pango_layout_get_indent(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28605,7 +28639,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_layout_get_iter(layout);
-@@ -15011,8 +15011,8 @@ public static final int /*long*/ pango_layout_get_iter(int /*long*/ layout) {
+@@ -15044,8 +15044,8 @@ public static final int /*long*/ pango_layout_get_iter(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28616,7 +28650,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_layout_get_justify(layout);
-@@ -15021,8 +15021,8 @@ public static final boolean pango_layout_get_justify(int /*long*/ layout) {
+@@ -15054,8 +15054,8 @@ public static final boolean pango_layout_get_justify(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28627,7 +28661,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_layout_get_line(layout, line);
-@@ -15031,8 +15031,8 @@ public static final int /*long*/ pango_layout_get_line(int /*long*/ layout, int
+@@ -15064,8 +15064,8 @@ public static final int /*long*/ pango_layout_get_line(int /*long*/ layout, int
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28638,7 +28672,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_layout_get_line_count(layout);
-@@ -15045,8 +15045,8 @@ public static final int pango_layout_get_line_count(int /*long*/ layout) {
+@@ -15078,8 +15078,8 @@ public static final int pango_layout_get_line_count(int /*long*/ layout) {
* @param attrs cast=(PangoLogAttr **)
* @param n_attrs cast=(int *)
*/
@@ -28649,7 +28683,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_layout_get_log_attrs(layout, attrs, n_attrs);
-@@ -15059,8 +15059,8 @@ public static final void pango_layout_get_log_attrs(int /*long*/ layout, int /*l
+@@ -15092,8 +15092,8 @@ public static final void pango_layout_get_log_attrs(int /*long*/ layout, int /*l
* @param width cast=(int *)
* @param height cast=(int *)
*/
@@ -28660,7 +28694,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_layout_get_size(layout, width, height);
-@@ -15069,8 +15069,8 @@ public static final void pango_layout_get_size(int /*long*/ layout, int[] width,
+@@ -15102,8 +15102,8 @@ public static final void pango_layout_get_size(int /*long*/ layout, int[] width,
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28671,7 +28705,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_layout_get_spacing(layout);
-@@ -15079,8 +15079,8 @@ public static final int pango_layout_get_spacing(int /*long*/ layout) {
+@@ -15112,8 +15112,8 @@ public static final int pango_layout_get_spacing(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28682,7 +28716,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_layout_get_tabs(layout);
-@@ -15089,8 +15089,8 @@ public static final int /*long*/ pango_layout_get_tabs(int /*long*/ layout) {
+@@ -15122,8 +15122,8 @@ public static final int /*long*/ pango_layout_get_tabs(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28693,7 +28727,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_layout_get_text(layout);
-@@ -15099,8 +15099,8 @@ public static final int /*long*/ pango_layout_get_text(int /*long*/ layout) {
+@@ -15132,8 +15132,8 @@ public static final int /*long*/ pango_layout_get_text(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28704,7 +28738,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_layout_get_width(layout);
-@@ -15112,8 +15112,8 @@ public static final int pango_layout_get_width(int /*long*/ layout) {
+@@ -15145,8 +15145,8 @@ public static final int pango_layout_get_width(int /*long*/ layout) {
* @param layout cast=(PangoLayout*)
* @param pos flags=no_in
*/
@@ -28715,7 +28749,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_layout_index_to_pos(layout, index, pos);
-@@ -15122,8 +15122,8 @@ public static final void pango_layout_index_to_pos(int /*long*/ layout, int inde
+@@ -15155,8 +15155,8 @@ public static final void pango_layout_index_to_pos(int /*long*/ layout, int inde
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -28726,7 +28760,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_layout_iter_free(iter);
-@@ -15136,8 +15136,8 @@ public static final void pango_layout_iter_free(int /*long*/ iter) {
+@@ -15169,8 +15169,8 @@ public static final void pango_layout_iter_free(int /*long*/ iter) {
* @param ink_rect flags=no_in
* @param logical_rect flags=no_in
*/
@@ -28737,7 +28771,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_layout_iter_get_line_extents(iter, ink_rect, logical_rect);
-@@ -15146,8 +15146,8 @@ public static final void pango_layout_iter_get_line_extents(int /*long*/ iter, P
+@@ -15179,8 +15179,8 @@ public static final void pango_layout_iter_get_line_extents(int /*long*/ iter, P
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -28748,7 +28782,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_layout_iter_get_index(iter);
-@@ -15156,8 +15156,8 @@ public static final int pango_layout_iter_get_index(int /*long*/ iter) {
+@@ -15189,8 +15189,8 @@ public static final int pango_layout_iter_get_index(int /*long*/ iter) {
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -28759,7 +28793,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_layout_iter_get_run(iter);
-@@ -15166,8 +15166,8 @@ public static final int /*long*/ pango_layout_iter_get_run(int /*long*/ iter) {
+@@ -15199,8 +15199,8 @@ public static final int /*long*/ pango_layout_iter_get_run(int /*long*/ iter) {
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -28770,7 +28804,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_layout_iter_next_line(iter);
-@@ -15176,8 +15176,8 @@ public static final boolean pango_layout_iter_next_line(int /*long*/ iter) {
+@@ -15209,8 +15209,8 @@ public static final boolean pango_layout_iter_next_line(int /*long*/ iter) {
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -28781,7 +28815,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_layout_iter_next_run(iter);
-@@ -15190,8 +15190,8 @@ public static final boolean pango_layout_iter_next_run(int /*long*/ iter) {
+@@ -15223,8 +15223,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
*/
@@ -28792,7 +28826,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_layout_line_get_extents(line, ink_rect, logical_rect);
-@@ -15204,8 +15204,8 @@ public static final void pango_layout_line_get_extents(int /*long*/ line, PangoR
+@@ -15237,8 +15237,8 @@ public static final void pango_layout_line_get_extents(int /*long*/ line, PangoR
* @param index_ cast=(int *)
* @param trailing cast=(int *)
*/
@@ -28803,7 +28837,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_layout_line_x_to_index(line, x_pos, index_, trailing);
-@@ -15214,8 +15214,8 @@ public static final boolean pango_layout_line_x_to_index(int /*long*/ line, int
+@@ -15247,8 +15247,8 @@ public static final boolean pango_layout_line_x_to_index(int /*long*/ line, int
}
}
/** @param context cast=(PangoContext *) */
@@ -28814,7 +28848,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_layout_new(context);
-@@ -15224,8 +15224,8 @@ public static final int /*long*/ pango_layout_new(int /*long*/ context) {
+@@ -15257,8 +15257,8 @@ public static final int /*long*/ pango_layout_new(int /*long*/ context) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28825,7 +28859,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_layout_set_alignment(layout, alignment);
-@@ -15237,8 +15237,8 @@ public static final void pango_layout_set_alignment (int /*long*/ layout, int al
+@@ -15270,8 +15270,8 @@ public static final void pango_layout_set_alignment (int /*long*/ layout, int al
* @param layout cast=(PangoLayout *)
* @param attrs cast=(PangoAttrList *)
*/
@@ -28836,7 +28870,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_layout_set_attributes(layout, attrs);
-@@ -15247,8 +15247,8 @@ public static final void pango_layout_set_attributes(int /*long*/ layout, int /*
+@@ -15280,8 +15280,8 @@ public static final void pango_layout_set_attributes(int /*long*/ layout, int /*
}
}
/** @method flags=dynamic */
@@ -28847,7 +28881,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_layout_set_auto_dir(layout, auto_dir);
-@@ -15260,8 +15260,8 @@ public static final void pango_layout_set_auto_dir(int /*long*/ layout, boolean
+@@ -15293,8 +15293,8 @@ public static final void pango_layout_set_auto_dir(int /*long*/ layout, boolean
* @param context cast=(PangoLayout *)
* @param descr cast=(PangoFontDescription *)
*/
@@ -28858,7 +28892,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_layout_set_font_description(context, descr);
-@@ -15270,8 +15270,8 @@ public static final void pango_layout_set_font_description(int /*long*/ context,
+@@ -15303,8 +15303,8 @@ public static final void pango_layout_set_font_description(int /*long*/ context,
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28869,7 +28903,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_layout_set_indent(layout, indent);
-@@ -15280,8 +15280,8 @@ public static final void pango_layout_set_indent(int /*long*/ layout, int indent
+@@ -15313,8 +15313,8 @@ public static final void pango_layout_set_indent(int /*long*/ layout, int indent
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28880,7 +28914,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_layout_set_justify(layout, justify);
-@@ -15293,8 +15293,8 @@ public static final void pango_layout_set_justify(int /*long*/ layout, boolean j
+@@ -15326,8 +15326,8 @@ public static final void pango_layout_set_justify(int /*long*/ layout, boolean j
* @param context cast=(PangoLayout *)
* @param setting cast=(gboolean)
*/
@@ -28891,7 +28925,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_layout_set_single_paragraph_mode(context, setting);
-@@ -15303,8 +15303,8 @@ public static final void pango_layout_set_single_paragraph_mode(int /*long*/ con
+@@ -15336,8 +15336,8 @@ public static final void pango_layout_set_single_paragraph_mode(int /*long*/ con
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28902,7 +28936,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_layout_set_spacing(layout, spacing);
-@@ -15316,8 +15316,8 @@ public static final void pango_layout_set_spacing(int /*long*/ layout, int spaci
+@@ -15349,8 +15349,8 @@ public static final void pango_layout_set_spacing(int /*long*/ layout, int spaci
* @param layout cast=(PangoLayout *)
* @param tabs cast=(PangoTabArray *)
*/
@@ -28913,7 +28947,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_layout_set_tabs(layout, tabs);
-@@ -15330,8 +15330,8 @@ public static final void pango_layout_set_tabs(int /*long*/ layout, int /*long*/
+@@ -15363,8 +15363,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)
*/
@@ -28924,7 +28958,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_layout_set_text(layout, text, length);
-@@ -15340,8 +15340,8 @@ public static final void pango_layout_set_text(int /*long*/ layout, byte[] text,
+@@ -15373,8 +15373,8 @@ public static final void pango_layout_set_text(int /*long*/ layout, byte[] text,
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28935,7 +28969,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_layout_set_width(layout, width);
-@@ -15350,8 +15350,8 @@ public static final void pango_layout_set_width(int /*long*/ layout, int width)
+@@ -15383,8 +15383,8 @@ public static final void pango_layout_set_width(int /*long*/ layout, int width)
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28946,7 +28980,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_layout_set_wrap(layout, wrap);
-@@ -15364,8 +15364,8 @@ public static final void pango_layout_set_wrap (int /*long*/ layout, int wrap) {
+@@ -15397,8 +15397,8 @@ public static final void pango_layout_set_wrap (int /*long*/ layout, int wrap) {
* @param index cast=(int *)
* @param trailing cast=(int *)
*/
@@ -28957,7 +28991,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_layout_xy_to_index(layout, x, y, index, trailing);
-@@ -15374,8 +15374,8 @@ public static final boolean pango_layout_xy_to_index(int /*long*/ layout, int x,
+@@ -15407,8 +15407,8 @@ public static final boolean pango_layout_xy_to_index(int /*long*/ layout, int x,
}
}
/** @param tab_array cast=(PangoTabArray *) */
@@ -28968,7 +29002,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_tab_array_get_size(tab_array);
-@@ -15388,8 +15388,8 @@ public static final int pango_tab_array_get_size(int /*long*/ tab_array) {
+@@ -15421,8 +15421,8 @@ public static final int pango_tab_array_get_size(int /*long*/ tab_array) {
* @param alignments cast=(PangoTabAlign **)
* @param locations cast=(int **)
*/
@@ -28979,7 +29013,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_tab_array_get_tabs(tab_array, alignments, locations);
-@@ -15398,8 +15398,8 @@ public static final void pango_tab_array_get_tabs(int /*long*/ tab_array, int /*
+@@ -15431,8 +15431,8 @@ public static final void pango_tab_array_get_tabs(int /*long*/ tab_array, int /*
}
}
/** @param tab_array cast=(PangoTabArray *) */
@@ -28990,7 +29024,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_tab_array_free(tab_array);
-@@ -15411,8 +15411,8 @@ public static final void pango_tab_array_free(int /*long*/ tab_array) {
+@@ -15444,8 +15444,8 @@ public static final void pango_tab_array_free(int /*long*/ tab_array) {
* @param initial_size cast=(gint)
* @param positions_in_pixels cast=(gboolean)
*/
@@ -29001,7 +29035,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _pango_tab_array_new(initial_size, positions_in_pixels);
-@@ -15426,8 +15426,8 @@ public static final int /*long*/ pango_tab_array_new(int initial_size, boolean p
+@@ -15459,8 +15459,8 @@ public static final int /*long*/ pango_tab_array_new(int initial_size, boolean p
* @param alignment cast=(PangoTabAlign)
* @param location cast=(gint)
*/
@@ -29012,7 +29046,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
_pango_tab_array_set_tab(tab_array, tab_index, alignment, location);
-@@ -15438,8 +15438,8 @@ public static final void pango_tab_array_set_tab(int /*long*/ tab_array, int tab
+@@ -15471,8 +15471,8 @@ public static final void pango_tab_array_set_tab(int /*long*/ tab_array, int tab
/**
* @method flags=dynamic
*/
@@ -29023,7 +29057,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _ubuntu_menu_proxy_get();
-@@ -15453,8 +15453,8 @@ public static final int /*long*/ ubuntu_menu_proxy_get() {
+@@ -15486,8 +15486,8 @@ public static final int /*long*/ ubuntu_menu_proxy_get() {
* @param relationship cast=(AtkRelationType)
* @param target cast=(AtkObject *)
*/
@@ -29034,7 +29068,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _atk_object_add_relationship(object, relationship, target);
-@@ -15468,8 +15468,8 @@ public static final boolean atk_object_add_relationship (int /*long*/ object, in
+@@ -15501,8 +15501,8 @@ public static final boolean atk_object_add_relationship (int /*long*/ object, in
* @param relationship cast=(AtkRelationType)
* @param target cast=(AtkObject *)
*/
@@ -29045,7 +29079,7 @@ index ea39bc8..d687398 100644
lock.lock();
try {
return _atk_object_remove_relationship(object, relationship, target);
-@@ -15493,5 +15493,5 @@ public static final int access (byte [] path, int amode) {
+@@ -15526,5 +15526,5 @@ public static final int access (byte [] path, int amode) {
* @param s1 cast=(const char*)
* @param s2 cast=(const char*)
*/
@@ -41334,7 +41368,7 @@ index d1b17cf..ed98be0 100644
if (OS.USE_CAIRO) return;
OS.g_object_unref (gc);
diff --git a/org/eclipse/swt/program/Program.java b/org/eclipse/swt/program/Program.java
-index 82f46fd..d42cbe4 100644
+index d16f925..c318672 100644
--- a/org/eclipse/swt/program/Program.java
+++ b/org/eclipse/swt/program/Program.java
@@ -42,10 +42,10 @@ public final class Program {
@@ -41451,7 +41485,7 @@ index 82f46fd..d42cbe4 100644
OS.memmove(dataType, dataTypeList + (index++ * 4), 4);
while (dataType[0] != 0) {
int length = OS.strlen(dataType[0]);
-@@ -306,13 +306,13 @@ static boolean cde_init(Display display) {
+@@ -309,13 +309,13 @@ static boolean cde_init(Display display) {
/* Use the character encoding for the default locale */
CDE.XtToolkitInitialize();
@@ -41469,7 +41503,7 @@ index 82f46fd..d42cbe4 100644
cdeShell = CDE.XtAppCreateShell (appName, appClass, widgetClass, xDisplay, null, 0);
CDE.XtSetMappedWhenManaged (cdeShell, false);
CDE.XtResizeWidget (cdeShell, 10, 10, 0);
-@@ -378,10 +378,10 @@ static String[] parseCommand(String cmd) {
+@@ -381,10 +381,10 @@ static String[] parseCommand(String cmd) {
*/
boolean gnome_24_execute(String fileName) {
byte[] mimeTypeBuffer = Converter.wcsToMbcs(null, name, true);
@@ -41483,7 +41517,7 @@ index 82f46fd..d42cbe4 100644
int result = GNOME.gnome_vfs_mime_application_launch(ptr, list);
GNOME.gnome_vfs_mime_application_free(ptr);
GNOME.g_free(uri);
-@@ -394,7 +394,7 @@ boolean gnome_24_execute(String fileName) {
+@@ -397,7 +397,7 @@ boolean gnome_24_execute(String fileName) {
*/
static boolean gnome_24_launch(String fileName) {
byte[] fileNameBuffer = Converter.wcsToMbcs(null, fileName, true);
@@ -41492,7 +41526,7 @@ index 82f46fd..d42cbe4 100644
int result = GNOME.gnome_vfs_url_show(uri);
GNOME.g_free(uri);
return (result == GNOME.GNOME_VFS_OK);
-@@ -407,7 +407,7 @@ boolean gnome_execute(String fileName) {
+@@ -410,7 +410,7 @@ boolean gnome_execute(String fileName) {
if (gnomeExpectUri) {
/* Convert the given path into a URL */
byte[] fileNameBuffer = Converter.wcsToMbcs(null, fileName, true);
@@ -41501,7 +41535,7 @@ index 82f46fd..d42cbe4 100644
if (uri != 0) {
int length = OS.strlen(uri);
if (length > 0) {
-@@ -471,24 +471,24 @@ ImageData gnome_getImageData() {
+@@ -474,24 +474,24 @@ ImageData gnome_getImageData() {
*/
static Hashtable gnome_getMimeInfo() {
Hashtable mimeInfo = new Hashtable();
@@ -41534,7 +41568,7 @@ index 82f46fd..d42cbe4 100644
int extensionLength = OS.strlen(extensionPtr);
byte[] extensionBuffer = new byte[extensionLength];
OS.memmove(extensionBuffer, extensionPtr, extensionLength);
-@@ -510,7 +510,7 @@ static String gnome_getMimeType(String extension) {
+@@ -513,7 +513,7 @@ static String gnome_getMimeType(String extension) {
String mimeType = null;
String fileName = "swt" + extension;
byte[] extensionBuffer = Converter.wcsToMbcs(null, fileName, true);
@@ -41543,7 +41577,7 @@ index 82f46fd..d42cbe4 100644
if (typeName != 0) {
int length = OS.strlen(typeName);
if (length > 0) {
-@@ -525,7 +525,7 @@ static String gnome_getMimeType(String extension) {
+@@ -528,7 +528,7 @@ static String gnome_getMimeType(String extension) {
static Program gnome_getProgram(Display display, String mimeType) {
Program program = null;
byte[] mimeTypeBuffer = Converter.wcsToMbcs(null, mimeType, true);
@@ -41552,8 +41586,8 @@ index 82f46fd..d42cbe4 100644
if (ptr != 0) {
program = new Program();
program.display = display;
-@@ -542,9 +542,9 @@ static Program gnome_getProgram(Display display, String mimeType) {
- buffer = new byte[length + 1];
+@@ -549,9 +549,9 @@ static Program gnome_getProgram(Display display, String mimeType) {
+ byte[] buffer = new byte[length + 1];
OS.memmove(buffer, application.id, length);
LONG gnomeIconTheme = (LONG)display.getData(ICON_THEME_DATA);
- int /*long*/ icon_name = GNOME.gnome_icon_lookup(gnomeIconTheme.value, 0, null, buffer, 0, mimeTypeBuffer,
@@ -41564,7 +41598,7 @@ index 82f46fd..d42cbe4 100644
if (icon_name != 0) path = GNOME.gnome_icon_theme_lookup_icon(gnomeIconTheme.value, icon_name, PREFERRED_ICON_SIZE, null, null);
if (path != 0) {
length = OS.strlen(path);
-@@ -575,8 +575,8 @@ static boolean gnome_isExecutable(String fileName) {
+@@ -583,8 +583,8 @@ static boolean gnome_isExecutable(String fileName) {
if (!GNOME.gnome_vfs_is_executable_command_string(fileNameBuffer)) return false;
/* check if the mime type is executable */
@@ -41575,7 +41609,7 @@ index 82f46fd..d42cbe4 100644
GNOME.g_free(uri);
byte[] exeType = Converter.wcsToMbcs (null, "application/x-executable", true); //$NON-NLS-1$
-@@ -725,16 +725,16 @@ static Program[] getPrograms(Display display) {
+@@ -733,16 +733,16 @@ static Program[] getPrograms(Display display) {
ImageData gio_getImageData() {
if (iconPath == null) return null;
ImageData data = null;
@@ -41597,7 +41631,7 @@ index 82f46fd..d42cbe4 100644
int height = OS.gdk_pixbuf_get_height(pixbuf);
int width = OS.gdk_pixbuf_get_width(pixbuf);
boolean hasAlpha = OS.gdk_pixbuf_get_has_alpha(pixbuf);
-@@ -769,7 +769,7 @@ ImageData gio_getImageData() {
+@@ -777,7 +777,7 @@ ImageData gio_getImageData() {
}
static Hashtable gio_getMimeInfo() {
@@ -41606,7 +41640,7 @@ index 82f46fd..d42cbe4 100644
/*
* The file 'globs' contain the file extensions
* associated to the mime-types. Each line that has
-@@ -779,10 +779,10 @@ static Hashtable gio_getMimeInfo() {
+@@ -787,10 +787,10 @@ static Hashtable gio_getMimeInfo() {
*/
byte[] buffer = Converter.wcsToMbcs (null, "/usr/share/mime/globs", true);
mimeDatabase = OS.g_file_new_for_path (buffer);
@@ -41619,7 +41653,7 @@ index 82f46fd..d42cbe4 100644
buffer = Converter.wcsToMbcs (null, "*", true);
fileInfo = OS.g_file_query_info(mimeDatabase, buffer, 0, 0, 0);
OS.g_file_info_get_modification_time(fileInfo, modTimestamp);
-@@ -791,11 +791,11 @@ static Hashtable gio_getMimeInfo() {
+@@ -799,11 +799,11 @@ static Hashtable gio_getMimeInfo() {
} else {
mimeTable = new Hashtable();
modTime = modTimestamp[0];
@@ -41633,7 +41667,7 @@ index 82f46fd..d42cbe4 100644
while (linePtr != 0) {
byte[] lineBytes = new byte[length[0]];
OS.memmove(lineBytes, linePtr, length[0]);
-@@ -850,19 +850,19 @@ static String gio_getMimeType(String extension) {
+@@ -858,19 +858,19 @@ static String gio_getMimeType(String extension) {
static Program gio_getProgram(Display display, String mimeType) {
Program program = null;
byte[] mimeTypeBuffer = Converter.wcsToMbcs (null, mimeType, true);
@@ -41656,7 +41690,7 @@ index 82f46fd..d42cbe4 100644
if (applicationName != 0) {
length = OS.strlen (applicationName);
if (length > 0) {
-@@ -871,7 +871,7 @@ static Program gio_getProgram (Display display, int /*long*/ application) {
+@@ -879,7 +879,7 @@ static Program gio_getProgram (Display display, int /*long*/ application) {
program.name = new String (Converter.mbcsToWcs (null, buffer));
}
}
@@ -41665,7 +41699,7 @@ index 82f46fd..d42cbe4 100644
if (applicationCommand != 0) {
length = OS.strlen (applicationCommand);
if (length > 0) {
-@@ -881,9 +881,9 @@ static Program gio_getProgram (Display display, int /*long*/ application) {
+@@ -889,9 +889,9 @@ static Program gio_getProgram (Display display, int /*long*/ application) {
}
}
program.gnomeExpectUri = OS.g_app_info_supports_uris(application);
@@ -41677,7 +41711,7 @@ index 82f46fd..d42cbe4 100644
if (icon_name != 0) {
length = OS.strlen(icon_name);
if (length > 0) {
-@@ -899,12 +899,12 @@ static Program gio_getProgram (Display display, int /*long*/ application) {
+@@ -907,12 +907,12 @@ static Program gio_getProgram (Display display, int /*long*/ application) {
}
static Program[] gio_getPrograms(Display display) {
@@ -41693,7 +41727,7 @@ index 82f46fd..d42cbe4 100644
if (application != 0) {
//TODO: Should the list be filtered or not?
// if (OS.g_app_info_should_show(application)) {
-@@ -926,13 +926,13 @@ static boolean gio_isExecutable(String fileName) {
+@@ -934,13 +934,13 @@ static boolean gio_isExecutable(String fileName) {
byte[] fileNameBuffer = Converter.wcsToMbcs (null, fileName, true);
if (OS.g_file_test(fileNameBuffer, OS.G_FILE_TEST_IS_DIR)) return false;
if (!OS.g_file_test(fileNameBuffer, OS.G_FILE_TEST_IS_EXECUTABLE)) return false;
@@ -41710,7 +41744,7 @@ index 82f46fd..d42cbe4 100644
if (contentType != 0) {
byte[] exeType = Converter.wcsToMbcs (null, "application/x-executable", true); //$NON-NLS-1$
result = OS.g_content_type_is_a(contentType, exeType);
-@@ -954,9 +954,9 @@ static boolean gio_isExecutable(String fileName) {
+@@ -962,9 +962,9 @@ static boolean gio_isExecutable(String fileName) {
static boolean gio_launch(String fileName) {
boolean result = false;
byte[] fileNameBuffer = Converter.wcsToMbcs (null, fileName, true);
@@ -41722,7 +41756,7 @@ index 82f46fd..d42cbe4 100644
if (uri != 0) {
result = OS.g_app_info_launch_default_for_uri (uri, 0, 0);
OS.g_free(uri);
-@@ -973,11 +973,11 @@ boolean gio_execute(String fileName) {
+@@ -981,11 +981,11 @@ boolean gio_execute(String fileName) {
boolean result = false;
byte[] commandBuffer = Converter.wcsToMbcs (null, command, true);
byte[] nameBuffer = Converter.wcsToMbcs (null, name, true);
@@ -41736,7 +41770,7 @@ index 82f46fd..d42cbe4 100644
if (fileName.length() > 0) {
if (OS.g_app_info_supports_uris (application)) {
file = OS.g_file_new_for_uri (fileNameBuffer);
-@@ -985,7 +985,7 @@ boolean gio_execute(String fileName) {
+@@ -993,7 +993,7 @@ boolean gio_execute(String fileName) {
file = OS.g_file_new_for_path (fileNameBuffer);
}
}
@@ -42090,7 +42124,7 @@ index aab3285..dea297d 100644
if (ptr [0] != 0) {
int length = OS.strlen (ptr [0]);
diff --git a/org/eclipse/swt/widgets/Combo.java b/org/eclipse/swt/widgets/Combo.java
-index 5adc42c..2058c78 100644
+index 72d62d0..4451fca 100644
--- a/org/eclipse/swt/widgets/Combo.java
+++ b/org/eclipse/swt/widgets/Combo.java
@@ -57,9 +57,9 @@ import org.eclipse.swt.events.*;
@@ -42118,7 +42152,29 @@ index 5adc42c..2058c78 100644
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
OS.gtk_tree_model_get (modelHandle, iter, 0, ptr, -1);
OS.g_free (iter);
-@@ -367,7 +367,7 @@ void createHandle (int index) {
+@@ -348,10 +348,10 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
+ if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0;
+ int[] w = new int [1], h = new int [1];
+ OS.gtk_widget_realize (entryHandle);
+- int /*long*/ layout = OS.gtk_entry_get_layout (entryHandle);
++ long /*int*/ layout = OS.gtk_entry_get_layout (entryHandle);
+ OS.pango_layout_get_size (layout, w, h);
+ int xborder = Display.INNER_BORDER, yborder = Display.INNER_BORDER;
+- int /*long*/ style = OS.gtk_widget_get_style (entryHandle);
++ long /*int*/ style = OS.gtk_widget_get_style (entryHandle);
+ xborder += OS.gtk_style_get_xthickness (style);
+ yborder += OS.gtk_style_get_ythickness (style);
+ int [] property = new int [1];
+@@ -366,7 +366,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
+ GtkRequisition arrowRequesition = new GtkRequisition ();
+ OS.gtk_widget_size_request (buttonHandle, arrowRequesition);
+ GtkRequisition listRequesition = new GtkRequisition ();
+- int /*long*/ listParent = OS.gtk_bin_get_child(popupHandle);
++ long /*int*/ listParent = OS.gtk_bin_get_child(popupHandle);
+ OS.gtk_widget_size_request (listParent, listRequesition);
+ width = Math.max (listRequesition.width, width) + arrowRequesition.width;
+ width = wHint == SWT.DEFAULT ? width : wHint;
+@@ -397,7 +397,7 @@ void createHandle (int index) {
fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_fixed_set_has_window (fixedHandle, true);
@@ -42127,7 +42183,7 @@ index 5adc42c..2058c78 100644
if ((style & SWT.READ_ONLY) != 0) {
handle = OS.gtk_combo_box_new_text ();
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-@@ -449,15 +449,15 @@ void deregister () {
+@@ -479,15 +479,15 @@ void deregister () {
if (entryHandle != 0) display.removeWidget (entryHandle);
if (popupHandle != 0) display.removeWidget (popupHandle);
if (menuHandle != 0) display.removeWidget (menuHandle);
@@ -42146,7 +42202,7 @@ index 5adc42c..2058c78 100644
if (imContext != 0) {
return OS.gtk_im_context_filter_keypress (imContext, event);
}
-@@ -466,18 +466,18 @@ boolean filterKey (int keyval, int /*long*/ event) {
+@@ -496,18 +496,18 @@ boolean filterKey (int keyval, int /*long*/ event) {
return false;
}
@@ -42172,7 +42228,7 @@ index 5adc42c..2058c78 100644
if (newToplevel == oldToplevel) {
isFound = true;
break;
-@@ -506,9 +506,9 @@ void findButtonHandle() {
+@@ -536,9 +536,9 @@ void findButtonHandle() {
*/
OS.gtk_container_forall (handle, display.allChildrenProc, 0);
if (display.allChildren != 0) {
@@ -42184,7 +42240,7 @@ index 5adc42c..2058c78 100644
if (OS.GTK_IS_BUTTON (widget)) {
buttonHandle = widget;
break;
-@@ -523,9 +523,9 @@ void findButtonHandle() {
+@@ -553,9 +553,9 @@ void findButtonHandle() {
void findMenuHandle() {
OS.gtk_container_forall (popupHandle, display.allChildrenProc, 0);
if (display.allChildren != 0) {
@@ -42196,7 +42252,7 @@ index 5adc42c..2058c78 100644
if (OS.G_OBJECT_TYPE (widget) == OS.GTK_TYPE_MENU ()) {
menuHandle = widget;
break;
-@@ -537,7 +537,7 @@ void findMenuHandle() {
+@@ -567,7 +567,7 @@ void findMenuHandle() {
}
}
@@ -42205,7 +42261,7 @@ index 5adc42c..2058c78 100644
if (popupHandle != 0) {
if (group != 0) {
OS.gtk_window_group_add_window (group, popupHandle);
-@@ -559,7 +559,7 @@ void fixIM () {
+@@ -589,7 +589,7 @@ void fixIM () {
* filter has to be called by SWT.
*/
if (gdkEventKey != 0 && gdkEventKey != -1) {
@@ -42214,7 +42270,7 @@ index 5adc42c..2058c78 100644
if (imContext != 0) {
OS.gtk_im_context_filter_keypress (imContext, gdkEventKey);
gdkEventKey = -1;
-@@ -569,12 +569,12 @@ void fixIM () {
+@@ -599,12 +599,12 @@ void fixIM () {
gdkEventKey = 0;
}
@@ -42229,7 +42285,7 @@ index 5adc42c..2058c78 100644
if ((style & SWT.READ_ONLY) != 0 && buttonHandle != 0) return buttonHandle;
if (entryHandle != 0) return entryHandle;
return super.focusHandle ();
-@@ -599,9 +599,9 @@ void hookEvents () {
+@@ -629,9 +629,9 @@ void hookEvents () {
}
int eventMask = OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_PRESS_MASK |
OS.GDK_BUTTON_RELEASE_MASK;
@@ -42241,7 +42297,7 @@ index 5adc42c..2058c78 100644
if (eventHandle != 0) {
/* Connect the mouse signals */
OS.gtk_widget_add_events (eventHandle, eventMask);
-@@ -625,7 +625,7 @@ void hookEvents () {
+@@ -655,7 +655,7 @@ void hookEvents () {
}
}
}
@@ -42250,7 +42306,7 @@ index 5adc42c..2058c78 100644
if (imContext != 0) {
OS.g_signal_connect_closure (imContext, OS.commit, display.closures [COMMIT], false);
int id = OS.g_signal_lookup (OS.commit, OS.gtk_im_context_get_type ());
-@@ -636,7 +636,7 @@ void hookEvents () {
+@@ -666,7 +666,7 @@ void hookEvents () {
if (menuHandle != 0) OS.g_signal_connect_closure(menuHandle, OS.selection_done, display.closures[SELECTION_DONE], true);
}
@@ -42259,7 +42315,7 @@ index 5adc42c..2058c78 100644
return entryHandle != 0 ? OS.GTK_ENTRY_IM_CONTEXT (entryHandle) : 0;
}
-@@ -683,9 +683,9 @@ boolean dragDetect(int x, int y, boolean filter, boolean dragOnTimeout, boolean[
+@@ -713,9 +713,9 @@ boolean dragDetect(int x, int y, boolean filter, boolean dragOnTimeout, boolean[
if (filter && entryHandle != 0) {
int [] index = new int [1];
int [] trailing = new int [1];
@@ -42271,7 +42327,7 @@ index 5adc42c..2058c78 100644
int position = (int)/*64*/OS.g_utf8_pointer_to_offset (ptr, ptr + index[0]) + trailing[0];
int [] start = new int [1];
int [] end = new int [1];
-@@ -701,11 +701,11 @@ boolean dragDetect(int x, int y, boolean filter, boolean dragOnTimeout, boolean[
+@@ -731,11 +731,11 @@ boolean dragDetect(int x, int y, boolean filter, boolean dragOnTimeout, boolean[
return super.dragDetect (x, y, filter, dragOnTimeout, consume);
}
@@ -42285,7 +42341,7 @@ index 5adc42c..2058c78 100644
return paintWindow ();
}
-@@ -737,7 +737,7 @@ public Point getCaretLocation () {
+@@ -767,7 +767,7 @@ public Point getCaretLocation () {
}
int [] offset_x = new int [1], offset_y = new int [1];
OS.gtk_entry_get_layout_offsets (entryHandle, offset_x, offset_y);
@@ -42294,7 +42350,7 @@ index 5adc42c..2058c78 100644
PangoRectangle pos = new PangoRectangle ();
OS.pango_layout_index_to_pos (layout, index, pos);
int x = offset_x [0] + OS.PANGO_PIXELS (pos.x) - getBorderWidth ();
-@@ -765,7 +765,7 @@ public int getCaretPosition () {
+@@ -795,7 +795,7 @@ public int getCaretPosition () {
if ((style & SWT.READ_ONLY) != 0) {
return 0;
}
@@ -42303,7 +42359,7 @@ index 5adc42c..2058c78 100644
return (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_editable_get_position (entryHandle));
}
-@@ -926,7 +926,7 @@ public Point getSelection () {
+@@ -956,7 +956,7 @@ public Point getSelection () {
int [] end = new int [1];
if (entryHandle != 0) {
OS.gtk_editable_get_selection_bounds (entryHandle, start, end);
@@ -42312,7 +42368,7 @@ index 5adc42c..2058c78 100644
start[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start[0]);
end[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end[0]);
}
-@@ -964,7 +964,7 @@ public int getSelectionIndex () {
+@@ -994,7 +994,7 @@ public int getSelectionIndex () {
public String getText () {
checkWidget();
if (entryHandle != 0) {
@@ -42321,7 +42377,7 @@ index 5adc42c..2058c78 100644
if (str == 0) return "";
int length = OS.strlen (str);
byte [] buffer = new byte [length];
-@@ -1045,12 +1045,12 @@ public int getVisibleItemCount () {
+@@ -1075,12 +1075,12 @@ public int getVisibleItemCount () {
return visibleCount;
}
@@ -42336,7 +42392,7 @@ index 5adc42c..2058c78 100644
/*
* Feature in GTK. Depending on where the user clicks, GTK prevents
* the left mouse button event from being propagated. The fix is to
-@@ -1064,7 +1064,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
+@@ -1094,7 +1094,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
return super.gtk_button_press_event (widget, event);
}
@@ -42345,7 +42401,7 @@ index 5adc42c..2058c78 100644
if (widget == handle) {
if (entryHandle == 0) {
sendEvent(SWT.Modify);
-@@ -1094,7 +1094,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
+@@ -1124,7 +1124,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
* is to post the modify event when the user is typing.
*/
boolean keyPress = false;
@@ -42354,7 +42410,7 @@ index 5adc42c..2058c78 100644
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-@@ -1113,7 +1113,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
+@@ -1143,7 +1143,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
return 0;
}
@@ -42363,7 +42419,7 @@ index 5adc42c..2058c78 100644
if (text == 0) return 0;
if (!OS.gtk_editable_get_editable (entryHandle)) return 0;
int length = OS.strlen (text);
-@@ -1151,9 +1151,9 @@ int /*long*/ gtk_commit (int /*long*/ imContext, int /*long*/ text) {
+@@ -1181,9 +1181,9 @@ int /*long*/ gtk_commit (int /*long*/ imContext, int /*long*/ text) {
return 0;
}
@@ -42375,7 +42431,7 @@ index 5adc42c..2058c78 100644
if (end_pos == -1) end_pos = OS.g_utf8_strlen (ptr, -1);
int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start_pos);
int end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end_pos);
-@@ -1176,7 +1176,7 @@ int /*long*/ gtk_delete_text (int /*long*/ widget, int /*long*/ start_pos, int /
+@@ -1206,7 +1206,7 @@ int /*long*/ gtk_delete_text (int /*long*/ widget, int /*long*/ start_pos, int /
return 0;
}
@@ -42384,7 +42440,7 @@ index 5adc42c..2058c78 100644
/*
* Feature in GTK. Depending on where the user clicks, GTK prevents
* the left mouse button event from being propagated. The fix is to
-@@ -1195,7 +1195,7 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
+@@ -1225,7 +1225,7 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
switch (event.type) {
case OS.GDK_BUTTON_PRESS: {
if (OS.GTK_VERSION < OS.VERSION (2, 8, 0) && !selectionAdded) {
@@ -42393,7 +42449,7 @@ index 5adc42c..2058c78 100644
if (grabHandle != 0) {
if (OS.G_OBJECT_TYPE (grabHandle) == OS.GTK_TYPE_MENU ()) {
menuHandle = grabHandle;
-@@ -1239,12 +1239,12 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
+@@ -1269,12 +1269,12 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
return super.gtk_event_after(widget, gdkEvent);
}
@@ -42408,7 +42464,7 @@ index 5adc42c..2058c78 100644
if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
if (new_text == 0 || new_text_length == 0) return 0;
byte [] buffer = new byte [(int)/*64*/new_text_length];
-@@ -1252,7 +1252,7 @@ int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*
+@@ -1282,7 +1282,7 @@ int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*
String oldText = new String (Converter.mbcsToWcs (null, buffer));
int [] pos = new int [1];
OS.memmove (pos, position, 4);
@@ -42417,7 +42473,7 @@ index 5adc42c..2058c78 100644
if (pos [0] == -1) pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1);
int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, pos [0]);
String newText = verifyText (oldText, start, start);
-@@ -1284,8 +1284,8 @@ int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*
+@@ -1314,8 +1314,8 @@ int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*
return 0;
}
@@ -42428,7 +42484,7 @@ index 5adc42c..2058c78 100644
if (result != 0) {
gdkEventKey = 0;
fixIM ();
-@@ -1335,7 +1335,7 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
+@@ -1365,7 +1365,7 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
@@ -42437,7 +42493,7 @@ index 5adc42c..2058c78 100644
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
OS.gtk_widget_set_direction (menu, OS.GTK_TEXT_DIR_RTL);
OS.gtk_container_forall (menu, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);
-@@ -1343,7 +1343,7 @@ int /*long*/ gtk_populate_popup (int /*long*/ widget, int /*long*/ menu) {
+@@ -1373,7 +1373,7 @@ int /*long*/ gtk_populate_popup (int /*long*/ widget, int /*long*/ menu) {
return 0;
}
@@ -42446,7 +42502,7 @@ index 5adc42c..2058c78 100644
int index = OS.gtk_combo_box_get_active (handle);
if (indexSelected == -1){
indexSelected = index;
-@@ -1410,12 +1410,12 @@ boolean isFocusHandle(int widget) {
+@@ -1440,12 +1440,12 @@ boolean isFocusHandle(int widget) {
return super.isFocusHandle (widget);
}
@@ -42463,7 +42519,7 @@ index 5adc42c..2058c78 100644
if (children != 0) window = OS.g_list_data (children);
OS.g_list_free (children);
return window;
-@@ -1440,7 +1440,7 @@ public void paste () {
+@@ -1470,7 +1470,7 @@ public void paste () {
if (entryHandle != 0) OS.gtk_editable_paste_clipboard (entryHandle);
}
@@ -42472,7 +42528,7 @@ index 5adc42c..2058c78 100644
return fixedHandle;
}
-@@ -1450,7 +1450,7 @@ void register () {
+@@ -1480,7 +1480,7 @@ void register () {
if (entryHandle != 0) display.addWidget (entryHandle, this);
if (popupHandle != 0) display.addWidget (popupHandle, this);
if (menuHandle != 0) display.addWidget (menuHandle, this);
@@ -42481,7 +42537,7 @@ index 5adc42c..2058c78 100644
if (imContext != 0) display.addWidget (imContext, this);
}
-@@ -1687,7 +1687,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
+@@ -1717,7 +1717,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
return super.setBounds (x, y, width, newHeight, move, resize);
}
@@ -42490,7 +42546,7 @@ index 5adc42c..2058c78 100644
super.setFontDescription (font);
if (entryHandle != 0) OS.gtk_widget_modify_font (entryHandle, font);
OS.g_object_set (textRenderer, OS.font_desc, font, 0);
-@@ -1857,7 +1857,7 @@ public void setSelection (Point selection) {
+@@ -1887,7 +1887,7 @@ public void setSelection (Point selection) {
if (selection == null) error (SWT.ERROR_NULL_ARGUMENT);
if ((style & SWT.READ_ONLY) != 0) return;
if (entryHandle != 0) {
@@ -42499,7 +42555,7 @@ index 5adc42c..2058c78 100644
int start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, selection.x);
int end = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, selection.y);
OS.gtk_editable_set_position (entryHandle, start);
-@@ -1905,7 +1905,7 @@ public void setText (String string) {
+@@ -1935,7 +1935,7 @@ public void setText (String string) {
* fix is to block the firing of these events and fire them ourselves in a consistent manner.
*/
if (hooks (SWT.Verify) || filters (SWT.Verify)) {
@@ -42508,7 +42564,7 @@ index 5adc42c..2058c78 100644
string = verifyText (string, 0, (int)/*64*/OS.g_utf16_strlen (ptr, -1));
if (string == null) return;
}
-@@ -1985,9 +1985,9 @@ boolean translateTraversal (GdkEventKey keyEvent) {
+@@ -2015,9 +2015,9 @@ boolean translateTraversal (GdkEventKey keyEvent) {
switch (key) {
case OS.GDK_KP_Enter:
case OS.GDK_Return: {
@@ -42520,7 +42576,7 @@ index 5adc42c..2058c78 100644
OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);
if (preeditString [0] != 0) {
int length = OS.strlen (preeditString [0]);
-@@ -2006,7 +2006,7 @@ String verifyText (String string, int start, int end) {
+@@ -2036,7 +2036,7 @@ String verifyText (String string, int start, int end) {
event.text = string;
event.start = start;
event.end = end;
@@ -42530,7 +42586,7 @@ index 5adc42c..2058c78 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 81445e9..54a9246 100644
+index 6c4cf8c..9c10eeb 100644
--- a/org/eclipse/swt/widgets/Composite.java
+++ b/org/eclipse/swt/widgets/Composite.java
@@ -47,8 +47,8 @@ import org.eclipse.swt.graphics.*;
@@ -42544,7 +42600,7 @@ index 81445e9..54a9246 100644
Layout layout;
Control[] tabList;
int layoutCount, backgroundMode;
-@@ -101,15 +101,15 @@ static int checkStyle (int style) {
+@@ -104,15 +104,15 @@ static int checkStyle (int style) {
}
Control [] _getChildren () {
@@ -42564,7 +42620,7 @@ index 81445e9..54a9246 100644
if (handle != 0) {
Widget widget = display.getWidget (handle);
if (widget != null && widget != this) {
-@@ -203,7 +203,7 @@ protected void checkSubclass () {
+@@ -206,7 +206,7 @@ protected void checkSubclass () {
/* Do nothing - Subclassing is allowed */
}
@@ -42573,7 +42629,7 @@ index 81445e9..54a9246 100644
if (scrolledHandle != 0) return 0;
return super.childStyle ();
}
-@@ -264,9 +264,9 @@ void createHandle (int index, boolean fixed, boolean scrolled) {
+@@ -267,9 +267,9 @@ void createHandle (int index, boolean fixed, boolean scrolled) {
if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_fixed_set_has_window (fixedHandle, true);
}
@@ -42585,7 +42641,7 @@ index 81445e9..54a9246 100644
if (hadj == 0) error (SWT.ERROR_NO_HANDLES);
scrolledHandle = OS.gtk_scrolled_window_new (hadj, vadj);
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
+@@ -367,7 +367,7 @@ public void drawBackground (GC gc, int x, int y, int width, int height, int offs
Control control = findBackgroundControl ();
if (control != null) {
GCData data = gc.getGCData ();
@@ -42594,7 +42650,7 @@ index 81445e9..54a9246 100644
if (cairo != 0) {
Cairo.cairo_save (cairo);
if (control.backgroundImage != null) {
-@@ -372,12 +372,12 @@ public void drawBackground (GC gc, int x, int y, int width, int height, int offs
+@@ -375,12 +375,12 @@ public void drawBackground (GC gc, int x, int y, int width, int height, int offs
Cairo.cairo_translate (cairo, -pt.x - offsetX, -pt.y - offsetY);
x += pt.x + offsetX;
y += pt.y + offsetY;
@@ -42612,7 +42668,7 @@ index 81445e9..54a9246 100644
int [] w = new int [1], h = new int [1];
OS.gdk_drawable_get_size (drawable, w, h);
surface = Cairo.cairo_xlib_surface_create (xDisplay, xDrawable, xVisual, w [0], h [0]);
-@@ -385,7 +385,7 @@ public void drawBackground (GC gc, int x, int y, int width, int height, int offs
+@@ -388,7 +388,7 @@ public void drawBackground (GC gc, int x, int y, int width, int height, int offs
} else {
Cairo.cairo_surface_reference(surface);
}
@@ -42621,7 +42677,7 @@ index 81445e9..54a9246 100644
if (pattern == 0) error (SWT.ERROR_NO_HANDLES);
Cairo.cairo_pattern_set_extend (pattern, Cairo.CAIRO_EXTEND_REPEAT);
if ((data.style & SWT.MIRRORED) != 0) {
-@@ -403,7 +403,7 @@ public void drawBackground (GC gc, int x, int y, int width, int height, int offs
+@@ -406,7 +406,7 @@ public void drawBackground (GC gc, int x, int y, int width, int height, int offs
Cairo.cairo_fill (cairo);
Cairo.cairo_restore (cairo);
} else {
@@ -42630,7 +42686,7 @@ index 81445e9..54a9246 100644
GdkGCValues values = new GdkGCValues ();
OS.gdk_gc_get_values (gdkGC, values);
if (control.backgroundImage != null) {
-@@ -461,7 +461,7 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De
+@@ -464,7 +464,7 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De
}
}
@@ -42639,7 +42695,7 @@ index 81445e9..54a9246 100644
Control[] controls = _getChildren ();
for (int i = 0; i < controls.length; i++) {
controls[i].fixModal (group, modalGroup);
-@@ -500,15 +500,15 @@ void fixTabList (Control control) {
+@@ -503,15 +503,15 @@ void fixTabList (Control control) {
void fixZOrder () {
if ((state & CANVAS) != 0) return;
@@ -42661,7 +42717,7 @@ index 81445e9..54a9246 100644
if (window != redrawWindow) {
OS.gdk_window_get_user_data (window, userData);
if (userData [0] == 0 || OS.G_OBJECT_TYPE (userData [0]) != display.gtk_fixed_get_type ()) {
-@@ -521,12 +521,12 @@ void fixZOrder () {
+@@ -524,12 +524,12 @@ void fixZOrder () {
}
}
@@ -42676,7 +42732,7 @@ index 81445e9..54a9246 100644
if (socketHandle != 0) OS.GTK_WIDGET_SET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);
boolean result = super.forceFocus (focusHandle);
if (socketHandle != 0) OS.GTK_WIDGET_UNSET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);
-@@ -587,7 +587,7 @@ int getChildrenCount () {
+@@ -590,7 +590,7 @@ int getChildrenCount () {
* NOTE: The current implementation will count
* non-registered children.
*/
@@ -42685,7 +42741,7 @@ index 81445e9..54a9246 100644
if (list == 0) return 0;
int count = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -601,7 +601,7 @@ public Rectangle getClientArea () {
+@@ -604,7 +604,7 @@ public Rectangle getClientArea () {
return new Rectangle (0, 0, 0, 0);
}
forceResize ();
@@ -42694,7 +42750,7 @@ index 81445e9..54a9246 100644
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle);
int height = (state & ZERO_HEIGHT) != 0 ? 0 : OS.GTK_WIDGET_HEIGHT (clientHandle);
return new Rectangle (0, 0, width, height);
-@@ -682,8 +682,8 @@ public Control [] getTabList () {
+@@ -685,8 +685,8 @@ public Control [] getTabList () {
return tabList;
}
@@ -42705,7 +42761,7 @@ index 81445e9..54a9246 100644
if (result != 0) return result;
if ((state & CANVAS) != 0) {
if ((style & SWT.NO_FOCUS) == 0 && hooksKeys ()) {
-@@ -697,7 +697,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
+@@ -700,7 +700,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
@@ -42714,7 +42770,7 @@ index 81445e9..54a9246 100644
if ((state & OBSCURED) != 0) return 0;
if ((state & CANVAS) == 0) {
return super.gtk_expose_event (widget, eventPtr);
-@@ -708,7 +708,7 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
+@@ -711,7 +711,7 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
if (!hooks (SWT.Paint) && !filters (SWT.Paint)) return 0;
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove(gdkEvent, eventPtr, GdkEventExpose.sizeof);
@@ -42723,7 +42779,7 @@ index 81445e9..54a9246 100644
int [] n_rectangles = new int [1];
OS.gdk_region_get_rectangles (gdkEvent.region, rectangles, n_rectangles);
GdkRectangle rect = new GdkRectangle ();
-@@ -720,7 +720,7 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
+@@ -723,7 +723,7 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
event.width = rect.width;
event.height = rect.height;
if ((style & SWT.MIRRORED) != 0) event.x = getClientWidth () - event.width - event.x;
@@ -42732,7 +42788,7 @@ index 81445e9..54a9246 100644
OS.gdk_region_union_with_rect (damageRgn, rect);
GCData data = new GCData ();
data.damageRgn = damageRgn;
-@@ -734,8 +734,8 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
+@@ -737,8 +737,8 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
return 0;
}
@@ -42743,7 +42799,7 @@ index 81445e9..54a9246 100644
if (result != 0) return result;
/*
* Feature in GTK. The default behavior when the return key
-@@ -755,30 +755,30 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
+@@ -758,30 +758,30 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
@@ -42783,7 +42839,7 @@ index 81445e9..54a9246 100644
if (window != 0) OS.gdk_window_set_back_pixmap (window, 0, false);
}
if (socketHandle != 0) {
-@@ -787,16 +787,16 @@ int /*long*/ gtk_realize (int /*long*/ widget) {
+@@ -790,16 +790,16 @@ int /*long*/ gtk_realize (int /*long*/ widget) {
return result;
}
@@ -42804,7 +42860,7 @@ index 81445e9..54a9246 100644
if (window != 0) OS.gdk_window_set_back_pixmap (window, 0, false);
}
return result;
-@@ -820,7 +820,7 @@ boolean hooksKeys () {
+@@ -823,7 +823,7 @@ boolean hooksKeys () {
return hooks (SWT.KeyDown) || hooks (SWT.KeyUp);
}
@@ -42813,7 +42869,7 @@ index 81445e9..54a9246 100644
return imHandle;
}
-@@ -1115,16 +1115,16 @@ void markLayout (boolean changed, boolean all) {
+@@ -1118,16 +1118,16 @@ void markLayout (boolean changed, boolean all) {
}
}
@@ -42836,7 +42892,7 @@ index 81445e9..54a9246 100644
while (temp != 0) {
OS.memmove (data, temp, OS.PTR_SIZEOF);
OS.memmove (widget, data [0], OS.PTR_SIZEOF);
-@@ -1152,20 +1152,20 @@ void moveAbove (int /*long*/ child, int /*long*/ sibling) {
+@@ -1155,20 +1155,20 @@ void moveAbove (int /*long*/ child, int /*long*/ sibling) {
OS.memmove (parentHandle, fixed);
}
@@ -42863,7 +42919,7 @@ index 81445e9..54a9246 100644
while (temp != 0) {
OS.memmove (data, temp, OS.PTR_SIZEOF);
OS.memmove (widget, data [0], OS.PTR_SIZEOF);
-@@ -1197,7 +1197,7 @@ void moveChildren(int oldWidth) {
+@@ -1200,7 +1200,7 @@ void moveChildren(int oldWidth) {
Control[] children = _getChildren ();
for (int i = 0; i < children.length; i++) {
Control child = children[i];
@@ -42872,7 +42928,7 @@ index 81445e9..54a9246 100644
int x = OS.GTK_WIDGET_X (topHandle);
int y = OS.GTK_WIDGET_Y (topHandle);
int controlWidth = (child.state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (topHandle);
-@@ -1240,12 +1240,12 @@ Point minimumSize (int wHint, int hHint, boolean changed) {
+@@ -1243,12 +1243,12 @@ Point minimumSize (int wHint, int hHint, boolean changed) {
return new Point (width, height);
}
@@ -44121,7 +44177,7 @@ index 7404d61..a387015 100644
int[] dest_x = new int[1], dest_y = new int[1];
OS.gtk_widget_translate_coordinates (paintHandle (), control.paintHandle (), 0, 0, dest_x, dest_y);
diff --git a/org/eclipse/swt/widgets/DateTime.java b/org/eclipse/swt/widgets/DateTime.java
-index b83a946..d85825c 100644
+index 6497d40..00c150a 100644
--- a/org/eclipse/swt/widgets/DateTime.java
+++ b/org/eclipse/swt/widgets/DateTime.java
@@ -435,7 +435,7 @@ void dropDownCalendar(boolean drop) {
@@ -44226,7 +44282,7 @@ index 70e1d66..aea02d3 100644
}
diff --git a/org/eclipse/swt/widgets/DirectoryDialog.java b/org/eclipse/swt/widgets/DirectoryDialog.java
-index b6979e1..ef9c201 100644
+index cd40603..9c62fb7 100644
--- a/org/eclipse/swt/widgets/DirectoryDialog.java
+++ b/org/eclipse/swt/widgets/DirectoryDialog.java
@@ -119,9 +119,9 @@ public String open () {
@@ -44285,7 +44341,7 @@ index b6979e1..ef9c201 100644
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
-@@ -197,13 +197,13 @@ String openChooserDialog () {
+@@ -197,14 +197,14 @@ String openChooserDialog () {
display.setModalDialog (oldModal);
}
if (response == OS.GTK_RESPONSE_OK) {
@@ -44294,7 +44350,8 @@ index b6979e1..ef9c201 100644
if (path != 0) {
- int /*long*/ utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null);
+ long /*int*/ utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null);
- OS.g_free (path);
+ if (utf8Ptr == 0) utf8Ptr = OS.g_filename_display_name (path);
+ if (path != utf8Ptr) OS.g_free (path);
if (utf8Ptr != 0) {
- int /*long*/ [] items_written = new int /*long*/ [1];
- int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
@@ -44304,7 +44361,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 4631d4d..b750020 100644
+index 3f8300e..3108218 100644
--- a/org/eclipse/swt/widgets/Display.java
+++ b/org/eclipse/swt/widgets/Display.java
@@ -99,30 +99,30 @@ public class Display extends Device {
@@ -44455,7 +44512,7 @@ index 4631d4d..b750020 100644
/* System Resources */
Font systemFont;
-@@ -285,7 +285,7 @@ public class Display extends Device {
+@@ -286,7 +286,7 @@ public class Display extends Device {
int lastEventTime, lastUserEventTime;
/* Pango layout constructor */
@@ -44464,7 +44521,7 @@ index 4631d4d..b750020 100644
/* Custom Resize */
double resizeLocationX, resizeLocationY;
-@@ -293,16 +293,16 @@ public class Display extends Device {
+@@ -294,16 +294,16 @@ public class Display extends Device {
int resizeMode;
/* Fixed Subclass */
@@ -44487,7 +44544,7 @@ index 4631d4d..b750020 100644
/* Key Mappings */
static final int [] [] KeyTable = {
-@@ -550,16 +550,16 @@ void addLayoutDeferred (Composite comp) {
+@@ -551,16 +551,16 @@ void addLayoutDeferred (Composite comp) {
layoutDeferred[layoutDeferredCount++] = comp;
}
@@ -44507,7 +44564,7 @@ index 4631d4d..b750020 100644
System.arraycopy (gdkEvents, 0, newEvents, 0, gdkEventCount);
gdkEvents = newEvents;
Widget [] newWidgets = new Widget [length];
-@@ -567,7 +567,7 @@ void addGdkEvent (int /*long*/ event) {
+@@ -568,7 +568,7 @@ void addGdkEvent (int /*long*/ event) {
gdkEventWidgets = newWidgets;
}
Widget widget = null;
@@ -44516,7 +44573,7 @@ index 4631d4d..b750020 100644
if (handle != 0) {
do {
widget = getWidget (handle);
-@@ -618,7 +618,7 @@ public void addListener (int eventType, Listener listener) {
+@@ -619,7 +619,7 @@ public void addListener (int eventType, Listener listener) {
eventTable.hook (eventType, listener);
}
@@ -44525,7 +44582,7 @@ index 4631d4d..b750020 100644
allChildren = OS.g_list_append (allChildren, widget);
if (recurse != 0 && OS.GTK_IS_CONTAINER (widget)) {
OS.gtk_container_forall (widget, allChildrenProc, recurse);
-@@ -626,7 +626,7 @@ int /*long*/ allChildrenProc (int /*long*/ widget, int /*long*/ recurse) {
+@@ -627,7 +627,7 @@ int /*long*/ allChildrenProc (int /*long*/ widget, int /*long*/ recurse) {
return 0;
}
@@ -44534,7 +44591,7 @@ index 4631d4d..b750020 100644
if (mouseHoverId != 0) OS.g_source_remove (mouseHoverId);
mouseHoverId = OS.g_timeout_add (400, mouseHoverProc, handle);
mouseHoverHandle = handle;
-@@ -660,7 +660,7 @@ void addSkinnableWidget (Widget widget) {
+@@ -661,7 +661,7 @@ void addSkinnableWidget (Widget widget) {
skinList [skinCount++] = widget;
}
@@ -44543,7 +44600,7 @@ index 4631d4d..b750020 100644
if (handle == 0) return;
if (freeSlot == -1) {
int length = (freeSlot = indexTable.length) + GROW_SIZE;
-@@ -733,12 +733,12 @@ public void beep () {
+@@ -734,12 +734,12 @@ public void beep () {
if (!OS.GDK_WINDOWING_X11 ()) {
OS.gdk_flush ();
} else {
@@ -44558,7 +44615,7 @@ index 4631d4d..b750020 100644
Widget widget = getWidget (data);
if (widget == null) return 0;
return widget.cellDataProc (tree_column, cell, tree_model, iter, data);
-@@ -761,7 +761,7 @@ static void checkDisplay (Thread thread, boolean multiple) {
+@@ -762,7 +762,7 @@ static void checkDisplay (Thread thread, boolean multiple) {
}
}
@@ -44567,7 +44624,7 @@ index 4631d4d..b750020 100644
int type = OS.X_EVENT_TYPE (xEvent);
switch (type) {
case OS.VisibilityNotify:
-@@ -777,7 +777,7 @@ int /*long*/ checkIfEventProc (int /*long*/ display, int /*long*/ xEvent, int /*
+@@ -778,7 +778,7 @@ int /*long*/ checkIfEventProc (int /*long*/ display, int /*long*/ xEvent, int /*
default:
return 0;
}
@@ -44576,7 +44633,7 @@ index 4631d4d..b750020 100644
if (OS.GTK_VERSION >= OS.VERSION (2, 24, 0)) {
window = OS.gdk_x11_window_lookup_for_display(OS.gdk_display_get_default(), OS.X_EVENT_WINDOW (xEvent));
} else {
-@@ -786,7 +786,7 @@ int /*long*/ checkIfEventProc (int /*long*/ display, int /*long*/ xEvent, int /*
+@@ -787,7 +787,7 @@ int /*long*/ checkIfEventProc (int /*long*/ display, int /*long*/ xEvent, int /*
if (window == 0) return 0;
if (flushWindow != 0) {
if (flushAll) {
@@ -44585,7 +44642,7 @@ index 4631d4d..b750020 100644
do {
if (tempWindow == flushWindow) break;
} while ((tempWindow = OS.gdk_window_get_parent (tempWindow)) != 0);
-@@ -811,7 +811,7 @@ int /*long*/ checkIfEventProc (int /*long*/ display, int /*long*/ xEvent, int /*
+@@ -812,7 +812,7 @@ int /*long*/ checkIfEventProc (int /*long*/ display, int /*long*/ xEvent, int /*
case OS.VisibilityNotify: {
OS.memmove (visibilityEvent, xEvent, XVisibilityEvent.sizeof);
OS.gdk_window_get_user_data (window, flushData);
@@ -44594,7 +44651,7 @@ index 4631d4d..b750020 100644
Widget widget = handle != 0 ? getWidget (handle) : null;
if (widget != null && widget instanceof Control) {
Control control = (Control) widget;
-@@ -909,11 +909,11 @@ void createDisplay (DeviceData data) {
+@@ -910,11 +910,11 @@ void createDisplay (DeviceData data) {
if (OS.GTK_VERSION < OS.VERSION(2, 24, 0)) {
OS.gtk_set_locale();
}
@@ -44608,7 +44665,7 @@ index 4631d4d..b750020 100644
if (ptr != 0) {
int length = OS.strlen (ptr);
byte [] buffer = new byte [length];
-@@ -1011,9 +1011,9 @@ void createDisplay (DeviceData data) {
+@@ -1012,9 +1012,9 @@ void createDisplay (DeviceData data) {
OS.gdk_window_add_filter (0, filterProc, 0);
if (OS.GDK_WINDOWING_X11 ()) {
@@ -44620,7 +44677,7 @@ index 4631d4d..b750020 100644
OS.XSetSelectionOwner (xDisplay, atom, xWindow, OS.CurrentTime);
OS.XGetSelectionOwner (xDisplay, atom);
}
-@@ -1026,9 +1026,9 @@ void createDisplay (DeviceData data) {
+@@ -1027,9 +1027,9 @@ void createDisplay (DeviceData data) {
}
Image createImage (String name) {
@@ -44632,7 +44689,7 @@ index 4631d4d..b750020 100644
OS.gtk_icon_factory_lookup_default (buffer), style,
OS.GTK_TEXT_DIR_NONE, OS.GTK_STATE_NORMAL, OS.GTK_ICON_SIZE_DIALOG, 0, 0);
if (pixbuf == 0) return null;
-@@ -1036,7 +1036,7 @@ Image createImage (String name) {
+@@ -1037,7 +1037,7 @@ Image createImage (String name) {
int height = OS.gdk_pixbuf_get_height (pixbuf);
int stride = OS.gdk_pixbuf_get_rowstride (pixbuf);
boolean hasAlpha = OS.gdk_pixbuf_get_has_alpha (pixbuf);
@@ -44641,7 +44698,7 @@ index 4631d4d..b750020 100644
byte [] data = new byte [stride * height];
OS.memmove (data, pixels, data.length);
OS.g_object_unref (pixbuf);
-@@ -1088,7 +1088,7 @@ protected void destroy () {
+@@ -1089,7 +1089,7 @@ protected void destroy () {
void destroyDisplay () {
}
@@ -44650,7 +44707,7 @@ index 4631d4d..b750020 100644
if (OS.gtk_widget_get_toplevel (OS.g_value_peek_pointer(param_values)) == data) {
OS.gtk_widget_set_direction (OS.g_value_peek_pointer(param_values), OS.GTK_TEXT_DIR_RTL);
}
-@@ -1157,7 +1157,7 @@ void error (int code) {
+@@ -1158,7 +1158,7 @@ void error (int code) {
SWT.error (code);
}
@@ -44659,7 +44716,7 @@ index 4631d4d..b750020 100644
/*
* Use gdk_event_get_time() rather than event.time or
* gtk_get_current_event_time(). If the event does not
-@@ -1214,7 +1214,7 @@ int /*long*/ eventProc (int /*long*/ event, int /*long*/ data) {
+@@ -1215,7 +1215,7 @@ int /*long*/ eventProc (int /*long*/ event, int /*long*/ data) {
*
* @noreference This method is not intended to be referenced by clients.
*/
@@ -44668,7 +44725,7 @@ index 4631d4d..b750020 100644
checkDevice ();
return getWidget (handle);
}
-@@ -1243,7 +1243,7 @@ public Widget findWidget (int /*long*/ handle) {
+@@ -1244,7 +1244,7 @@ public Widget findWidget (int /*long*/ handle) {
*
* @since 3.1
*/
@@ -44677,7 +44734,7 @@ index 4631d4d..b750020 100644
checkDevice ();
return null;
}
-@@ -1265,12 +1265,12 @@ public Widget findWidget (int /*long*/ handle, int /*long*/ id) {
+@@ -1266,12 +1266,12 @@ public Widget findWidget (int /*long*/ handle, int /*long*/ id) {
*
* @since 3.3
*/
@@ -44692,7 +44749,7 @@ index 4631d4d..b750020 100644
GtkWidgetClass klass = new GtkWidgetClass ();
OS.memmove (klass, g_class);
klass.map = fixedMapProc;
-@@ -1280,21 +1280,21 @@ static int /*long*/ fixedClassInitProc (int /*long*/ g_class, int /*long*/ class
+@@ -1281,21 +1281,21 @@ static int /*long*/ fixedClassInitProc (int /*long*/ g_class, int /*long*/ class
return 0;
}
@@ -44717,7 +44774,7 @@ index 4631d4d..b750020 100644
GtkCellRendererClass klass = new GtkCellRendererClass ();
OS.memmove (klass, g_class);
klass.render = rendererRenderProc;
-@@ -1303,28 +1303,28 @@ static int /*long*/ rendererClassInitProc (int /*long*/ g_class, int /*long*/ cl
+@@ -1304,28 +1304,28 @@ static int /*long*/ rendererClassInitProc (int /*long*/ g_class, int /*long*/ cl
return 0;
}
@@ -44751,7 +44808,7 @@ index 4631d4d..b750020 100644
OS.XCheckIfEvent (xDisplay, xEvent, checkIfEventProc, 0);
OS.g_free (xEvent);
this.flushWindow = 0;
-@@ -1377,7 +1377,7 @@ public static Display getCurrent () {
+@@ -1378,7 +1378,7 @@ public static Display getCurrent () {
int getCaretBlinkTime () {
// checkDevice ();
@@ -44760,7 +44817,7 @@ index 4631d4d..b750020 100644
if (settings == 0) return 500;
int [] buffer = new int [1];
OS.g_object_get (settings, OS.gtk_cursor_blink, buffer, 0);
-@@ -1407,9 +1407,9 @@ int getCaretBlinkTime () {
+@@ -1408,9 +1408,9 @@ int getCaretBlinkTime () {
public Control getCursorControl () {
checkDevice();
int[] x = new int[1], y = new int[1];
@@ -44773,7 +44830,7 @@ index 4631d4d..b750020 100644
if (window != 0) {
OS.gdk_window_get_user_data (window, user_data);
handle = user_data [0];
-@@ -1422,8 +1422,8 @@ public Control getCursorControl () {
+@@ -1423,8 +1423,8 @@ public Control getCursorControl () {
if (!OS.GDK_WINDOWING_X11 ()) return null;
OS.gdk_error_trap_push ();
int[] unusedInt = new int[1];
@@ -44784,7 +44841,7 @@ index 4631d4d..b750020 100644
do {
if (OS.XQueryPointer (xDisplay, xParent, unusedPtr, buffer, unusedInt, unusedInt, unusedInt, unusedInt, unusedInt) == 0) {
handle = 0;
-@@ -1431,7 +1431,7 @@ public Control getCursorControl () {
+@@ -1432,7 +1432,7 @@ public Control getCursorControl () {
}
if ((xWindow = buffer [0]) != 0) {
xParent = xWindow;
@@ -44793,7 +44850,7 @@ index 4631d4d..b750020 100644
if (OS.GTK_VERSION >= OS.VERSION (2, 24, 0)) {
gdkWindow = OS.gdk_x11_window_lookup_for_display(OS.gdk_display_get_default(), xWindow);
} else {
-@@ -1456,15 +1456,15 @@ public Control getCursorControl () {
+@@ -1457,15 +1457,15 @@ public Control getCursorControl () {
return null;
}
@@ -44812,7 +44869,7 @@ index 4631d4d..b750020 100644
OS.gtk_widget_style_get (handle, OS.inner_border, borderPtr,0);
if (borderPtr[0] != 0) {
OS.memmove (gtkBorder, borderPtr[0], GtkBorder.sizeof);
-@@ -1489,7 +1489,7 @@ boolean filters (int eventType) {
+@@ -1490,7 +1490,7 @@ boolean filters (int eventType) {
return filterTable.hooks (eventType);
}
@@ -44821,7 +44878,7 @@ index 4631d4d..b750020 100644
Widget widget = getWidget (data);
if (widget == null) return 0;
return widget.filterProc (xEvent, gdkEvent, data);
-@@ -1605,19 +1605,19 @@ public Object getData () {
+@@ -1606,19 +1606,19 @@ public Object getData () {
return data;
}
@@ -44845,7 +44902,7 @@ index 4631d4d..b750020 100644
return toggle_renderer_type;
}
-@@ -1679,7 +1679,7 @@ public int getDismissalAlignment () {
+@@ -1680,7 +1680,7 @@ public int getDismissalAlignment () {
checkDevice ();
int [] buffer = new int [1];
if (OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) {
@@ -44854,7 +44911,7 @@ index 4631d4d..b750020 100644
OS.g_object_get (settings, OS.gtk_alternative_button_order, buffer, 0);
}
return buffer [0] == 1 ? SWT.LEFT : SWT.RIGHT;
-@@ -1699,7 +1699,7 @@ public int getDismissalAlignment () {
+@@ -1700,7 +1700,7 @@ public int getDismissalAlignment () {
*/
public int getDoubleClickTime () {
checkDevice ();
@@ -44863,7 +44920,7 @@ index 4631d4d..b750020 100644
int [] buffer = new int [1];
OS.g_object_get (settings, OS.gtk_double_click_time, buffer, 0);
return buffer [0];
-@@ -1724,8 +1724,8 @@ public Control getFocusControl () {
+@@ -1725,8 +1725,8 @@ public Control getFocusControl () {
return focusControl;
}
if (activeShell == null) return null;
@@ -44874,7 +44931,7 @@ index 4631d4d..b750020 100644
if (handle == 0) return null;
do {
Widget widget = getWidget (handle);
-@@ -1822,12 +1822,12 @@ Dialog getModalDialog () {
+@@ -1823,12 +1823,12 @@ Dialog getModalDialog () {
*/
Rectangle getWorkArea() {
byte[] name = Converter.wcsToMbcs (null, "_NET_WORKAREA", true); //$NON-NLS-1$
@@ -44890,7 +44947,7 @@ index 4631d4d..b750020 100644
if (!OS.gdk_property_get (OS.gdk_get_default_root_window(), atom, OS.GDK_NONE, 0, 16, 0, actualType, actualFormat, actualLength, data)) {
return null;
}
-@@ -1858,7 +1858,7 @@ public Monitor [] getMonitors () {
+@@ -1859,7 +1859,7 @@ public Monitor [] getMonitors () {
checkDevice ();
Monitor [] monitors = null;
Rectangle workArea = getWorkArea();
@@ -44899,7 +44956,7 @@ index 4631d4d..b750020 100644
if (screen != 0) {
int monitorCount = OS.gdk_screen_get_n_monitors (screen);
if (monitorCount > 0) {
-@@ -2178,12 +2178,12 @@ void initializeSystemColors () {
+@@ -2179,12 +2179,12 @@ void initializeSystemColors () {
GdkColor gdkColor;
/* Get Tooltip resources */
@@ -44914,7 +44971,7 @@ index 4631d4d..b750020 100644
gdkColor = new GdkColor();
OS.gtk_style_get_fg (tooltipStyle, OS.GTK_STATE_NORMAL, gdkColor);
COLOR_INFO_FOREGROUND = gdkColor;
-@@ -2193,7 +2193,7 @@ void initializeSystemColors () {
+@@ -2194,7 +2194,7 @@ void initializeSystemColors () {
OS.gtk_widget_destroy (tooltipShellHandle);
/* Get Shell resources */
@@ -44923,7 +44980,7 @@ index 4631d4d..b750020 100644
gdkColor = new GdkColor();
OS.gtk_style_get_black (style, gdkColor);
COLOR_WIDGET_DARK_SHADOW = gdkColor;
-@@ -2274,8 +2274,8 @@ void initializeSystemColors () {
+@@ -2281,8 +2281,8 @@ void initializeSystemColors () {
public Font getSystemFont () {
checkDevice ();
if (systemFont != null) return systemFont;
@@ -44934,7 +44991,7 @@ index 4631d4d..b750020 100644
return systemFont = Font.gtk_new (this, defaultFont);
}
-@@ -2348,10 +2348,10 @@ public boolean getTouchEnabled() {
+@@ -2355,10 +2355,10 @@ public boolean getTouchEnabled() {
return false;
}
@@ -44947,7 +45004,7 @@ index 4631d4d..b750020 100644
if (0 <= index && index < widgetTable.length) {
lastHandle = handle;
return lastWidget = widgetTable [(int)/*64*/index];
-@@ -2359,7 +2359,7 @@ Widget getWidget (int /*long*/ handle) {
+@@ -2366,7 +2366,7 @@ Widget getWidget (int /*long*/ handle) {
return null;
}
@@ -44956,7 +45013,7 @@ index 4631d4d..b750020 100644
boolean result = runAsyncMessages (false);
if (!result) {
synchronized (idleLock) {
-@@ -2389,7 +2389,7 @@ protected void init () {
+@@ -2396,7 +2396,7 @@ protected void init () {
}
void initializeCallbacks () {
@@ -44965,7 +45022,7 @@ index 4631d4d..b750020 100644
signalIds = new int [Widget.LAST_SIGNAL];
/* Cache signals for GtkWidget */
-@@ -2594,8 +2594,8 @@ void initializeCallbacks () {
+@@ -2601,8 +2601,8 @@ void initializeCallbacks () {
}
void initializeSubclasses () {
@@ -44976,7 +45033,7 @@ index 4631d4d..b750020 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);
-@@ -2613,10 +2613,10 @@ void initializeSystemSettings () {
+@@ -2620,10 +2620,10 @@ void initializeSystemSettings () {
* fix is to for the initializaion by creating
* a temporary GtkEntry.
*/
@@ -44989,7 +45046,7 @@ index 4631d4d..b750020 100644
OS.g_object_get (settings, OS.gtk_entry_select_on_focus, buffer2, 0);
entrySelectOnFocus = buffer2 [0] != 0;
}
-@@ -2631,9 +2631,9 @@ void initializeWidgetTable () {
+@@ -2638,9 +2638,9 @@ void initializeWidgetTable () {
void initializeWindowManager () {
/* Get the window manager name */
windowManager = ""; //$NON-NLS-1$
@@ -45001,7 +45058,7 @@ index 4631d4d..b750020 100644
if (ptr2 != 0) {
int length = OS.strlen (ptr2);
if (length > 0) {
-@@ -2660,8 +2660,8 @@ void initializeWindowManager () {
+@@ -2667,8 +2667,8 @@ void initializeWindowManager () {
*
* @noreference This method is not intended to be referenced by clients.
*/
@@ -45012,7 +45069,7 @@ index 4631d4d..b750020 100644
if (OS.USE_CAIRO) {
Cairo.cairo_destroy (gc);
} else {
-@@ -2691,10 +2691,10 @@ public void internal_dispose_GC (int /*long*/ hDC, GCData data) {
+@@ -2698,10 +2698,10 @@ public void internal_dispose_GC (int /*long*/ hDC, GCData data) {
*
* @noreference This method is not intended to be referenced by clients.
*/
@@ -45026,7 +45083,7 @@ index 4631d4d..b750020 100644
if (OS.USE_CAIRO) {
gc = OS.gdk_cairo_create (root);
if (gc == 0) error (SWT.ERROR_NO_HANDLES);
-@@ -2807,7 +2807,7 @@ public Point map (Control from, Control to, int x, int y) {
+@@ -2814,7 +2814,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) {
@@ -45035,7 +45092,7 @@ index 4631d4d..b750020 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;
-@@ -2815,7 +2815,7 @@ public Point map (Control from, Control to, int x, int y) {
+@@ -2822,7 +2822,7 @@ public Point map (Control from, Control to, int x, int y) {
point.y += origin_y [0];
}
if (to != null) {
@@ -45044,7 +45101,7 @@ index 4631d4d..b750020 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];
-@@ -2884,7 +2884,7 @@ static char mbcsToWcs (char ch) {
+@@ -2891,7 +2891,7 @@ static char mbcsToWcs (char ch) {
return result [0];
}
@@ -45053,7 +45110,7 @@ index 4631d4d..b750020 100644
Widget widget = getWidget (menu);
if (widget == null) return 0;
return widget.menuPositionProc (menu, x, y, push_in, user_data);
-@@ -2936,7 +2936,7 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei
+@@ -2943,7 +2943,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) {
@@ -45062,7 +45119,7 @@ index 4631d4d..b750020 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;
-@@ -2944,7 +2944,7 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei
+@@ -2951,7 +2951,7 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei
rect.y += origin_y [0];
}
if (to != null) {
@@ -45071,7 +45128,7 @@ index 4631d4d..b750020 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];
-@@ -2955,7 +2955,7 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei
+@@ -2962,7 +2962,7 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei
return rect;
}
@@ -45080,7 +45137,7 @@ index 4631d4d..b750020 100644
Widget widget = getWidget (handle);
if (widget == null) return 0;
return widget.hoverProc (handle);
-@@ -3035,13 +3035,13 @@ public boolean post (Event event) {
+@@ -3042,13 +3042,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;
@@ -45096,7 +45153,7 @@ index 4631d4d..b750020 100644
if (keysym != 0) keyCode = OS.XKeysymToKeycode (xDisplay, keysym);
if (keyCode == 0) {
char key = event.character;
-@@ -3123,7 +3123,7 @@ void postEvent (Event event) {
+@@ -3130,7 +3130,7 @@ void postEvent (Event event) {
void putGdkEvents () {
if (gdkEventCount != 0) {
for (int i = 0; i < gdkEventCount; i++) {
@@ -45105,7 +45162,7 @@ index 4631d4d..b750020 100644
Widget widget = gdkEventWidgets [i];
if (widget == null || !widget.isDisposed ()) {
OS.gdk_event_put (event);
-@@ -3382,8 +3382,8 @@ void releaseDisplay () {
+@@ -3390,8 +3390,8 @@ void releaseDisplay () {
signalProc = 0;
/* Dispose subclass */
@@ -45116,7 +45173,7 @@ index 4631d4d..b750020 100644
OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, pangoLayoutNewProc);
OS.g_type_class_unref (pangoLayoutClass);
pangoLayoutNewProc = 0;
-@@ -3442,9 +3442,9 @@ public void removeFilter (int eventType, Listener listener) {
+@@ -3450,9 +3450,9 @@ public void removeFilter (int eventType, Listener listener) {
if (filterTable.size () == 0) filterTable = null;
}
@@ -45128,7 +45185,7 @@ index 4631d4d..b750020 100644
--gdkEventCount;
System.arraycopy (gdkEvents, 1, gdkEvents, 0, gdkEventCount);
System.arraycopy (gdkEventWidgets, 1, gdkEventWidgets, 0, gdkEventCount);
-@@ -3493,7 +3493,7 @@ public void removeListener (int eventType, Listener listener) {
+@@ -3501,7 +3501,7 @@ public void removeListener (int eventType, Listener listener) {
eventTable.unhook (eventType, listener);
}
@@ -45137,7 +45194,7 @@ index 4631d4d..b750020 100644
if (handle != mouseHoverHandle) return;
if (mouseHoverId != 0) OS.g_source_remove (mouseHoverId);
mouseHoverId = 0;
-@@ -3510,7 +3510,7 @@ void removePopup (Menu menu) {
+@@ -3518,7 +3518,7 @@ void removePopup (Menu menu) {
}
}
@@ -45146,7 +45203,7 @@ index 4631d4d..b750020 100644
if (handle == 0) return null;
lastWidget = null;
Widget widget = null;
-@@ -3714,8 +3714,8 @@ public static void setAppVersion (String version) {
+@@ -3722,8 +3722,8 @@ public static void setAppVersion (String version) {
public void setCursorLocation (int x, int y) {
checkDevice ();
if (OS.GDK_WINDOWING_X11 ()) {
@@ -45157,7 +45214,7 @@ index 4631d4d..b750020 100644
OS.XWarpPointer (xDisplay, OS.None, xWindow, 0, 0, 0, 0, x, y);
}
}
-@@ -3783,7 +3783,7 @@ public void setData (String key, Object value) {
+@@ -3791,7 +3791,7 @@ public void setData (String key, Object value) {
}
if (key.equals (ADD_WIDGET_KEY)) {
Object [] data = (Object []) value;
@@ -45166,7 +45223,7 @@ index 4631d4d..b750020 100644
Widget widget = (Widget) data [1];
if (widget != null) {
addWidget (handle, widget);
-@@ -3872,10 +3872,10 @@ public void setData (Object data) {
+@@ -3880,10 +3880,10 @@ public void setData (Object data) {
this.data = data;
}
@@ -45179,7 +45236,7 @@ index 4631d4d..b750020 100644
if (submenu != 0) {
OS.gtk_widget_set_direction (submenu, (int)/*64*/ direction);
OS.gtk_container_forall (submenu, setDirectionProc, direction);
-@@ -3950,9 +3950,9 @@ void showIMWindow (Control control) {
+@@ -3958,9 +3958,9 @@ void showIMWindow (Control control) {
OS.gtk_container_add (preeditWindow, preeditLabel);
OS.gtk_widget_show (preeditLabel);
}
@@ -45192,7 +45249,7 @@ index 4631d4d..b750020 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 ();
-@@ -4006,7 +4006,7 @@ public boolean sleep () {
+@@ -4014,7 +4014,7 @@ public boolean sleep () {
fds = OS.g_malloc (OS.GPollFD_sizeof () * allocated_nfds);
}
max_priority [0] = timeout [0] = 0;
@@ -45201,7 +45258,7 @@ index 4631d4d..b750020 100644
boolean result = false;
do {
if (OS.g_main_context_acquire (context)) {
-@@ -4017,7 +4017,7 @@ public boolean sleep () {
+@@ -4025,7 +4025,7 @@ public boolean sleep () {
allocated_nfds = nfds;
fds = OS.g_malloc (OS.GPollFD_sizeof() * allocated_nfds);
}
@@ -45210,7 +45267,7 @@ index 4631d4d..b750020 100644
if (poll != 0) {
if (nfds > 0 || timeout [0] != 0) {
/*
-@@ -4111,7 +4111,7 @@ public void timerExec (int milliseconds, Runnable runnable) {
+@@ -4119,7 +4119,7 @@ public void timerExec (int milliseconds, Runnable runnable) {
}
}
@@ -45219,7 +45276,7 @@ index 4631d4d..b750020 100644
if (timerList == null) return 0;
int index = (int)/*64*/i;
if (0 <= index && index < timerList.length) {
-@@ -4123,7 +4123,7 @@ int /*long*/ timerProc (int /*long*/ i) {
+@@ -4131,7 +4131,7 @@ int /*long*/ timerProc (int /*long*/ i) {
return 0;
}
@@ -45228,7 +45285,7 @@ index 4631d4d..b750020 100644
caretId = 0;
if (currentCaret == null) {
return 0;
-@@ -4138,13 +4138,13 @@ int /*long*/ caretProc (int /*long*/ clientData) {
+@@ -4146,13 +4146,13 @@ int /*long*/ caretProc (int /*long*/ clientData) {
return 0;
}
@@ -45244,7 +45301,7 @@ index 4631d4d..b750020 100644
Widget widget = getWidget (user_data);
if (widget == null) return 0;
return widget.sizeRequestProc (handle, arg0, user_data);
-@@ -4202,13 +4202,13 @@ void setCurrentCaret (Caret caret) {
+@@ -4210,13 +4210,13 @@ void setCurrentCaret (Caret caret) {
caretId = OS.g_timeout_add (blinkRate, caretProc, 0);
}
@@ -45260,7 +45317,7 @@ index 4631d4d..b750020 100644
switch((int)/*64*/user_data) {
case STYLE_SET:
settingsChanged = true;
-@@ -4218,14 +4218,14 @@ int /*long*/ signalProc (int /*long*/ gobject, int /*long*/ arg1, int /*long*/ u
+@@ -4226,14 +4226,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$
@@ -45279,7 +45336,7 @@ index 4631d4d..b750020 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);
-@@ -4357,31 +4357,31 @@ static char wcsToMbcs (char ch) {
+@@ -4365,31 +4365,31 @@ static char wcsToMbcs (char ch) {
return 0;
}
@@ -45477,7 +45534,7 @@ index 5bd8366..5497665 100644
case ACTIVATE_INVERSE: {
expanded = OS.gtk_expander_get_expanded (handle);
diff --git a/org/eclipse/swt/widgets/FileDialog.java b/org/eclipse/swt/widgets/FileDialog.java
-index 0a0c755..6fc2e15 100644
+index b57f25a..23ba263 100644
--- a/org/eclipse/swt/widgets/FileDialog.java
+++ b/org/eclipse/swt/widgets/FileDialog.java
@@ -45,7 +45,7 @@ public class FileDialog extends Dialog {
@@ -45513,9 +45570,9 @@ index 0a0c755..6fc2e15 100644
if (uriMode) {
utf8Ptr = name;
} else {
-@@ -122,8 +122,8 @@ String computeResultChooserDialog () {
- OS.g_free (name);
+@@ -123,8 +123,8 @@ String computeResultChooserDialog () {
}
+ if (name != utf8Ptr) OS.g_free (name);
if (utf8Ptr != 0) {
- int /*long*/ [] items_written = new int /*long*/ [1];
- int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
@@ -45524,7 +45581,7 @@ index 0a0c755..6fc2e15 100644
OS.g_free (utf8Ptr);
if (utf16Ptr != 0) {
int clength = (int)/*64*/items_written [0];
-@@ -143,19 +143,19 @@ String computeResultChooserDialog () {
+@@ -144,11 +144,11 @@ String computeResultChooserDialog () {
}
OS.g_slist_free (list);
} else {
@@ -45537,7 +45594,8 @@ index 0a0c755..6fc2e15 100644
+ long /*int*/ path = OS.gtk_file_chooser_get_filename (handle);
if (path != 0) {
utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null);
- OS.g_free (path);
+ if (utf8Ptr == 0) utf8Ptr = OS.g_filename_display_name (path);
+@@ -156,8 +156,8 @@ String computeResultChooserDialog () {
}
}
if (utf8Ptr != 0) {
@@ -45548,7 +45606,7 @@ index 0a0c755..6fc2e15 100644
OS.g_free (utf8Ptr);
if (utf16Ptr != 0) {
int clength = (int)/*64*/items_written [0];
-@@ -169,9 +169,9 @@ String computeResultChooserDialog () {
+@@ -171,9 +171,9 @@ String computeResultChooserDialog () {
}
}
filterIndex = -1;
@@ -45560,7 +45618,7 @@ index 0a0c755..6fc2e15 100644
if (filterNamePtr != 0) {
int length = OS.strlen (filterNamePtr);
byte[] buffer = new byte [length];
-@@ -315,7 +315,7 @@ String openChooserDialog () {
+@@ -317,7 +317,7 @@ String openChooserDialog () {
int action = (style & SWT.SAVE) != 0 ?
OS.GTK_FILE_CHOOSER_ACTION_SAVE :
OS.GTK_FILE_CHOOSER_ACTION_OPEN;
@@ -45569,7 +45627,7 @@ index 0a0c755..6fc2e15 100644
Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();
if (display.getDismissalAlignment() == SWT.RIGHT) {
handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, action, OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL, OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK, 0);
-@@ -325,10 +325,10 @@ String openChooserDialog () {
+@@ -327,10 +327,10 @@ String openChooserDialog () {
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_window_set_modal (handle, true);
if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
@@ -45582,7 +45640,7 @@ index 0a0c755..6fc2e15 100644
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
-@@ -345,7 +345,7 @@ String openChooserDialog () {
+@@ -347,7 +347,7 @@ String openChooserDialog () {
display.setModalDialog (this);
}
int signalId = 0;
@@ -45591,7 +45649,7 @@ index 0a0c755..6fc2e15 100644
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
-@@ -392,7 +392,7 @@ void presetChooserDialog () {
+@@ -394,7 +394,7 @@ void presetChooserDialog () {
* when setting a file name that is not a true canonical path.
* The fix is to use the canonical path.
*/
@@ -45600,7 +45658,7 @@ index 0a0c755..6fc2e15 100644
OS.gtk_file_chooser_set_current_folder (handle, ptr);
OS.g_free (ptr);
}
-@@ -423,7 +423,7 @@ void presetChooserDialog () {
+@@ -425,7 +425,7 @@ void presetChooserDialog () {
* when setting a file name that is not a true canonical path.
* The fix is to use the canonical path.
*/
@@ -45609,7 +45667,7 @@ index 0a0c755..6fc2e15 100644
if (ptr != 0) {
if (fileName.length() > 0) {
OS.gtk_file_chooser_set_filename (handle, ptr);
-@@ -445,10 +445,10 @@ void presetChooserDialog () {
+@@ -447,10 +447,10 @@ void presetChooserDialog () {
/* Set the extension filters */
if (filterNames == null) filterNames = new String [0];
if (filterExtensions == null) filterExtensions = new String [0];
@@ -45954,7 +46012,7 @@ index 8fee01a..87947c3 100644
layout.setFont (Font.gtk_new (display, font));
}
diff --git a/org/eclipse/swt/widgets/List.java b/org/eclipse/swt/widgets/List.java
-index 9ee8e08..e718b41 100644
+index 99b7654..683626f 100644
--- a/org/eclipse/swt/widgets/List.java
+++ b/org/eclipse/swt/widgets/List.java
@@ -40,7 +40,7 @@ import org.eclipse.swt.events.*;
@@ -46433,7 +46491,7 @@ index 9ee8e08..e718b41 100644
if (iter == 0) error (SWT.ERROR_ITEM_NOT_ADDED);
for (int i=0; i<items.length; i++) {
String string = items [i];
-@@ -1473,9 +1473,9 @@ public void setSelection (String [] items) {
+@@ -1477,9 +1477,9 @@ public void setSelection (String [] items) {
public void setTopIndex (int index) {
checkWidget();
if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) return;
@@ -46445,7 +46503,7 @@ index 9ee8e08..e718b41 100644
OS.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0, 0);
if (OS.GTK_VERSION < OS.VERSION (2, 8, 0)) {
/*
-@@ -1512,9 +1512,9 @@ public void showSelection () {
+@@ -1516,9 +1516,9 @@ public void showSelection () {
checkWidget();
int index = getSelectionIndex ();
if (index == -1) return;
@@ -47255,7 +47313,7 @@ index 6d20f58..b984889 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 deed81c..6da1e86 100644
+index 7cb66e1..a8f36dd 100644
--- a/org/eclipse/swt/widgets/Shell.java
+++ b/org/eclipse/swt/widgets/Shell.java
@@ -118,7 +118,7 @@ import org.eclipse.swt.events.*;
@@ -47679,24 +47737,31 @@ index deed81c..6da1e86 100644
boolean same = false;
if (buffer == null && oldTooltip == 0) {
same = true;
-@@ -2414,12 +2414,12 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
- * 2 fake GDK_MOTION_NOTIFY events (to mimic the GTK call) which
- * contain the proper x and y coordinates.
- */
+@@ -2406,7 +2406,7 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
+ if (oldTooltip != 0) OS.g_free(oldTooltip);
+ if (same) return;
+
- int /*long*/ eventPtr = 0;
-- int /*long*/ tipWindow = OS.GTK_WIDGET_WINDOW (rootWidget);
+ long /*int*/ eventPtr = 0;
-+ long /*int*/ tipWindow = OS.GTK_WIDGET_WINDOW (rootWidget);
- if (tipWindow != 0) {
- int [] x = new int [1], y = new int [1];
-- int /*long*/ window = OS.gdk_window_at_pointer (x, y);
-- int /*long*/ [] user_data = new int /*long*/ [1];
-+ long /*int*/ window = OS.gdk_window_at_pointer (x, y);
-+ long /*int*/ [] user_data = new long /*int*/ [1];
- if (window != 0) OS.gdk_window_get_user_data (window, user_data);
- if (tipWidget == user_data [0]) {
- eventPtr = OS.gdk_event_new (OS.GDK_MOTION_NOTIFY);
-@@ -2446,9 +2446,9 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
+ if (OS.GTK_VERSION < OS.VERSION (2, 18, 0)) {
+ OS.gtk_widget_set_tooltip_text (rootWidget, null);
+ /*
+@@ -2417,11 +2417,11 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
+ * 2 fake GDK_MOTION_NOTIFY events (to mimic the GTK call) which
+ * contain the proper x and y coordinates.
+ */
+- int /*long*/ tipWindow = OS.GTK_WIDGET_WINDOW (rootWidget);
++ long /*int*/ tipWindow = OS.GTK_WIDGET_WINDOW (rootWidget);
+ if (tipWindow != 0) {
+ int [] x = new int [1], y = new int [1];
+- int /*long*/ window = OS.gdk_window_at_pointer (x, y);
+- int /*long*/ [] user_data = new int /*long*/ [1];
++ long /*int*/ window = OS.gdk_window_at_pointer (x, y);
++ long /*int*/ [] user_data = new long /*int*/ [1];
+ if (window != 0) OS.gdk_window_get_user_data (window, user_data);
+ if (tipWidget == user_data [0]) {
+ eventPtr = OS.gdk_event_new (OS.GDK_MOTION_NOTIFY);
+@@ -2449,9 +2449,9 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
char [] chars = fixMnemonic (string, false);
buffer = Converter.wcsToMbcs (null, chars, true);
}
@@ -47708,7 +47773,7 @@ index deed81c..6da1e86 100644
if (string == null && oldTooltip == 0) {
return;
} else if (string != null && oldTooltip != 0) {
-@@ -2476,7 +2476,7 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
+@@ -2479,7 +2479,7 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
* where it's deprecated.
*/
OS.gtk_tooltips_force_window (tooltipsHandle);
@@ -47717,7 +47782,7 @@ index deed81c..6da1e86 100644
if (tipWindow != 0 && tipWindow != tooltipWindow) {
OS.g_signal_connect (tipWindow, OS.size_allocate, display.sizeAllocateProc, shellHandle);
tooltipWindow = tipWindow;
-@@ -2492,9 +2492,9 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
+@@ -2495,9 +2495,9 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
if (tipWindow != 0) {
if ((OS.GTK_WIDGET_FLAGS (tipWidget) & (OS.GTK_REALIZED | OS.GTK_VISIBLE)) != 0) {
int [] x = new int [1], y = new int [1];
@@ -47729,7 +47794,7 @@ index deed81c..6da1e86 100644
OS.gdk_window_get_user_data (window, user_data);
if (tipWidget == user_data [0]) {
/*
-@@ -2508,7 +2508,7 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
+@@ -2511,7 +2511,7 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
int handler_id = OS.g_signal_connect (tipWindow, OS.size_request, display.sizeRequestProc, shellHandle);
OS.gtk_tooltips_set_tip (tooltipsHandle, tipWidget, buffer, null);
OS.gtk_widget_hide (tipWindow);
@@ -47892,7 +47957,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 2fecb00..44b3d86 100644
+index d112820..0801e36 100644
--- a/org/eclipse/swt/widgets/Spinner.java
+++ b/org/eclipse/swt/widgets/Spinner.java
@@ -45,7 +45,7 @@ import org.eclipse.swt.events.*;
@@ -48227,7 +48292,7 @@ index 2fecb00..44b3d86 100644
super.setFontDescription (font);
}
-@@ -902,7 +902,7 @@ void setFontDescription (int /*long*/ font) {
+@@ -906,7 +906,7 @@ void setForegroundColor (GdkColor color) {
public void setIncrement (int value) {
checkWidget ();
if (value < 1) return;
@@ -48236,7 +48301,7 @@ index 2fecb00..44b3d86 100644
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
double newValue = value;
-@@ -928,7 +928,7 @@ public void setIncrement (int value) {
+@@ -932,7 +932,7 @@ public void setIncrement (int value) {
*/
public void setMaximum (int value) {
checkWidget ();
@@ -48245,7 +48310,7 @@ index 2fecb00..44b3d86 100644
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
double newValue = value;
-@@ -955,7 +955,7 @@ public void setMaximum (int value) {
+@@ -959,7 +959,7 @@ public void setMaximum (int value) {
*/
public void setMinimum (int value) {
checkWidget ();
@@ -48254,7 +48319,7 @@ index 2fecb00..44b3d86 100644
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
double newValue = value;
-@@ -982,7 +982,7 @@ public void setMinimum (int value) {
+@@ -986,7 +986,7 @@ public void setMinimum (int value) {
public void setPageIncrement (int value) {
checkWidget ();
if (value < 1) return;
@@ -48263,7 +48328,7 @@ index 2fecb00..44b3d86 100644
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
double newValue = value;
-@@ -1069,7 +1069,7 @@ public void setDigits (int value) {
+@@ -1073,7 +1073,7 @@ public void setDigits (int value) {
if (value < 0) error (SWT.ERROR_INVALID_ARGUMENT);
int digits = OS.gtk_spin_button_get_digits (handle);
if (value == digits) return;
@@ -48272,7 +48337,7 @@ index 2fecb00..44b3d86 100644
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int diff = Math.abs (value - digits);
-@@ -1139,7 +1139,7 @@ public void setValues (int selection, int minimum, int maximum, int digits, int
+@@ -1143,7 +1143,7 @@ public void setValues (int selection, int minimum, int maximum, int digits, int
* depending upon the value of digits.
*/
climbRate = 1.0 / factor;
@@ -48281,7 +48346,7 @@ index 2fecb00..44b3d86 100644
OS.gtk_spin_button_configure (handle, adjustment, climbRate, digits);
OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
}
-@@ -1153,9 +1153,9 @@ boolean translateTraversal (GdkEventKey keyEvent) {
+@@ -1157,9 +1157,9 @@ boolean translateTraversal (GdkEventKey keyEvent) {
switch (key) {
case OS.GDK_KP_Enter:
case OS.GDK_Return: {
@@ -48293,7 +48358,7 @@ index 2fecb00..44b3d86 100644
OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);
if (preeditString [0] != 0) {
int length = OS.strlen (preeditString [0]);
-@@ -1174,7 +1174,7 @@ String verifyText (String string, int start, int end) {
+@@ -1178,7 +1178,7 @@ String verifyText (String string, int start, int end) {
event.text = string;
event.start = start;
event.end = end;
@@ -48302,7 +48367,7 @@ index 2fecb00..44b3d86 100644
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-@@ -1195,7 +1195,7 @@ String verifyText (String string, int start, int end) {
+@@ -1199,7 +1199,7 @@ String verifyText (String string, int start, int end) {
index = 0;
}
if (string.length () > 0) {
@@ -48478,7 +48543,7 @@ index 3dc637f..cfad258 100644
TabItem [] items = getItems ();
for (int i = 0; i < items.length; i++) {
diff --git a/org/eclipse/swt/widgets/TabItem.java b/org/eclipse/swt/widgets/TabItem.java
-index 59aea1b..07d7570 100644
+index e45e1e0..69fc47f 100644
--- a/org/eclipse/swt/widgets/TabItem.java
+++ b/org/eclipse/swt/widgets/TabItem.java
@@ -34,7 +34,7 @@ import org.eclipse.swt.graphics.*;
@@ -48524,7 +48589,7 @@ index 59aea1b..07d7570 100644
OS.gtk_widget_show (imageHandle);
} else {
diff --git a/org/eclipse/swt/widgets/Table.java b/org/eclipse/swt/widgets/Table.java
-index 158e3c1..156388c 100644
+index e472d10..57607d4 100644
--- a/org/eclipse/swt/widgets/Table.java
+++ b/org/eclipse/swt/widgets/Table.java
@@ -68,9 +68,9 @@ import org.eclipse.swt.events.*;
@@ -48589,7 +48654,7 @@ index 158e3c1..156388c 100644
if (renderer != 0) {
OS.gtk_cell_renderer_get_size (renderer, handle, null, null, null, w, null);
width += w [0];
-@@ -506,18 +506,18 @@ void createColumn (TableColumn column, int index) {
+@@ -506,19 +506,19 @@ void createColumn (TableColumn column, int index) {
modelIndex++;
}
if (modelIndex == modelLength) {
@@ -48602,6 +48667,7 @@ index 158e3c1..156388c 100644
if (newModel == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ [] ptr = new int /*long*/ [1];
+ long /*int*/ [] ptr = new long /*int*/ [1];
+ int [] ptr1 = new int [1];
for (int i=0; i<itemCount; i++) {
- int /*long*/ newItem = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ newItem = OS.g_malloc (OS.GtkTreeIter_sizeof ());
@@ -48611,11 +48677,11 @@ index 158e3c1..156388c 100644
if (item != null) {
- int /*long*/ oldItem = item.handle;
+ long /*int*/ oldItem = item.handle;
- for (int j=0; j<modelLength; j++) {
- OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);
- OS.gtk_list_store_set (newModel, newItem, j, ptr [0], -1);
-@@ -545,7 +545,7 @@ void createColumn (TableColumn column, int index) {
- modelHandle = newModel;
+ /* the columns before FOREGROUND_COLUMN contain int values, subsequent columns contain pointers */
+ for (int j=0; j<FOREGROUND_COLUMN; j++) {
+ OS.gtk_tree_model_get (oldModel, oldItem, j, ptr1, -1);
+@@ -550,7 +550,7 @@ void createColumn (TableColumn column, int index) {
+ setModel (newModel);
}
}
- int /*long*/ columnHandle = OS.gtk_tree_view_column_new ();
@@ -48623,7 +48689,7 @@ index 158e3c1..156388c 100644
if (columnHandle == 0) error (SWT.ERROR_NO_HANDLES);
if (index == 0 && columnCount > 0) {
TableColumn checkColumn = columns [0];
-@@ -596,7 +596,7 @@ void createHandle (int index) {
+@@ -601,7 +601,7 @@ void createHandle (int index) {
OS.gtk_fixed_set_has_window (fixedHandle, true);
scrolledHandle = OS.gtk_scrolled_window_new (0, 0);
if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES);
@@ -48632,7 +48698,7 @@ index 158e3c1..156388c 100644
modelHandle = OS.gtk_list_store_newv (types.length, types);
if (modelHandle == 0) error (SWT.ERROR_NO_HANDLES);
handle = OS.gtk_tree_view_new_with_model (modelHandle);
-@@ -611,7 +611,7 @@ void createHandle (int index) {
+@@ -616,7 +616,7 @@ void createHandle (int index) {
OS.gtk_container_add (scrolledHandle, handle);
int mode = (style & SWT.MULTI) != 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE;
@@ -48641,7 +48707,7 @@ index 158e3c1..156388c 100644
OS.gtk_tree_selection_set_mode (selectionHandle, mode);
OS.gtk_tree_view_set_headers_visible (handle, false);
int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
-@@ -653,11 +653,11 @@ void createItem (TableColumn column, int index) {
+@@ -658,11 +658,11 @@ void createItem (TableColumn column, int index) {
} else {
createColumn (column, index);
}
@@ -48656,7 +48722,7 @@ index 158e3c1..156388c 100644
if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_container_add (boxHandle, imageHandle);
OS.gtk_container_add (boxHandle, labelHandle);
-@@ -666,7 +666,7 @@ void createItem (TableColumn column, int index) {
+@@ -671,7 +671,7 @@ void createItem (TableColumn column, int index) {
column.labelHandle = labelHandle;
column.imageHandle = imageHandle;
OS.gtk_tree_view_column_set_widget (column.handle, boxHandle);
@@ -48665,7 +48731,7 @@ index 158e3c1..156388c 100644
while (widget != handle) {
if (OS.GTK_IS_BUTTON (widget)) {
column.buttonHandle = widget;
-@@ -732,7 +732,7 @@ void createItem (TableItem item, int index) {
+@@ -737,7 +737,7 @@ void createItem (TableItem item, int index) {
items [index] = item;
}
@@ -48674,7 +48740,7 @@ index 158e3c1..156388c 100644
OS.gtk_tree_view_column_clear (columnHandle);
if ((style & SWT.CHECK) != 0 && check) {
OS.gtk_tree_view_column_pack_start (columnHandle, checkRenderer, false);
-@@ -744,9 +744,9 @@ void createRenderers (int /*long*/ columnHandle, int modelIndex, boolean check,
+@@ -749,9 +749,9 @@ void createRenderers (int /*long*/ columnHandle, int modelIndex, boolean check,
OS.g_object_set_qdata (checkRenderer, Display.SWT_OBJECT_INDEX1, columnHandle);
}
}
@@ -48686,7 +48752,7 @@ index 158e3c1..156388c 100644
if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES);
if (ownerDraw) {
-@@ -844,7 +844,7 @@ public void deselect (int index) {
+@@ -849,7 +849,7 @@ public void deselect (int index) {
checkWidget();
if (index < 0 || index >= itemCount) return;
boolean fixColumn = showFirstColumn ();
@@ -48695,7 +48761,7 @@ index 158e3c1..156388c 100644
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_unselect_iter (selection, _getItem (index).handle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -869,7 +869,7 @@ public void deselect (int index) {
+@@ -874,7 +874,7 @@ public void deselect (int index) {
public void deselect (int start, int end) {
checkWidget();
boolean fixColumn = showFirstColumn ();
@@ -48704,7 +48770,7 @@ index 158e3c1..156388c 100644
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int index=start; index<=end; index++) {
if (index < 0 || index >= itemCount) continue;
-@@ -900,7 +900,7 @@ public void deselect (int [] indices) {
+@@ -905,7 +905,7 @@ public void deselect (int [] indices) {
checkWidget();
if (indices == null) error (SWT.ERROR_NULL_ARGUMENT);
boolean fixColumn = showFirstColumn ();
@@ -48713,7 +48779,7 @@ index 158e3c1..156388c 100644
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int i=0; i<indices.length; i++) {
int index = indices[i];
-@@ -922,7 +922,7 @@ public void deselect (int [] indices) {
+@@ -927,7 +927,7 @@ public void deselect (int [] indices) {
public void deselectAll () {
checkWidget();
boolean fixColumn = showFirstColumn ();
@@ -48722,7 +48788,7 @@ index 158e3c1..156388c 100644
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_unselect_all (selection);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -936,7 +936,7 @@ void destroyItem (TableColumn column) {
+@@ -941,7 +941,7 @@ void destroyItem (TableColumn column) {
index++;
}
if (index == columnCount) return;
@@ -48731,7 +48797,7 @@ index 158e3c1..156388c 100644
if (columnCount == 1) {
firstCustomDraw = column.customDraw;
}
-@@ -944,18 +944,18 @@ void destroyItem (TableColumn column) {
+@@ -949,19 +949,19 @@ void destroyItem (TableColumn column) {
columns [columnCount] = null;
OS.gtk_tree_view_remove_column (handle, columnHandle);
if (columnCount == 0) {
@@ -48744,6 +48810,7 @@ index 158e3c1..156388c 100644
if (newModel == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ [] ptr = new int /*long*/ [1];
+ long /*int*/ [] ptr = new long /*int*/ [1];
+ int [] ptr1 = new int [1];
for (int i=0; i<itemCount; i++) {
- int /*long*/ newItem = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ newItem = OS.g_malloc (OS.GtkTreeIter_sizeof ());
@@ -48753,19 +48820,30 @@ index 158e3c1..156388c 100644
if (item != null) {
- int /*long*/ oldItem = item.handle;
+ long /*int*/ oldItem = item.handle;
- for (int j=0; j<FIRST_COLUMN; j++) {
- OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);
- OS.gtk_list_store_set (newModel, newItem, j, ptr [0], -1);
-@@ -997,7 +997,7 @@ void destroyItem (TableColumn column) {
+ /* the columns before FOREGROUND_COLUMN contain int values, subsequent columns contain pointers */
+ for (int j=0; j<FOREGROUND_COLUMN; j++) {
+ OS.gtk_tree_model_get (oldModel, oldItem, j, ptr1, -1);
+@@ -1007,13 +1007,13 @@ void destroyItem (TableColumn column) {
for (int i=0; i<itemCount; i++) {
TableItem item = items [i];
if (item != null) {
- int /*long*/ iter = item.handle;
+ long /*int*/ iter = item.handle;
int modelIndex = column.modelIndex;
- OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_PIXBUF, 0, -1);
- OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_TEXT, 0, -1);
-@@ -1053,7 +1053,7 @@ void destroyItem (TableItem item) {
+- OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_PIXBUF, (int /*long*/)0, -1);
+- OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_TEXT, (int /*long*/)0, -1);
+- OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_FOREGROUND, (int /*long*/)0, -1);
+- OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_BACKGROUND, (int /*long*/)0, -1);
+- OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_FONT, (int /*long*/)0, -1);
++ OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_PIXBUF, (long /*int*/)0, -1);
++ OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_TEXT, (long /*int*/)0, -1);
++ OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_FOREGROUND, (long /*int*/)0, -1);
++ OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_BACKGROUND, (long /*int*/)0, -1);
++ OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_FONT, (long /*int*/)0, -1);
+
+ Font [] cellFont = item.cellFont;
+ if (cellFont != null) {
+@@ -1063,7 +1063,7 @@ void destroyItem (TableItem item) {
index++;
}
if (index == itemCount) return;
@@ -48774,7 +48852,7 @@ index 158e3c1..156388c 100644
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_list_store_remove (modelHandle, item.handle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -1065,10 +1065,10 @@ void destroyItem (TableItem item) {
+@@ -1075,10 +1075,10 @@ void destroyItem (TableItem item) {
boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean [] consume) {
boolean selected = false;
if (filter) {
@@ -48787,7 +48865,7 @@ index 158e3c1..156388c 100644
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) selected = true;
OS.gtk_tree_path_free (path [0]);
}
-@@ -1081,7 +1081,7 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean
+@@ -1091,7 +1091,7 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean
return dragDetect;
}
@@ -48796,7 +48874,7 @@ index 158e3c1..156388c 100644
return paintWindow ();
}
-@@ -1119,13 +1119,13 @@ public Rectangle getClientArea () {
+@@ -1129,13 +1129,13 @@ public Rectangle getClientArea () {
checkWidget ();
forceResize ();
OS.gtk_widget_realize (handle);
@@ -48813,7 +48891,7 @@ index 158e3c1..156388c 100644
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle);
int height = (state & ZERO_HEIGHT) != 0 ? 0 : OS.GTK_WIDGET_HEIGHT (clientHandle);
return new Rectangle (fixedX [0] - binX [0], fixedY [0] - binY [0], width, height);
-@@ -1190,8 +1190,8 @@ public int getColumnCount () {
+@@ -1200,8 +1200,8 @@ public int getColumnCount () {
return columnCount;
}
@@ -48824,7 +48902,7 @@ index 158e3c1..156388c 100644
// per row data
types [CHECKED_COLUMN] = OS.G_TYPE_BOOLEAN ();
types [GRAYED_COLUMN] = OS.G_TYPE_BOOLEAN ();
-@@ -1240,13 +1240,13 @@ int /*long*/[] getColumnTypes (int columnCount) {
+@@ -1250,13 +1250,13 @@ int /*long*/[] getColumnTypes (int columnCount) {
public int [] getColumnOrder () {
checkWidget ();
if (columnCount == 0) return new int [0];
@@ -48841,7 +48919,7 @@ index 158e3c1..156388c 100644
if (column != 0) {
for (int j=0; j<columnCount; j++) {
if (columns [j].handle == column) {
-@@ -1296,11 +1296,11 @@ public TableColumn [] getColumns () {
+@@ -1306,11 +1306,11 @@ public TableColumn [] getColumns () {
}
TableItem getFocusItem () {
@@ -48855,7 +48933,7 @@ index 158e3c1..156388c 100644
if (indices != 0) {
int [] index = new int []{-1};
OS.memmove (index, indices, 4);
-@@ -1348,7 +1348,7 @@ public int getHeaderHeight () {
+@@ -1358,7 +1358,7 @@ public int getHeaderHeight () {
GtkRequisition requisition = new GtkRequisition ();
int height = 0;
for (int i=0; i<columnCount; i++) {
@@ -48864,7 +48942,7 @@ index 158e3c1..156388c 100644
if (buttonHandle != 0) {
OS.gtk_widget_size_request (buttonHandle, requisition);
height = Math.max (height, requisition.height);
-@@ -1357,8 +1357,8 @@ public int getHeaderHeight () {
+@@ -1367,8 +1367,8 @@ public int getHeaderHeight () {
return height;
}
OS.gtk_widget_realize (handle);
@@ -48875,7 +48953,7 @@ index 158e3c1..156388c 100644
int [] binY = new int [1];
OS.gdk_window_get_origin (binWindow, null, binY);
int [] fixedY = new int [1];
-@@ -1435,11 +1435,11 @@ public TableItem getItem (int index) {
+@@ -1445,11 +1445,11 @@ public TableItem getItem (int index) {
public TableItem getItem (Point point) {
checkWidget();
if (point == null) error (SWT.ERROR_NULL_ARGUMENT);
@@ -48889,7 +48967,7 @@ index 158e3c1..156388c 100644
TableItem item = null;
if (indices != 0) {
int [] index = new int [1];
-@@ -1479,7 +1479,7 @@ public int getItemCount () {
+@@ -1489,7 +1489,7 @@ public int getItemCount () {
public int getItemHeight () {
checkWidget();
if (itemCount == 0) {
@@ -48898,7 +48976,7 @@ index 158e3c1..156388c 100644
int [] w = new int [1], h = new int [1];
ignoreSize = true;
OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
-@@ -1487,11 +1487,11 @@ public int getItemHeight () {
+@@ -1497,11 +1497,11 @@ public int getItemHeight () {
return h [0];
} else {
int height = 0;
@@ -48912,7 +48990,7 @@ index 158e3c1..156388c 100644
OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
int [] w = new int [1], h = new int [1];
OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
-@@ -1554,8 +1554,8 @@ public boolean getLinesVisible() {
+@@ -1564,8 +1564,8 @@ public boolean getLinesVisible() {
return OS.gtk_tree_view_get_rules_hint (handle);
}
@@ -48923,7 +49001,7 @@ index 158e3c1..156388c 100644
if (OS.GTK_VERSION >= OS.VERSION(2, 12, 0)) {
list = OS.gtk_cell_layout_get_cells(column);
} else {
-@@ -1564,10 +1564,10 @@ int /*long*/ getPixbufRenderer (int /*long*/ column) {
+@@ -1574,10 +1574,10 @@ int /*long*/ getPixbufRenderer (int /*long*/ column) {
if (list == 0) return 0;
int count = OS.g_list_length (list);
@@ -48936,7 +49014,7 @@ index 158e3c1..156388c 100644
if (OS.GTK_IS_CELL_RENDERER_PIXBUF (renderer)) {
pixbufRenderer = renderer;
break;
-@@ -1596,15 +1596,15 @@ int /*long*/ getPixbufRenderer (int /*long*/ column) {
+@@ -1606,15 +1606,15 @@ int /*long*/ getPixbufRenderer (int /*long*/ column) {
*/
public TableItem [] getSelection () {
checkWidget();
@@ -48956,7 +49034,7 @@ index 158e3c1..156388c 100644
if (indices != 0) {
int [] index = new int [1];
OS.memmove (index, indices, 4);
-@@ -1633,7 +1633,7 @@ public TableItem [] getSelection () {
+@@ -1643,7 +1643,7 @@ public TableItem [] getSelection () {
*/
public int getSelectionCount () {
checkWidget();
@@ -48965,7 +49043,7 @@ index 158e3c1..156388c 100644
return OS.gtk_tree_selection_count_selected_rows (selection);
}
-@@ -1650,14 +1650,14 @@ public int getSelectionCount () {
+@@ -1660,14 +1660,14 @@ public int getSelectionCount () {
*/
public int getSelectionIndex () {
checkWidget();
@@ -48984,7 +49062,7 @@ index 158e3c1..156388c 100644
if (indices != 0) {
OS.memmove (index, indices, 4);
for (int j = i; j < count; j++) {
-@@ -1692,15 +1692,15 @@ public int getSelectionIndex () {
+@@ -1702,15 +1702,15 @@ public int getSelectionIndex () {
*/
public int [] getSelectionIndices () {
checkWidget();
@@ -49004,7 +49082,7 @@ index 158e3c1..156388c 100644
if (indices != 0) {
int [] index = new int [1];
OS.memmove (index, indices, 4);
-@@ -1759,8 +1759,8 @@ public int getSortDirection () {
+@@ -1769,8 +1769,8 @@ public int getSortDirection () {
return sortDirection;
}
@@ -49015,7 +49093,7 @@ index 158e3c1..156388c 100644
if (OS.GTK_VERSION >= OS.VERSION(2, 12, 0)) {
list = OS.gtk_cell_layout_get_cells(column);
} else {
-@@ -1768,10 +1768,10 @@ int /*long*/ getTextRenderer (int /*long*/ column) {
+@@ -1778,10 +1778,10 @@ int /*long*/ getTextRenderer (int /*long*/ column) {
}
if (list == 0) return 0;
int count = OS.g_list_length (list);
@@ -49028,7 +49106,7 @@ index 158e3c1..156388c 100644
if (OS.GTK_IS_CELL_RENDERER_TEXT (renderer)) {
textRenderer = renderer;
break;
-@@ -1796,22 +1796,22 @@ int /*long*/ getTextRenderer (int /*long*/ column) {
+@@ -1806,22 +1806,22 @@ int /*long*/ getTextRenderer (int /*long*/ column) {
*/
public int getTopIndex () {
checkWidget();
@@ -49055,7 +49133,7 @@ index 158e3c1..156388c 100644
if (result != 0) return result;
/*
* Feature in GTK. In a multi-select table view, when multiple items are already
-@@ -1823,10 +1823,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
+@@ -1833,10 +1833,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
*/
int button = gdkEvent.button;
if (button == 3 && gdkEvent.type == OS.GDK_BUTTON_PRESS) {
@@ -49068,7 +49146,7 @@ index 158e3c1..156388c 100644
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;
OS.gtk_tree_path_free (path [0]);
}
-@@ -1841,10 +1841,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
+@@ -1851,10 +1851,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
* widget from automatically selecting the first item.
*/
if ((style & SWT.SINGLE) != 0 && getSelectionCount () == 0) {
@@ -49081,7 +49159,7 @@ index 158e3c1..156388c 100644
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_view_set_cursor (handle, path [0], 0, false);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -1864,13 +1864,13 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
+@@ -1874,13 +1874,13 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
@@ -49098,7 +49176,7 @@ index 158e3c1..156388c 100644
TableItem item = getFocusItem ();
if (item != null) {
Event event = new Event ();
-@@ -1880,7 +1880,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
+@@ -1890,7 +1890,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
return 0;
}
@@ -49107,7 +49185,7 @@ index 158e3c1..156388c 100644
switch (OS.GDK_EVENT_TYPE (gdkEvent)) {
case OS.GDK_EXPOSE: {
/*
-@@ -1899,22 +1899,22 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
+@@ -1909,22 +1909,22 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
return super.gtk_event_after (widget, gdkEvent);
}
@@ -49134,7 +49212,7 @@ index 158e3c1..156388c 100644
GdkRectangle rect = new GdkRectangle ();
OS.gtk_tree_view_get_cell_area (handle, path, 0, rect);
bottom = rect.y + rect.height;
-@@ -1930,8 +1930,8 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
+@@ -1940,8 +1940,8 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
return super.gtk_expose_event (widget, eventPtr);
}
@@ -49145,7 +49223,7 @@ index 158e3c1..156388c 100644
/*
* Bug in GTK. The context menu for the typeahead in GtkTreeViewer
* opens in the bottom right corner of the screen when Shift+F10
-@@ -1944,15 +1944,15 @@ int /*long*/ gtk_popup_menu (int /*long*/ widget) {
+@@ -1954,15 +1954,15 @@ int /*long*/ gtk_popup_menu (int /*long*/ widget) {
return OS.GTK_VERSION < OS.VERSION (2, 6, 5) ? 1 : result;
}
@@ -49165,7 +49243,22 @@ index 158e3c1..156388c 100644
if (indices != 0) {
int [] index = new int []{-1};
OS.memmove (index, indices, 4);
-@@ -1977,17 +1977,17 @@ int gtk_row_inserted (int model, int path, int iter) {
+@@ -1974,30 +1974,30 @@ int /*long*/ gtk_row_activated (int /*long*/ tree, int /*long*/ path, int /*long
+ return 0;
+ }
+
+-int /*long*/ gtk_row_deleted (int /*long*/ model, int /*long*/ path) {
++long /*int*/ gtk_row_deleted (long /*int*/ model, long /*int*/ path) {
+ if (ignoreAccessibility) {
+ OS.g_signal_stop_emission_by_name (model, OS.row_deleted);
+ }
+ return 0;
+ }
+
+-int /*long*/ gtk_row_inserted (int /*long*/ model, int /*long*/ path, int /*long*/ iter) {
++long /*int*/ gtk_row_inserted (long /*int*/ model, long /*int*/ path, long /*int*/ iter) {
+ if (ignoreAccessibility) {
+ OS.g_signal_stop_emission_by_name (model, OS.row_inserted);
}
return 0;
}
@@ -49187,7 +49280,7 @@ index 158e3c1..156388c 100644
if (indices != 0) {
int [] index = new int [1];
OS.memmove (index, indices, 4);
-@@ -2002,7 +2002,7 @@ int /*long*/ gtk_toggled (int /*long*/ renderer, int /*long*/ pathStr) {
+@@ -2012,7 +2012,7 @@ int /*long*/ gtk_toggled (int /*long*/ renderer, int /*long*/ pathStr) {
return 0;
}
@@ -49196,7 +49289,7 @@ index 158e3c1..156388c 100644
/*
* Bug in GTK. For some reason, gtk_widget_size_request() fails
* to include the height of the tree view items when there are
-@@ -2013,17 +2013,17 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {
+@@ -2023,17 +2023,17 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {
super.gtk_widget_size_request (widget, requisition);
return;
}
@@ -49217,7 +49310,7 @@ index 158e3c1..156388c 100644
if (fixVisible) {
columnHandle = OS.g_list_data (columns);
OS.gtk_tree_view_column_set_visible (columnHandle, true);
-@@ -2036,13 +2036,13 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {
+@@ -2046,13 +2046,13 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {
}
void hideFirstColumn () {
@@ -49233,7 +49326,7 @@ index 158e3c1..156388c 100644
OS.g_signal_connect_closure (selection, OS.changed, display.closures [CHANGED], false);
OS.g_signal_connect_closure (handle, OS.row_activated, display.closures [ROW_ACTIVATED], false);
if (checkRenderer != 0) {
-@@ -2133,9 +2133,9 @@ public int indexOf (TableItem item) {
+@@ -2143,9 +2143,9 @@ public int indexOf (TableItem item) {
*/
public boolean isSelected (int index) {
checkWidget();
@@ -49245,7 +49338,7 @@ index 158e3c1..156388c 100644
boolean answer = OS.gtk_tree_selection_path_is_selected (selection, path);
OS.gtk_tree_path_free (path);
return answer;
-@@ -2143,7 +2143,7 @@ public boolean isSelected (int index) {
+@@ -2153,7 +2153,7 @@ public boolean isSelected (int index) {
boolean mnemonicHit (char key) {
for (int i=0; i<columnCount; i++) {
@@ -49254,7 +49347,7 @@ index 158e3c1..156388c 100644
if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;
}
return false;
-@@ -2151,13 +2151,13 @@ boolean mnemonicHit (char key) {
+@@ -2161,13 +2161,13 @@ boolean mnemonicHit (char key) {
boolean mnemonicMatch (char key) {
for (int i=0; i<columnCount; i++) {
@@ -49270,7 +49363,7 @@ index 158e3c1..156388c 100644
OS.gtk_widget_realize (handle);
return OS.gtk_tree_view_get_bin_window (handle);
}
-@@ -2247,7 +2247,7 @@ void releaseWidget () {
+@@ -2257,7 +2257,7 @@ void releaseWidget () {
public void remove (int index) {
checkWidget();
if (!(0 <= index && index < itemCount)) error (SWT.ERROR_ITEM_NOT_REMOVED);
@@ -49279,7 +49372,7 @@ index 158e3c1..156388c 100644
TableItem item = items [index];
boolean disposed = false;
if (item != null) {
-@@ -2260,7 +2260,7 @@ public void remove (int index) {
+@@ -2270,7 +2270,7 @@ public void remove (int index) {
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
}
if (!disposed) {
@@ -49288,7 +49381,7 @@ index 158e3c1..156388c 100644
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_list_store_remove (modelHandle, iter);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -2292,8 +2292,8 @@ public void remove (int start, int end) {
+@@ -2302,8 +2302,8 @@ public void remove (int start, int end) {
if (!(0 <= start && start <= end && end < itemCount)) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -49299,7 +49392,7 @@ index 158e3c1..156388c 100644
if (iter == 0) error (SWT.ERROR_NO_HANDLES);
if (fixAccessibility ()) {
ignoreAccessibility = true;
-@@ -2345,9 +2345,9 @@ public void remove (int [] indices) {
+@@ -2355,9 +2355,9 @@ public void remove (int [] indices) {
if (!(0 <= start && start <= end && end < itemCount)) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -49311,7 +49404,7 @@ index 158e3c1..156388c 100644
if (iter == 0) error (SWT.ERROR_NO_HANDLES);
if (fixAccessibility ()) {
ignoreAccessibility = true;
-@@ -2401,7 +2401,7 @@ public void removeAll () {
+@@ -2411,7 +2411,7 @@ public void removeAll () {
}
items = new TableItem [4];
itemCount = 0;
@@ -49320,7 +49413,7 @@ index 158e3c1..156388c 100644
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
if (fixAccessibility ()) {
ignoreAccessibility = true;
-@@ -2462,29 +2462,29 @@ public void removeSelectionListener(SelectionListener listener) {
+@@ -2472,29 +2472,29 @@ public void removeSelectionListener(SelectionListener listener) {
eventTable.unhook (SWT.DefaultSelection,listener);
}
@@ -49330,8 +49423,7 @@ index 158e3c1..156388c 100644
+ long /*int*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell));
GtkCellRendererClass klass = new GtkCellRendererClass ();
OS.memmove (klass, g_class);
-- int /*long*/ result = OS.call (klass.get_size, cell, handle, cell_area, x_offset, y_offset, width, height);
-+ long /*int*/ result = OS.call (klass.get_size, cell, handle, cell_area, x_offset, y_offset, width, height);
+ OS.call_get_size (klass.get_size, cell, handle, cell_area, x_offset, y_offset, width, height);
if (!ignoreSize && OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
- int /*long*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2);
+ long /*int*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2);
@@ -49357,8 +49449,8 @@ index 158e3c1..156388c 100644
for (int i = 0; i < columnCount; i++) {
if (columns [i].handle == columnHandle) {
columnIndex = i;
-@@ -2524,18 +2524,18 @@ int /*long*/ rendererGetSizeProc (int /*long*/ cell, int /*long*/ widget, int /*
- return result;
+@@ -2534,18 +2534,18 @@ int /*long*/ rendererGetSizeProc (int /*long*/ cell, int /*long*/ widget, int /*
+ return 0;
}
-int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*long*/ widget, int /*long*/ background_area, int /*long*/ cell_area, int /*long*/ expose_area, int /*long*/ flags) {
@@ -49380,7 +49472,7 @@ index 158e3c1..156388c 100644
int columnIndex = 0;
if (columnCount > 0) {
for (int i = 0; i < columnCount; i++) {
-@@ -2549,7 +2549,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
+@@ -2559,7 +2559,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if (OS.GTK_IS_CELL_RENDERER_TOGGLE (cell) || (OS.GTK_IS_CELL_RENDERER_PIXBUF (cell) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) {
drawFlags = (int)/*64*/flags;
drawState = SWT.FOREGROUND;
@@ -49389,7 +49481,7 @@ index 158e3c1..156388c 100644
OS.gtk_tree_model_get (modelHandle, item.handle, Table.BACKGROUND_COLUMN, ptr, -1);
if (ptr [0] == 0) {
int modelIndex = columnCount == 0 ? Table.FIRST_COLUMN : columns [columnIndex].modelIndex;
-@@ -2563,7 +2563,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
+@@ -2573,7 +2573,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if ((flags & OS.GTK_CELL_RENDERER_FOCUSED) != 0) drawState |= SWT.FOCUSED;
GdkRectangle rect = new GdkRectangle ();
@@ -49398,7 +49490,7 @@ index 158e3c1..156388c 100644
OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);
OS.gtk_tree_path_free (path);
-@@ -2577,7 +2577,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
+@@ -2587,7 +2587,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
}
//send out measure before erase
@@ -49407,7 +49499,7 @@ index 158e3c1..156388c 100644
if (textRenderer != 0) OS.gtk_cell_renderer_get_size (textRenderer, handle, null, null, null, null, null);
-@@ -2615,7 +2615,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
+@@ -2625,7 +2625,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if ((drawState & SWT.SELECTED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_SELECTED;
if ((drawState & SWT.FOCUSED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_FOCUSED;
if ((drawState & SWT.SELECTED) != 0) {
@@ -49416,7 +49508,7 @@ index 158e3c1..156388c 100644
//TODO - parity and sorted
byte[] detail = Converter.wcsToMbcs (null, "cell_odd", true);
OS.gtk_paint_flat_box (style, window, OS.GTK_STATE_SELECTED, OS.GTK_SHADOW_NONE, rect, widget, detail, rect.x, rect.y, rect.width, rect.height);
-@@ -2626,7 +2626,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
+@@ -2636,7 +2636,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
}
}
}
@@ -49425,7 +49517,7 @@ index 158e3c1..156388c 100644
if ((drawState & SWT.BACKGROUND) != 0 && (drawState & SWT.SELECTED) == 0) {
GC gc = new GC (this);
gc.setBackground (item.getBackground (columnIndex));
-@@ -2636,7 +2636,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
+@@ -2646,7 +2646,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
gc.dispose ();
}
if ((drawState & SWT.FOREGROUND) != 0 || OS.GTK_IS_CELL_RENDERER_TOGGLE (cell)) {
@@ -49434,7 +49526,7 @@ index 158e3c1..156388c 100644
GtkCellRendererClass klass = new GtkCellRendererClass ();
OS.memmove (klass, g_class);
if (drawForeground != null && OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
-@@ -2648,7 +2648,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
+@@ -2658,7 +2658,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if (OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
if (hooks (SWT.PaintItem)) {
GdkRectangle rect = new GdkRectangle ();
@@ -49443,7 +49535,7 @@ index 158e3c1..156388c 100644
OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);
OS.gtk_tree_path_free (path);
ignoreSize = true;
-@@ -2699,8 +2699,8 @@ void resetCustomDraw () {
+@@ -2722,8 +2722,8 @@ void resetCustomDraw () {
for (int i=0; i<end; i++) {
boolean customDraw = columnCount != 0 ? columns [i].customDraw : firstCustomDraw;
if (customDraw) {
@@ -49454,7 +49546,7 @@ index 158e3c1..156388c 100644
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, 0, 0, 0);
if (columnCount != 0) columns [i].customDraw = false;
}
-@@ -2753,12 +2753,12 @@ public void select (int index) {
+@@ -2776,12 +2776,12 @@ public void select (int index) {
checkWidget();
if (!(0 <= index && index < itemCount)) return;
boolean fixColumn = showFirstColumn ();
@@ -49469,7 +49561,7 @@ index 158e3c1..156388c 100644
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
OS.gtk_tree_path_free (path);
}
-@@ -2796,13 +2796,13 @@ public void select (int start, int end) {
+@@ -2819,13 +2819,13 @@ public void select (int start, int end) {
start = Math.max (0, start);
end = Math.min (end, itemCount - 1);
boolean fixColumn = showFirstColumn ();
@@ -49485,7 +49577,7 @@ index 158e3c1..156388c 100644
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
OS.gtk_tree_path_free (path);
}
-@@ -2840,7 +2840,7 @@ public void select (int [] indices) {
+@@ -2863,7 +2863,7 @@ public void select (int [] indices) {
int length = indices.length;
if (length == 0 || ((style & SWT.SINGLE) != 0 && length > 1)) return;
boolean fixColumn = showFirstColumn ();
@@ -49494,7 +49586,7 @@ index 158e3c1..156388c 100644
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int i=0; i<length; i++) {
int index = indices [i];
-@@ -2848,7 +2848,7 @@ public void select (int [] indices) {
+@@ -2871,7 +2871,7 @@ public void select (int [] indices) {
TableItem item = _getItem (index);
OS.gtk_tree_selection_select_iter (selection, item.handle);
if ((style & SWT.SINGLE) != 0) {
@@ -49503,7 +49595,7 @@ index 158e3c1..156388c 100644
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
OS.gtk_tree_path_free (path);
}
-@@ -2872,7 +2872,7 @@ public void selectAll () {
+@@ -2895,7 +2895,7 @@ public void selectAll () {
checkWidget();
if ((style & SWT.SINGLE) != 0) return;
boolean fixColumn = showFirstColumn ();
@@ -49512,7 +49604,7 @@ index 158e3c1..156388c 100644
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_select_all (selection);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -2887,8 +2887,8 @@ void selectFocusIndex (int index) {
+@@ -2910,8 +2910,8 @@ void selectFocusIndex (int index) {
*/
if (!(0 <= index && index < itemCount)) return;
TableItem item = _getItem (index);
@@ -49523,7 +49615,7 @@ index 158e3c1..156388c 100644
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
/*
-@@ -2975,13 +2975,13 @@ public void setColumnOrder (int [] order) {
+@@ -2998,13 +2998,13 @@ public void setColumnOrder (int [] order) {
seen [index] = true;
}
for (int i=0; i<order.length; i++) {
@@ -49540,7 +49632,7 @@ index 158e3c1..156388c 100644
super.setFontDescription (font);
TableColumn[] columns = getColumns ();
for (int i = 0; i < columns.length; i++) {
-@@ -3036,7 +3036,7 @@ public void setItemCount (int count) {
+@@ -3063,7 +3063,7 @@ public void setItemCount (int count) {
System.arraycopy (items, 0, newItems, 0, itemCount);
items = newItems;
if (isVirtual) {
@@ -49549,7 +49641,16 @@ index 158e3c1..156388c 100644
if (iter == 0) error (SWT.ERROR_NO_HANDLES);
if (fixAccessibility ()) {
ignoreAccessibility = true;
-@@ -3098,8 +3098,8 @@ void setParentBackground () {
+@@ -3110,7 +3110,7 @@ public void setLinesVisible (boolean show) {
+ }
+ }
+
+-void setModel (int /*long*/ newModel) {
++void setModel (long /*int*/ newModel) {
+ display.removeWidget (modelHandle);
+ OS.g_object_unref (modelHandle);
+ modelHandle = newModel;
+@@ -3136,8 +3136,8 @@ void setParentBackground () {
recreateRenderers ();
}
@@ -49560,7 +49661,7 @@ index 158e3c1..156388c 100644
OS.gtk_widget_set_parent_window (widget, window);
}
-@@ -3117,7 +3117,7 @@ public void setRedraw (boolean redraw) {
+@@ -3155,7 +3155,7 @@ public void setRedraw (boolean redraw) {
}
}
@@ -49569,7 +49670,7 @@ index 158e3c1..156388c 100644
if (columnCount != 0 || currentItem == item) return;
int width = OS.gtk_tree_view_column_get_fixed_width (column);
int itemWidth = calculateWidth (column, item.handle);
-@@ -3369,7 +3369,7 @@ public void setSelection (TableItem [] items) {
+@@ -3407,7 +3407,7 @@ public void setSelection (TableItem [] items) {
public void setTopIndex (int index) {
checkWidget();
if (!(0 <= index && index < itemCount)) return;
@@ -49578,7 +49679,7 @@ index 158e3c1..156388c 100644
OS.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0f, 0f);
if (OS.GTK_VERSION < OS.VERSION (2, 8, 0)) {
/*
-@@ -3443,10 +3443,10 @@ boolean showFirstColumn () {
+@@ -3481,10 +3481,10 @@ boolean showFirstColumn () {
*/
int columnCount = Math.max (1, this.columnCount);
for (int i=0; i<columnCount; i++) {
@@ -49591,7 +49692,7 @@ index 158e3c1..156388c 100644
OS.gtk_tree_view_column_set_visible (firstColumn, true);
return true;
}
-@@ -3477,8 +3477,8 @@ public void showItem (TableItem item) {
+@@ -3515,8 +3515,8 @@ public void showItem (TableItem item) {
showItem (item.handle);
}
@@ -49602,7 +49703,7 @@ index 158e3c1..156388c 100644
/*
* This code intentionally commented.
* Bug in GTK. According to the documentation, gtk_tree_view_scroll_to_cell
-@@ -3544,19 +3544,19 @@ void updateScrollBarValue (ScrollBar bar) {
+@@ -3582,19 +3582,19 @@ void updateScrollBarValue (ScrollBar bar) {
* The fix is to queue a resize event for each child to
* force the position to be corrected.
*/
@@ -49627,7 +49728,7 @@ index 158e3c1..156388c 100644
switch ((int)/*64*/user_data) {
case EXPOSE_EVENT_INVERSE: {
/*
-@@ -3570,7 +3570,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ us
+@@ -3608,7 +3608,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ us
if (control != null) {
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove (gdkEvent, arg0, GdkEventExpose.sizeof);
@@ -49738,7 +49839,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 9042ad2..4aa572a 100644
+index 7c9a4d5..d1def8f 100644
--- a/org/eclipse/swt/widgets/TableItem.java
+++ b/org/eclipse/swt/widgets/TableItem.java
@@ -127,7 +127,7 @@ static Table checkNull (Table control) {
@@ -49759,14 +49860,7 @@ index 9042ad2..4aa572a 100644
int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_BACKGROUND, ptr, -1);
if (ptr [0] == 0) return _getBackground ();
-@@ -150,13 +150,13 @@ Color _getBackground (int index) {
- }
-
- boolean _getChecked () {
-- int /*long*/ [] ptr = new int /*long*/ [1];
-+ long /*int*/ [] ptr = new long /*int*/ [1];
- OS.gtk_tree_model_get (parent.modelHandle, handle, Table.CHECKED_COLUMN, ptr, -1);
- return ptr [0] != 0;
+@@ -156,7 +156,7 @@ boolean _getChecked () {
}
Color _getForeground () {
@@ -49802,7 +49896,16 @@ index 9042ad2..4aa572a 100644
int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_TEXT, ptr, -1);
if (ptr [0] == 0) return "";
-@@ -274,14 +274,14 @@ public Rectangle getBounds () {
+@@ -219,7 +219,7 @@ void clear () {
+ OS.gtk_list_store_set (parent.modelHandle, handle, i, 0, -1);
+ }
+ for (int i=Table.FOREGROUND_COLUMN; i<columnCount; i++) {
+- OS.gtk_list_store_set (parent.modelHandle, handle, i, (int /*long*/)0, -1);
++ OS.gtk_list_store_set (parent.modelHandle, handle, i, (long /*int*/)0, -1);
+ }
+ /*
+ * Bug in GTK. When using fixed-height-mode,
+@@ -278,14 +278,14 @@ public Rectangle getBounds () {
// shifted a bit too far right on later versions of GTK - however, old Tree also had this problem
checkWidget ();
if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
@@ -49822,7 +49925,7 @@ index 9042ad2..4aa572a 100644
OS.gtk_widget_realize (parentHandle);
boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
-@@ -354,15 +354,15 @@ public Color getBackground (int index) {
+@@ -358,15 +358,15 @@ public Color getBackground (int index) {
public Rectangle getBounds (int index) {
checkWidget();
if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
@@ -49841,7 +49944,7 @@ index 9042ad2..4aa572a 100644
OS.gtk_widget_realize (parentHandle);
GdkRectangle rect = new GdkRectangle ();
OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
-@@ -537,18 +537,18 @@ public Image getImage (int index) {
+@@ -541,18 +541,18 @@ public Image getImage (int index) {
public Rectangle getImageBounds (int index) {
checkWidget ();
if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
@@ -49864,7 +49967,7 @@ index 9042ad2..4aa572a 100644
OS.gtk_widget_realize (parentHandle);
OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
OS.gtk_tree_path_free (path);
-@@ -647,19 +647,19 @@ public Rectangle getTextBounds (int index) {
+@@ -651,19 +651,19 @@ public Rectangle getTextBounds (int index) {
if (0 > index || index > count - 1) return new Rectangle (0, 0, 0, 0);
// TODO fully test on early and later versions of GTK
// shifted a bit too far right on later versions of GTK - however, old Tree also had this problem
@@ -49889,7 +49992,7 @@ index 9042ad2..4aa572a 100644
OS.gtk_widget_realize (parentHandle);
boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
-@@ -698,12 +698,12 @@ public Rectangle getTextBounds (int index) {
+@@ -702,12 +702,12 @@ public Rectangle getTextBounds (int index) {
void redraw () {
if ((OS.GTK_WIDGET_FLAGS (parent.handle) & OS.GTK_REALIZED) != 0) {
@@ -49905,7 +50008,7 @@ index 9042ad2..4aa572a 100644
rect.x = 0;
int [] w = new int [1], h = new int [1];
OS.gdk_drawable_get_size (window, w, h);
-@@ -808,16 +808,16 @@ public void setBackground (int index, Color color) {
+@@ -812,16 +812,16 @@ public void setBackground (int index, Color color) {
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
@@ -49926,7 +50029,7 @@ index 9042ad2..4aa572a 100644
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
-@@ -881,7 +881,7 @@ public void setFont (Font font){
+@@ -885,7 +885,7 @@ public void setFont (Font font){
if (oldFont == font) return;
this.font = font;
if (oldFont != null && oldFont.equals (font)) return;
@@ -49935,7 +50038,7 @@ index 9042ad2..4aa572a 100644
OS.gtk_list_store_set (parent.modelHandle, handle, Table.FONT_COLUMN, fontHandle, -1);
/*
* Bug in GTK. When using fixed-height-mode,
-@@ -932,7 +932,7 @@ public void setFont (int index, Font font) {
+@@ -936,7 +936,7 @@ public void setFont (int index, Font font) {
if (oldFont != null && oldFont.equals (font)) return;
int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
@@ -49944,7 +50047,7 @@ index 9042ad2..4aa572a 100644
OS.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_FONT, fontHandle, -1);
/*
* Bug in GTK. When using fixed-height-mode,
-@@ -950,16 +950,16 @@ public void setFont (int index, Font font) {
+@@ -954,16 +954,16 @@ public void setFont (int index, Font font) {
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
@@ -49965,7 +50068,7 @@ index 9042ad2..4aa572a 100644
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
-@@ -1055,16 +1055,16 @@ public void setForeground (int index, Color color){
+@@ -1059,16 +1059,16 @@ public void setForeground (int index, Color color){
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
@@ -49986,16 +50089,7 @@ index 9042ad2..4aa572a 100644
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
-@@ -1097,7 +1097,7 @@ public void setGrayed (boolean grayed) {
- * GTK+'s "inconsistent" state does not match SWT's concept of grayed.
- * Render checked+grayed as "inconsistent", unchecked+grayed as blank.
- */
-- int /*long*/ [] ptr = new int /*long*/ [1];
-+ long /*int*/ [] ptr = new long /*int*/ [1];
- OS.gtk_tree_model_get (parent.modelHandle, handle, Table.CHECKED_COLUMN, ptr, -1);
- OS.gtk_list_store_set (parent.modelHandle, handle, Table.GRAYED_COLUMN, ptr [0] == 0 ? false : grayed, -1);
- cached = true;
-@@ -1127,7 +1127,7 @@ public void setImage (int index, Image image) {
+@@ -1131,7 +1131,7 @@ public void setImage (int index, Image image) {
}
int count = Math.max (1, parent.getColumnCount ());
if (0 > index || index > count - 1) return;
@@ -50004,7 +50098,7 @@ index 9042ad2..4aa572a 100644
if (image != null) {
ImageList imageList = parent.imageList;
if (imageList == null) imageList = parent.imageList = new ImageList ();
-@@ -1154,10 +1154,10 @@ public void setImage (int index, Image image) {
+@@ -1158,10 +1158,10 @@ public void setImage (int index, Image image) {
*/
if ((parent.style & SWT.VIRTUAL) != 0 && parent.currentItem == null) {
if (image != null) {
@@ -50018,7 +50112,7 @@ index 9042ad2..4aa572a 100644
OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w);
if (w[0] < image.getBounds().width) {
/*
-@@ -1165,7 +1165,7 @@ public void setImage (int index, Image image) {
+@@ -1169,7 +1169,7 @@ public void setImage (int index, Image image) {
* are relying on the fact that it is done as part of modifying
* the style.
*/
@@ -50028,7 +50122,7 @@ index 9042ad2..4aa572a 100644
}
}
diff --git a/org/eclipse/swt/widgets/Text.java b/org/eclipse/swt/widgets/Text.java
-index 2e018ab..bee7690 100644
+index cb3415c..dc71cd3 100644
--- a/org/eclipse/swt/widgets/Text.java
+++ b/org/eclipse/swt/widgets/Text.java
@@ -57,9 +57,9 @@ import org.eclipse.swt.events.*;
@@ -50683,7 +50777,7 @@ index 2e018ab..bee7690 100644
super.setFontDescription (font);
setTabStops (tabs);
}
-@@ -2205,19 +2205,19 @@ public void setSelection (int start) {
+@@ -2209,19 +2209,19 @@ public void setSelection (int start) {
checkWidget ();
start = translateOffset (start);
if ((style & SWT.SINGLE) != 0) {
@@ -50706,7 +50800,7 @@ index 2e018ab..bee7690 100644
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
}
}
-@@ -2252,7 +2252,7 @@ public void setSelection (int start, int end) {
+@@ -2256,7 +2256,7 @@ public void setSelection (int start, int end) {
start = translateOffset (start);
end = translateOffset (end);
if ((style & SWT.SINGLE) != 0) {
@@ -50715,7 +50809,7 @@ index 2e018ab..bee7690 100644
start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start);
end = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, end);
OS.gtk_editable_set_position (handle, start);
-@@ -2261,14 +2261,14 @@ public void setSelection (int start, int end) {
+@@ -2265,14 +2265,14 @@ public void setSelection (int start, int end) {
byte [] startIter = new byte [ITER_SIZEOF];
byte [] endIter = new byte [ITER_SIZEOF];
OS.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter);
@@ -50733,7 +50827,7 @@ index 2e018ab..bee7690 100644
OS.gtk_text_buffer_move_mark (bufferHandle, selectionMark, startIter);
OS.gtk_text_buffer_move_mark (bufferHandle, insertMark, endIter);
}
-@@ -2334,7 +2334,7 @@ public void setTabs (int tabs) {
+@@ -2338,7 +2338,7 @@ public void setTabs (int tabs) {
void setTabStops (int tabs) {
if ((style & SWT.SINGLE) != 0) return;
int tabWidth = getTabWidth (tabs);
@@ -50742,7 +50836,7 @@ index 2e018ab..bee7690 100644
OS.pango_tab_array_set_tab (tabArray, 0, OS.PANGO_TAB_LEFT, tabWidth);
OS.gtk_text_view_set_tabs (handle, tabArray);
OS.pango_tab_array_free (tabArray);
-@@ -2431,7 +2431,7 @@ void setText (char [] text) {
+@@ -2435,7 +2435,7 @@ void setText (char [] text) {
OS.g_signal_handlers_unblock_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEXT_BUFFER_INSERT_TEXT);
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, position, 0);
OS.gtk_text_buffer_place_cursor (bufferHandle, position);
@@ -50751,7 +50845,7 @@ index 2e018ab..bee7690 100644
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
}
sendEvent (SWT.Modify);
-@@ -2511,7 +2511,7 @@ public void setTopIndex (int index) {
+@@ -2515,7 +2515,7 @@ public void setTopIndex (int index) {
public void showSelection () {
checkWidget ();
if ((style & SWT.SINGLE) != 0) return;
@@ -50760,7 +50854,7 @@ index 2e018ab..bee7690 100644
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
mark = OS.gtk_text_buffer_get_insert (bufferHandle);
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
-@@ -2530,9 +2530,9 @@ boolean translateTraversal (GdkEventKey keyEvent) {
+@@ -2534,9 +2534,9 @@ boolean translateTraversal (GdkEventKey keyEvent) {
switch (key) {
case OS.GDK_KP_Enter:
case OS.GDK_Return: {
@@ -50772,7 +50866,7 @@ index 2e018ab..bee7690 100644
OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);
if (preeditString [0] != 0) {
int length = OS.strlen (preeditString [0]);
-@@ -2574,7 +2574,7 @@ String verifyText (String string, int start, int end) {
+@@ -2578,7 +2578,7 @@ String verifyText (String string, int start, int end) {
event.text = string;
event.start = start;
event.end = end;
@@ -50781,7 +50875,7 @@ index 2e018ab..bee7690 100644
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-@@ -2596,7 +2596,7 @@ String verifyText (String string, int start, int end) {
+@@ -2600,7 +2600,7 @@ String verifyText (String string, int start, int end) {
return event.text;
}
@@ -50790,7 +50884,7 @@ index 2e018ab..bee7690 100644
if (hooks (SWT.Segments) || filters (SWT.Segments) || segments != null) {
switch ((int)/*64*/user_data) {
case BACKSPACE:
-@@ -2618,7 +2618,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) {
+@@ -2622,7 +2622,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) {
return super.windowProc (handle, user_data);
}
@@ -50799,7 +50893,7 @@ index 2e018ab..bee7690 100644
if (hooks (SWT.Segments) || filters (SWT.Segments) || segments != null) {
switch ((int)/*64*/user_data) {
case DIRECTION_CHANGED: {
-@@ -2631,7 +2631,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ us
+@@ -2635,7 +2635,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ us
return super.windowProc (handle, arg0, user_data);
}
@@ -50808,7 +50902,7 @@ index 2e018ab..bee7690 100644
if (hooks (SWT.Segments) || filters (SWT.Segments) || segments != null) {
switch ((int)/*64*/user_data) {
case DELETE_FROM_CURSOR: {
-@@ -2647,7 +2647,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ ar
+@@ -2651,7 +2651,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ ar
return super.windowProc (handle, arg0, arg1, user_data);
}
@@ -50818,10 +50912,10 @@ index 2e018ab..bee7690 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 a4d939d..076edd0 100644
+index 2c77f9d..c6c4964 100644
--- a/org/eclipse/swt/widgets/ToolBar.java
+++ b/org/eclipse/swt/widgets/ToolBar.java
-@@ -197,11 +197,11 @@ Widget [] computeTabList () {
+@@ -204,11 +204,11 @@ Widget [] computeTabList () {
return result;
}
@@ -50835,7 +50929,7 @@ index a4d939d..076edd0 100644
return handle;
}
-@@ -219,10 +219,10 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De
+@@ -226,10 +226,10 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De
}
}
@@ -50848,7 +50942,7 @@ index a4d939d..076edd0 100644
if (currentFocusItem != null) childHandle = currentFocusItem.handle;
/*
* Feature in GTK. GtkToolBar takes care of navigating through
-@@ -291,7 +291,7 @@ public ToolItem getItem (Point point) {
+@@ -298,7 +298,7 @@ public ToolItem getItem (Point point) {
*/
public int getItemCount () {
checkWidget();
@@ -50857,7 +50951,7 @@ index a4d939d..076edd0 100644
if (list == 0) return 0;
int itemCount = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -320,13 +320,13 @@ public ToolItem [] getItems () {
+@@ -327,13 +327,13 @@ public ToolItem [] getItems () {
}
ToolItem [] _getItems () {
@@ -50873,7 +50967,7 @@ index a4d939d..076edd0 100644
Widget widget = display.getWidget (data);
if (widget != null) items [index++] = (ToolItem) widget;
}
-@@ -376,9 +376,9 @@ ToolItem [] _getTabItemList () {
+@@ -383,9 +383,9 @@ ToolItem [] _getTabItemList () {
return tabItemList;
}
@@ -50885,7 +50979,7 @@ index a4d939d..076edd0 100644
if (result != 0) return result;
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) {
+@@ -394,7 +394,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;
@@ -50894,7 +50988,7 @@ index a4d939d..076edd0 100644
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) {
+@@ -410,7 +410,7 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
}
}
@@ -50903,7 +50997,7 @@ index a4d939d..076edd0 100644
return 0;
}
-@@ -440,7 +440,7 @@ public int indexOf (ToolItem item) {
+@@ -447,7 +447,7 @@ public int indexOf (ToolItem item) {
return -1;
}
@@ -50912,7 +51006,7 @@ index a4d939d..076edd0 100644
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
+@@ -456,7 +456,7 @@ static int /*long*/ MenuItemSelectedProc (int /*long*/ widget, int /*long*/ user
return 0;
}
@@ -50921,7 +51015,7 @@ index a4d939d..076edd0 100644
Event event = new Event ();
switch (item.style) {
case SWT.DROP_DOWN :
-@@ -479,7 +479,7 @@ int /*long*/ menuItemSelected (int /*long*/ widget, ToolItem item) {
+@@ -486,7 +486,7 @@ int /*long*/ menuItemSelected (int /*long*/ widget, ToolItem item) {
boolean mnemonicHit (char key) {
ToolItem [] items = getItems ();
for (int i=0; i<items.length; i++) {
@@ -50930,7 +51024,7 @@ index a4d939d..076edd0 100644
if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;
}
return false;
-@@ -488,7 +488,7 @@ boolean mnemonicHit (char key) {
+@@ -495,7 +495,7 @@ boolean mnemonicHit (char key) {
boolean mnemonicMatch (char key) {
ToolItem [] items = getItems ();
for (int i=0; i<items.length; i++) {
@@ -50939,7 +51033,7 @@ index a4d939d..076edd0 100644
if (labelHandle != 0 && mnemonicMatch (labelHandle, key)) return true;
}
return false;
-@@ -565,7 +565,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
+@@ -572,7 +572,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
return result;
}
@@ -50949,7 +51043,7 @@ index a4d939d..076edd0 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 8be8ddb..9c1af26 100644
+index 157e33e..63440c1 100644
--- a/org/eclipse/swt/widgets/ToolItem.java
+++ b/org/eclipse/swt/widgets/ToolItem.java
@@ -38,8 +38,8 @@ import org.eclipse.swt.events.*;
@@ -51176,7 +51270,7 @@ index 8be8ddb..9c1af26 100644
OS.g_signal_connect_closure_by_id (topHandle, display.signalIds [MAP], 0, display.closures [MAP], true);
}
-@@ -919,7 +919,7 @@ public void setDisabledImage (Image image) {
+@@ -936,7 +936,7 @@ public void setDisabledImage (Image image) {
*/
public void setEnabled (boolean enabled) {
checkWidget();
@@ -51185,7 +51279,7 @@ index 8be8ddb..9c1af26 100644
if (OS.GTK_WIDGET_SENSITIVE (topHandle) == enabled) return;
OS.gtk_widget_set_sensitive (topHandle, enabled);
if (enabled) {
-@@ -953,7 +953,7 @@ boolean setFocus () {
+@@ -970,7 +970,7 @@ boolean setFocus () {
return OS.gtk_widget_child_focus (handle, OS.GTK_DIR_TAB_FORWARD);
}
@@ -51194,7 +51288,7 @@ index 8be8ddb..9c1af26 100644
if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font);
}
-@@ -1007,7 +1007,7 @@ public void setImage (Image image) {
+@@ -1024,7 +1024,7 @@ public void setImage (Image image) {
} else {
imageList.put (imageIndex, image);
}
@@ -51203,6 +51297,19 @@ index 8be8ddb..9c1af26 100644
OS.gtk_image_set_from_pixbuf(imageHandle, pixbuf);
} else {
OS.gtk_image_set_from_pixbuf(imageHandle, 0);
+@@ -1183,10 +1183,10 @@ public void setToolTipText (String string) {
+ }
+
+ void setToolTipText (Shell shell, String newString) {
+- int /*long*/ child = OS.gtk_bin_get_child (handle);
++ long /*int*/ child = OS.gtk_bin_get_child (handle);
+ if ((style & SWT.DROP_DOWN) != 0) {
+ if (OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) {
+- int /*long*/ list = OS.gtk_container_get_children (child);
++ long /*int*/ list = OS.gtk_container_get_children (child);
+ child = OS.g_list_nth_data (list, 0);
+ }
+ if (arrowHandle != 0) shell.setToolTipText (arrowHandle, newString);
diff --git a/org/eclipse/swt/widgets/ToolTip.java b/org/eclipse/swt/widgets/ToolTip.java
index 94dbc00..818053e 100644
--- a/org/eclipse/swt/widgets/ToolTip.java
@@ -51430,7 +51537,7 @@ index 7caf92a..101ba27 100644
this.direct = direct;
this.bounds = bounds;
diff --git a/org/eclipse/swt/widgets/Tracker.java b/org/eclipse/swt/widgets/Tracker.java
-index 812ce78..4660c21 100644
+index 099cbf0..0b136e9 100644
--- a/org/eclipse/swt/widgets/Tracker.java
+++ b/org/eclipse/swt/widgets/Tracker.java
@@ -42,7 +42,7 @@ import org.eclipse.swt.events.*;
@@ -51503,16 +51610,16 @@ index 812ce78..4660c21 100644
int [] newX = new int [1], newY = new int [1];
OS.gdk_window_get_pointer (window, newX, newY, null);
if (oldX != newX [0] || oldY != newY [0]) {
-@@ -711,7 +711,7 @@ public boolean open () {
- GdkEvent gdkEvent = new GdkEvent();
+@@ -712,7 +712,7 @@ public boolean open () {
+ Display display = this.display;
while (tracking) {
if (parent != null && parent.isDisposed ()) break;
- int /*long*/ eventPtr;
+ long /*int*/ eventPtr;
while (true) {
- eventPtr = OS.gdk_event_get ();
- if (eventPtr != 0) {
-@@ -721,7 +721,7 @@ public boolean open () {
+ display.runSkin ();
+ display.runDeferredLayouts ();
+@@ -725,7 +725,7 @@ public boolean open () {
}
}
OS.memmove (gdkEvent, eventPtr, GdkEvent.sizeof);
@@ -51649,7 +51756,7 @@ index 2a82fb8..8bce2a2 100644
OS.gtk_status_icon_set_from_pixbuf (handle, pixbuf);
OS.gtk_status_icon_set_visible (handle, true);
diff --git a/org/eclipse/swt/widgets/Tree.java b/org/eclipse/swt/widgets/Tree.java
-index 467fe70..be2122d 100644
+index 02052a5..643a691 100644
--- a/org/eclipse/swt/widgets/Tree.java
+++ b/org/eclipse/swt/widgets/Tree.java
@@ -75,9 +75,9 @@ import org.eclipse.swt.events.*;
@@ -51791,7 +51898,7 @@ index 467fe70..be2122d 100644
boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, parentIter);
int[] value = new int[1];
while (valid) {
-@@ -545,13 +545,13 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
+@@ -545,15 +545,15 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
return size;
}
@@ -51803,25 +51910,25 @@ index 467fe70..be2122d 100644
- int /*long*/ [] oldItems = new int /*long*/ [OS.gtk_tree_model_iter_n_children (oldModel, oldParent)];
+ long /*int*/ [] oldItems = new long /*int*/ [OS.gtk_tree_model_iter_n_children (oldModel, oldParent)];
int oldIndex = 0;
+- int /*long*/ [] ptr = new int /*long*/ [1];
++ long /*int*/ [] ptr = new long /*int*/ [1];
+ int [] ptr1 = new int [1];
do {
- int /*long*/ newItem = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ newItem = OS.g_malloc (OS.GtkTreeIter_sizeof ());
if (newItem == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_tree_store_append (newModel, newItem, newParent);
- int [] index = new int [1];
-@@ -560,9 +560,9 @@ void copyModel (int /*long*/ oldModel, int oldStart, int /*long*/ newModel, int
- if (index [0] != -1) {
- item = items [index [0]];
+ OS.gtk_tree_model_get (oldModel, iter, ID_COLUMN, ptr1, -1);
+@@ -562,7 +562,7 @@ void copyModel (int /*long*/ oldModel, int oldStart, int /*long*/ newModel, int
+ if (index != -1) {
+ item = items [index];
if (item != null) {
- int /*long*/ oldItem = item.handle;
+ long /*int*/ oldItem = item.handle;
oldItems[oldIndex++] = oldItem;
-- int /*long*/ [] ptr = new int /*long*/ [1];
-+ long /*int*/ [] ptr = new long /*int*/ [1];
- for (int j = 0; j < FIRST_COLUMN; j++) {
- OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);
- OS.gtk_tree_store_set (newModel, newItem, j, ptr [0], -1);
-@@ -607,7 +607,7 @@ void copyModel (int /*long*/ oldModel, int oldStart, int /*long*/ newModel, int
+ /* the columns before FOREGROUND_COLUMN contain int values, subsequent columns contain pointers */
+ for (int j = 0; j < FOREGROUND_COLUMN; j++) {
+@@ -614,7 +614,7 @@ void copyModel (int /*long*/ oldModel, int oldStart, int /*long*/ newModel, int
}
} while (OS.gtk_tree_model_iter_next(oldModel, iter));
for (int i = 0; i < oldItems.length; i++) {
@@ -51830,7 +51937,7 @@ index 467fe70..be2122d 100644
if (oldItem != 0) {
OS.gtk_tree_store_remove (oldModel, oldItem);
OS.g_free (oldItem);
-@@ -640,17 +640,17 @@ void createColumn (TreeColumn column, int index) {
+@@ -647,16 +647,16 @@ void createColumn (TreeColumn column, int index) {
modelIndex++;
}
if (modelIndex == modelLength) {
@@ -51844,8 +51951,7 @@ index 467fe70..be2122d 100644
- copyModel (oldModel, FIRST_COLUMN, newModel, FIRST_COLUMN, types, (int /*long*/)0, (int /*long*/)0, modelLength);
+ copyModel (oldModel, FIRST_COLUMN, newModel, FIRST_COLUMN, types, (long /*int*/)0, (long /*int*/)0, modelLength);
OS.gtk_tree_view_set_model (handle, newModel);
- OS.g_object_unref (oldModel);
- modelHandle = newModel;
+ setModel (newModel);
}
}
- int /*long*/ columnHandle = OS.gtk_tree_view_column_new ();
@@ -51853,7 +51959,7 @@ index 467fe70..be2122d 100644
if (columnHandle == 0) error (SWT.ERROR_NO_HANDLES);
if (index == 0 && columnCount > 0) {
TreeColumn checkColumn = columns [0];
-@@ -701,7 +701,7 @@ void createHandle (int index) {
+@@ -707,7 +707,7 @@ void createHandle (int index) {
OS.gtk_fixed_set_has_window (fixedHandle, true);
scrolledHandle = OS.gtk_scrolled_window_new (0, 0);
if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES);
@@ -51862,7 +51968,7 @@ index 467fe70..be2122d 100644
modelHandle = OS.gtk_tree_store_newv (types.length, types);
if (modelHandle == 0) error (SWT.ERROR_NO_HANDLES);
handle = OS.gtk_tree_view_new_with_model (modelHandle);
-@@ -716,7 +716,7 @@ void createHandle (int index) {
+@@ -722,7 +722,7 @@ void createHandle (int index) {
OS.gtk_container_add (scrolledHandle, handle);
int mode = (style & SWT.MULTI) != 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE;
@@ -51871,7 +51977,7 @@ index 467fe70..be2122d 100644
OS.gtk_tree_selection_set_mode (selectionHandle, mode);
OS.gtk_tree_view_set_headers_visible (handle, false);
int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
-@@ -763,11 +763,11 @@ void createItem (TreeColumn column, int index) {
+@@ -769,11 +769,11 @@ void createItem (TreeColumn column, int index) {
} else {
createColumn (column, index);
}
@@ -51886,7 +51992,7 @@ index 467fe70..be2122d 100644
if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_container_add (boxHandle, imageHandle);
OS.gtk_container_add (boxHandle, labelHandle);
-@@ -776,7 +776,7 @@ void createItem (TreeColumn column, int index) {
+@@ -782,7 +782,7 @@ void createItem (TreeColumn column, int index) {
column.labelHandle = labelHandle;
column.imageHandle = imageHandle;
OS.gtk_tree_view_column_set_widget (column.handle, boxHandle);
@@ -51895,7 +52001,7 @@ index 467fe70..be2122d 100644
while (widget != handle) {
if (OS.GTK_IS_BUTTON (widget)) {
column.buttonHandle = widget;
-@@ -810,7 +810,7 @@ void createItem (TreeColumn column, int index) {
+@@ -816,7 +816,7 @@ void createItem (TreeColumn column, int index) {
}
}
@@ -51904,7 +52010,7 @@ index 467fe70..be2122d 100644
int count = OS.gtk_tree_model_iter_n_children (modelHandle, parentIter);
if (index == -1) index = count;
if (!(0 <= index && index <= count)) error (SWT.ERROR_INVALID_RANGE);
-@@ -830,7 +830,7 @@ void createItem (TreeItem item, int /*long*/ parentIter, int index) {
+@@ -836,7 +836,7 @@ void createItem (TreeItem item, int /*long*/ parentIter, int index) {
modelChanged = true;
}
@@ -51913,7 +52019,7 @@ index 467fe70..be2122d 100644
OS.gtk_tree_view_column_clear (columnHandle);
if ((style & SWT.CHECK) != 0 && check) {
OS.gtk_tree_view_column_pack_start (columnHandle, checkRenderer, false);
-@@ -842,9 +842,9 @@ void createRenderers (int /*long*/ columnHandle, int modelIndex, boolean check,
+@@ -848,9 +848,9 @@ void createRenderers (int /*long*/ columnHandle, int modelIndex, boolean check,
OS.g_object_set_qdata (checkRenderer, Display.SWT_OBJECT_INDEX1, columnHandle);
}
}
@@ -51925,7 +52031,7 @@ index 467fe70..be2122d 100644
if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES);
if (ownerDraw) {
-@@ -948,7 +948,7 @@ public void deselect (TreeItem item) {
+@@ -954,7 +954,7 @@ public void deselect (TreeItem item) {
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
if (item.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
boolean fixColumn = showFirstColumn ();
@@ -51934,7 +52040,7 @@ index 467fe70..be2122d 100644
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_unselect_iter (selection, item.handle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -966,7 +966,7 @@ public void deselect (TreeItem item) {
+@@ -972,7 +972,7 @@ public void deselect (TreeItem item) {
public void deselectAll() {
checkWidget();
boolean fixColumn = showFirstColumn ();
@@ -51943,7 +52049,7 @@ index 467fe70..be2122d 100644
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_unselect_all (selection);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -980,7 +980,7 @@ void destroyItem (TreeColumn column) {
+@@ -986,7 +986,7 @@ void destroyItem (TreeColumn column) {
index++;
}
if (index == columnCount) return;
@@ -51952,7 +52058,7 @@ index 467fe70..be2122d 100644
if (columnCount == 1) {
firstCustomDraw = column.customDraw;
}
-@@ -988,11 +988,11 @@ void destroyItem (TreeColumn column) {
+@@ -994,11 +994,11 @@ void destroyItem (TreeColumn column) {
columns [columnCount] = null;
OS.gtk_tree_view_remove_column (handle, columnHandle);
if (columnCount == 0) {
@@ -51966,18 +52072,29 @@ index 467fe70..be2122d 100644
- copyModel(oldModel, column.modelIndex, newModel, FIRST_COLUMN, types, (int /*long*/)0, (int /*long*/)0, FIRST_COLUMN + CELL_TYPES);
+ copyModel(oldModel, column.modelIndex, newModel, FIRST_COLUMN, types, (long /*int*/)0, (long /*int*/)0, FIRST_COLUMN + CELL_TYPES);
OS.gtk_tree_view_set_model (handle, newModel);
- OS.g_object_unref (oldModel);
- modelHandle = newModel;
-@@ -1002,7 +1002,7 @@ void destroyItem (TreeColumn column) {
+ setModel (newModel);
+ createColumn (null, 0);
+@@ -1006,13 +1006,13 @@ void destroyItem (TreeColumn column) {
for (int i=0; i<items.length; i++) {
TreeItem item = items [i];
if (item != null) {
- int /*long*/ iter = item.handle;
+ long /*int*/ iter = item.handle;
int modelIndex = column.modelIndex;
- OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_PIXBUF, 0, -1);
- OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_TEXT, 0, -1);
-@@ -1056,7 +1056,7 @@ void destroyItem (TreeColumn column) {
+- OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_PIXBUF, (int /*long*/)0, -1);
+- OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_TEXT, (int /*long*/)0, -1);
+- OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_FOREGROUND, (int /*long*/)0, -1);
+- OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_BACKGROUND, (int /*long*/)0, -1);
+- OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_FONT, (int /*long*/)0, -1);
++ OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_PIXBUF, (long /*int*/)0, -1);
++ OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_TEXT, (long /*int*/)0, -1);
++ OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_FOREGROUND, (long /*int*/)0, -1);
++ OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_BACKGROUND, (long /*int*/)0, -1);
++ OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_FONT, (long /*int*/)0, -1);
+
+ Font [] cellFont = item.cellFont;
+ if (cellFont != null) {
+@@ -1060,7 +1060,7 @@ void destroyItem (TreeColumn column) {
void destroyItem (TreeItem item) {
@@ -51986,7 +52103,7 @@ index 467fe70..be2122d 100644
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_store_remove (modelHandle, item.handle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -1066,10 +1066,10 @@ void destroyItem (TreeItem item) {
+@@ -1070,10 +1070,10 @@ void destroyItem (TreeItem item) {
boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean [] consume) {
boolean selected = false;
if (filter) {
@@ -51999,7 +52116,7 @@ index 467fe70..be2122d 100644
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) selected = true;
OS.gtk_tree_path_free (path [0]);
}
-@@ -1082,7 +1082,7 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean
+@@ -1086,7 +1086,7 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean
return dragDetect;
}
@@ -52008,7 +52125,7 @@ index 467fe70..be2122d 100644
return paintWindow ();
}
-@@ -1120,13 +1120,13 @@ public Rectangle getClientArea () {
+@@ -1124,13 +1124,13 @@ public Rectangle getClientArea () {
checkWidget ();
forceResize ();
OS.gtk_widget_realize (handle);
@@ -52025,7 +52142,7 @@ index 467fe70..be2122d 100644
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle);
int height = (state & ZERO_HEIGHT) != 0 ? 0 : OS.GTK_WIDGET_HEIGHT (clientHandle);
return new Rectangle (fixedX [0] - binX [0], fixedY [0] - binY [0], width, height);
-@@ -1226,13 +1226,13 @@ public int getColumnCount () {
+@@ -1230,13 +1230,13 @@ public int getColumnCount () {
public int [] getColumnOrder () {
checkWidget ();
if (columnCount == 0) return new int [0];
@@ -52042,7 +52159,7 @@ index 467fe70..be2122d 100644
if (column != 0) {
for (int j=0; j<columnCount; j++) {
if (columns [j].handle == column) {
-@@ -1247,8 +1247,8 @@ public int [] getColumnOrder () {
+@@ -1251,8 +1251,8 @@ public int [] getColumnOrder () {
return order;
}
@@ -52053,7 +52170,7 @@ index 467fe70..be2122d 100644
// per row data
types [ID_COLUMN] = OS.G_TYPE_INT ();
types [CHECKED_COLUMN] = OS.G_TYPE_BOOLEAN ();
-@@ -1304,11 +1304,11 @@ public TreeColumn [] getColumns () {
+@@ -1308,11 +1308,11 @@ public TreeColumn [] getColumns () {
}
TreeItem getFocusItem () {
@@ -52067,7 +52184,7 @@ index 467fe70..be2122d 100644
if (OS.gtk_tree_model_get_iter (modelHandle, iter, path [0])) {
int [] index = new int [1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
-@@ -1359,7 +1359,7 @@ public int getHeaderHeight () {
+@@ -1363,7 +1363,7 @@ public int getHeaderHeight () {
GtkRequisition requisition = new GtkRequisition ();
int height = 0;
for (int i=0; i<columnCount; i++) {
@@ -52076,7 +52193,7 @@ index 467fe70..be2122d 100644
if (buttonHandle != 0) {
OS.gtk_widget_size_request (buttonHandle, requisition);
height = Math.max (height, requisition.height);
-@@ -1368,8 +1368,8 @@ public int getHeaderHeight () {
+@@ -1372,8 +1372,8 @@ public int getHeaderHeight () {
return height;
}
OS.gtk_widget_realize (handle);
@@ -52087,7 +52204,7 @@ index 467fe70..be2122d 100644
int [] binY = new int [1];
OS.gdk_window_get_origin (binWindow, null, binY);
int [] fixedY = new int [1];
-@@ -1452,16 +1452,16 @@ public TreeItem getItem (int index) {
+@@ -1456,16 +1456,16 @@ public TreeItem getItem (int index) {
public TreeItem getItem (Point point) {
checkWidget ();
if (point == null) error (SWT.ERROR_NULL_ARGUMENT);
@@ -52107,7 +52224,7 @@ index 467fe70..be2122d 100644
if (OS.gtk_tree_model_get_iter (modelHandle, iter, path [0])) {
boolean overExpander = false;
if (OS.gtk_tree_view_get_expander_column (handle) == columnHandle [0]) {
-@@ -1521,7 +1521,7 @@ public int getItemHeight () {
+@@ -1525,7 +1525,7 @@ public int getItemHeight () {
checkWidget ();
int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
if (itemCount == 0) {
@@ -52116,7 +52233,7 @@ index 467fe70..be2122d 100644
int [] w = new int [1], h = new int [1];
ignoreSize = true;
OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
-@@ -1529,11 +1529,11 @@ public int getItemHeight () {
+@@ -1533,11 +1533,11 @@ public int getItemHeight () {
return h [0];
} else {
int height = 0;
@@ -52130,7 +52247,7 @@ index 467fe70..be2122d 100644
OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
int [] w = new int [1], h = new int [1];
OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
-@@ -1566,7 +1566,7 @@ public TreeItem [] getItems () {
+@@ -1570,7 +1570,7 @@ public TreeItem [] getItems () {
return getItems (0);
}
@@ -52139,7 +52256,7 @@ index 467fe70..be2122d 100644
int length = OS.gtk_tree_model_iter_n_children (modelHandle, parent);
TreeItem[] result = new TreeItem [length];
if (length == 0) return result;
-@@ -1577,7 +1577,7 @@ TreeItem [] getItems (int /*long*/ parent) {
+@@ -1581,7 +1581,7 @@ TreeItem [] getItems (int /*long*/ parent) {
} else {
int i = 0;
int[] index = new int [1];
@@ -52148,7 +52265,7 @@ index 467fe70..be2122d 100644
boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, parent);
while (valid) {
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
-@@ -1631,8 +1631,8 @@ public TreeItem getParentItem () {
+@@ -1635,8 +1635,8 @@ public TreeItem getParentItem () {
return null;
}
@@ -52159,7 +52276,7 @@ index 467fe70..be2122d 100644
if (OS.GTK_VERSION >= OS.VERSION(2, 12, 0)) {
list = OS.gtk_cell_layout_get_cells(column);
} else {
-@@ -1640,10 +1640,10 @@ int /*long*/ getPixbufRenderer (int /*long*/ column) {
+@@ -1644,10 +1644,10 @@ int /*long*/ getPixbufRenderer (int /*long*/ column) {
}
if (list == 0) return 0;
int count = OS.g_list_length (list);
@@ -52172,7 +52289,7 @@ index 467fe70..be2122d 100644
if (OS.GTK_IS_CELL_RENDERER_PIXBUF (renderer)) {
pixbufRenderer = renderer;
break;
-@@ -1672,15 +1672,15 @@ int /*long*/ getPixbufRenderer (int /*long*/ column) {
+@@ -1676,15 +1676,15 @@ int /*long*/ getPixbufRenderer (int /*long*/ column) {
*/
public TreeItem[] getSelection () {
checkWidget();
@@ -52192,7 +52309,7 @@ index 467fe70..be2122d 100644
if (OS.gtk_tree_model_get_iter (modelHandle, iter, data)) {
treeSelection [length] = _getItem (iter);
length++;
-@@ -1711,7 +1711,7 @@ public TreeItem[] getSelection () {
+@@ -1715,7 +1715,7 @@ public TreeItem[] getSelection () {
*/
public int getSelectionCount () {
checkWidget();
@@ -52201,7 +52318,7 @@ index 467fe70..be2122d 100644
return OS.gtk_tree_selection_count_selected_rows (selection);
}
-@@ -1757,8 +1757,8 @@ public int getSortDirection () {
+@@ -1761,8 +1761,8 @@ public int getSortDirection () {
return sortDirection;
}
@@ -52212,7 +52329,7 @@ index 467fe70..be2122d 100644
if (OS.GTK_VERSION >= OS.VERSION(2, 12, 0)) {
list = OS.gtk_cell_layout_get_cells(column);
} else {
-@@ -1766,10 +1766,10 @@ int /*long*/ getTextRenderer (int /*long*/ column) {
+@@ -1770,10 +1770,10 @@ int /*long*/ getTextRenderer (int /*long*/ column) {
}
if (list == 0) return 0;
int count = OS.g_list_length (list);
@@ -52225,7 +52342,7 @@ index 467fe70..be2122d 100644
if (OS.GTK_IS_CELL_RENDERER_TEXT (renderer)) {
textRenderer = renderer;
break;
-@@ -1796,12 +1796,12 @@ int /*long*/ getTextRenderer (int /*long*/ column) {
+@@ -1800,12 +1800,12 @@ int /*long*/ getTextRenderer (int /*long*/ column) {
*/
public TreeItem getTopItem () {
checkWidget ();
@@ -52240,7 +52357,7 @@ index 467fe70..be2122d 100644
if (OS.gtk_tree_model_get_iter (modelHandle, iter, path [0])) {
item = _getItem (iter);
}
-@@ -1810,11 +1810,11 @@ public TreeItem getTopItem () {
+@@ -1814,11 +1814,11 @@ public TreeItem getTopItem () {
return item;
}
@@ -52254,7 +52371,7 @@ index 467fe70..be2122d 100644
if (result != 0) return result;
/*
* Feature in GTK. In a multi-select tree view, when multiple items are already
-@@ -1826,10 +1826,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
+@@ -1830,10 +1830,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
*/
int button = gdkEvent.button;
if (button == 3 && gdkEvent.type == OS.GDK_BUTTON_PRESS) {
@@ -52267,7 +52384,7 @@ index 467fe70..be2122d 100644
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;
OS.gtk_tree_path_free (path [0]);
}
-@@ -1844,10 +1844,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
+@@ -1848,10 +1848,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
* widget from automatically selecting the first item.
*/
if ((style & SWT.SINGLE) != 0 && getSelectionCount () == 0) {
@@ -52280,7 +52397,7 @@ index 467fe70..be2122d 100644
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_view_set_cursor (handle, path [0], 0, false);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -1867,13 +1867,13 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
+@@ -1871,13 +1871,13 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
@@ -52297,7 +52414,7 @@ index 467fe70..be2122d 100644
TreeItem item = getFocusItem ();
if (item != null) {
Event event = new Event ();
-@@ -1883,7 +1883,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
+@@ -1887,7 +1887,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
return 0;
}
@@ -52306,7 +52423,7 @@ index 467fe70..be2122d 100644
switch (OS.GDK_EVENT_TYPE (gdkEvent)) {
case OS.GDK_EXPOSE: {
/*
-@@ -1902,32 +1902,32 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
+@@ -1906,32 +1906,32 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
return super.gtk_event_after (widget, gdkEvent);
}
@@ -52345,7 +52462,7 @@ index 467fe70..be2122d 100644
OS.gtk_tree_view_get_cell_area (handle, path, 0, rect);
expanded = OS.gtk_tree_view_row_expanded (handle, path);
OS.gtk_tree_path_free (path);
-@@ -1944,14 +1944,14 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
+@@ -1948,14 +1948,14 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
return super.gtk_expose_event (widget, eventPtr);
}
@@ -52364,7 +52481,7 @@ index 467fe70..be2122d 100644
/*
* Bug in GTK. The context menu for the typeahead in GtkTreeViewer
* opens in the bottom right corner of the screen when Shift+F10
-@@ -1964,10 +1964,10 @@ int /*long*/ gtk_popup_menu (int /*long*/ widget) {
+@@ -1968,10 +1968,10 @@ int /*long*/ gtk_popup_menu (int /*long*/ widget) {
return OS.GTK_VERSION < OS.VERSION (2, 6, 5) ? 1 : result;
}
@@ -52377,7 +52494,23 @@ index 467fe70..be2122d 100644
if (OS.gtk_tree_model_get_iter (modelHandle, iter, path)) {
int [] index = new int [1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
-@@ -1994,7 +1994,7 @@ int gtk_row_inserted (int model, int path, int iter) {
+@@ -1984,21 +1984,21 @@ int /*long*/ gtk_row_activated (int /*long*/ tree, int /*long*/ path, int /*long
+ return 0;
+ }
+
+-int /*long*/ gtk_row_deleted (int /*long*/ model, int /*long*/ path) {
++long /*int*/ gtk_row_deleted (long /*int*/ model, long /*int*/ path) {
+ if (ignoreAccessibility) {
+ OS.g_signal_stop_emission_by_name (model, OS.row_deleted);
+ }
+ return 0;
+ }
+
+-int /*long*/ gtk_row_inserted (int /*long*/ model, int /*long*/ path, int /*long*/ iter) {
++long /*int*/ gtk_row_inserted (long /*int*/ model, long /*int*/ path, long /*int*/ iter) {
+ if (ignoreAccessibility) {
+ OS.g_signal_stop_emission_by_name (model, OS.row_inserted);
+ }
return 0;
}
@@ -52386,7 +52519,7 @@ index 467fe70..be2122d 100644
if (!searchEnabled()) {
OS.g_signal_stop_emission_by_name(widget, OS.start_interactive_search);
return 1;
-@@ -2002,7 +2002,7 @@ int /*long*/ gtk_start_interactive_search(int /*long*/ widget) {
+@@ -2006,7 +2006,7 @@ int /*long*/ gtk_start_interactive_search(int /*long*/ widget) {
return 0;
}
@@ -52395,7 +52528,7 @@ index 467fe70..be2122d 100644
int [] index = new int [1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
TreeItem item = items [index [0]];
-@@ -2040,7 +2040,7 @@ int /*long*/ gtk_test_collapse_row (int /*long*/ tree, int /*long*/ iter, int /*
+@@ -2044,7 +2044,7 @@ int /*long*/ gtk_test_collapse_row (int /*long*/ tree, int /*long*/ iter, int /*
return 0;
}
@@ -52404,7 +52537,7 @@ index 467fe70..be2122d 100644
int [] index = new int [1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
TreeItem item = items [index [0]];
-@@ -2082,11 +2082,11 @@ int /*long*/ gtk_test_expand_row (int /*long*/ tree, int /*long*/ iter, int /*lo
+@@ -2086,11 +2086,11 @@ int /*long*/ gtk_test_expand_row (int /*long*/ tree, int /*long*/ iter, int /*lo
return 0;
}
@@ -52419,7 +52552,7 @@ index 467fe70..be2122d 100644
if (OS.gtk_tree_model_get_iter (modelHandle, iter, path)) {
item = _getItem (iter);
}
-@@ -2102,7 +2102,7 @@ int /*long*/ gtk_toggled (int /*long*/ renderer, int /*long*/ pathStr) {
+@@ -2106,7 +2106,7 @@ int /*long*/ gtk_toggled (int /*long*/ renderer, int /*long*/ pathStr) {
return 0;
}
@@ -52428,7 +52561,7 @@ index 467fe70..be2122d 100644
/*
* Bug in GTK. For some reason, gtk_widget_size_request() fails
* to include the height of the tree view items when there are
-@@ -2113,17 +2113,17 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {
+@@ -2117,17 +2117,17 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {
super.gtk_widget_size_request (widget, requisition);
return;
}
@@ -52449,7 +52582,7 @@ index 467fe70..be2122d 100644
if (fixVisible) {
columnHandle = OS.g_list_data (columns);
OS.gtk_tree_view_column_set_visible (columnHandle, true);
-@@ -2136,13 +2136,13 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {
+@@ -2140,13 +2140,13 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {
}
void hideFirstColumn () {
@@ -52465,7 +52598,7 @@ index 467fe70..be2122d 100644
OS.g_signal_connect_closure (selection, OS.changed, display.closures [CHANGED], false);
OS.g_signal_connect_closure (handle, OS.row_activated, display.closures [ROW_ACTIVATED], false);
OS.g_signal_connect_closure (handle, OS.test_expand_row, display.closures [TEST_EXPAND_ROW], false);
-@@ -2211,10 +2211,10 @@ public int indexOf (TreeItem item) {
+@@ -2215,10 +2215,10 @@ public int indexOf (TreeItem item) {
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
int index = -1;
@@ -52478,7 +52611,7 @@ index 467fe70..be2122d 100644
if (indices != 0) {
int[] temp = new int[1];
OS.memmove (temp, indices, 4);
-@@ -2227,7 +2227,7 @@ public int indexOf (TreeItem item) {
+@@ -2231,7 +2231,7 @@ public int indexOf (TreeItem item) {
boolean mnemonicHit (char key) {
for (int i=0; i<columnCount; i++) {
@@ -52487,7 +52620,7 @@ index 467fe70..be2122d 100644
if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;
}
return false;
-@@ -2235,13 +2235,13 @@ boolean mnemonicHit (char key) {
+@@ -2239,13 +2239,13 @@ boolean mnemonicHit (char key) {
boolean mnemonicMatch (char key) {
for (int i=0; i<columnCount; i++) {
@@ -52503,7 +52636,7 @@ index 467fe70..be2122d 100644
OS.gtk_widget_realize (handle);
return OS.gtk_tree_view_get_bin_window (handle);
}
-@@ -2288,9 +2288,9 @@ void releaseItem (TreeItem item, boolean release) {
+@@ -2292,9 +2292,9 @@ void releaseItem (TreeItem item, boolean release) {
items [index [0]] = null;
}
@@ -52515,7 +52648,7 @@ index 467fe70..be2122d 100644
boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, parentIter);
while (valid) {
releaseItems (iter);
-@@ -2340,14 +2340,14 @@ void releaseWidget () {
+@@ -2344,14 +2344,14 @@ void releaseWidget () {
currentItem = null;
}
@@ -52533,7 +52666,7 @@ index 467fe70..be2122d 100644
if (iter == 0) error (SWT.ERROR_NO_HANDLES);
if (fixAccessibility ()) {
ignoreAccessibility = true;
-@@ -2387,7 +2387,7 @@ public void removeAll () {
+@@ -2391,7 +2391,7 @@ public void removeAll () {
if (item != null && !item.isDisposed ()) item.release (false);
}
items = new TreeItem[4];
@@ -52542,7 +52675,7 @@ index 467fe70..be2122d 100644
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
if (fixAccessibility ()) {
ignoreAccessibility = true;
-@@ -2471,19 +2471,19 @@ public void removeTreeListener(TreeListener listener) {
+@@ -2475,19 +2475,19 @@ public void removeTreeListener(TreeListener listener) {
eventTable.unhook (SWT.Collapse, listener);
}
@@ -52552,8 +52685,7 @@ index 467fe70..be2122d 100644
+ long /*int*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell));
GtkCellRendererClass klass = new GtkCellRendererClass ();
OS.memmove (klass, g_class);
-- int /*long*/ result = OS.call (klass.get_size, cell, handle, cell_area, x_offset, y_offset, width, height);
-+ long /*int*/ result = OS.call (klass.get_size, cell, handle, cell_area, x_offset, y_offset, width, height);
+ OS.call_get_size (klass.get_size, cell, handle, cell_area, x_offset, y_offset, width, height);
if (!ignoreSize && OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
- int /*long*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2);
+ long /*int*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2);
@@ -52567,7 +52699,7 @@ index 467fe70..be2122d 100644
for (int i = 0; i < columnCount; i++) {
if (columns [i].handle == columnHandle) {
columnIndex = i;
-@@ -2510,8 +2510,8 @@ int /*long*/ rendererGetSizeProc (int /*long*/ cell, int /*long*/ widget, int /*
+@@ -2514,8 +2514,8 @@ int /*long*/ rendererGetSizeProc (int /*long*/ cell, int /*long*/ widget, int /*
event.gc = gc;
event.width = contentWidth [0];
event.height = contentHeight [0];
@@ -52578,8 +52710,8 @@ index 467fe70..be2122d 100644
if (OS.gtk_tree_selection_path_is_selected (selection, path)) {
event.detail = SWT.SELECTED;
}
-@@ -2528,11 +2528,11 @@ int /*long*/ rendererGetSizeProc (int /*long*/ cell, int /*long*/ widget, int /*
- return result;
+@@ -2532,11 +2532,11 @@ int /*long*/ rendererGetSizeProc (int /*long*/ cell, int /*long*/ widget, int /*
+ return 0;
}
-int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*long*/ widget, int /*long*/ background_area, int /*long*/ cell_area, int /*long*/ expose_area, int /*long*/ flags) {
@@ -52593,7 +52725,7 @@ index 467fe70..be2122d 100644
int columnIndex = 0;
if (columnCount > 0) {
for (int i = 0; i < columnCount; i++) {
-@@ -2546,7 +2546,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
+@@ -2550,7 +2550,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if (OS.GTK_IS_CELL_RENDERER_TOGGLE (cell) || (OS.GTK_IS_CELL_RENDERER_PIXBUF (cell) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) {
drawFlags = (int)/*64*/flags;
drawState = SWT.FOREGROUND;
@@ -52602,7 +52734,7 @@ index 467fe70..be2122d 100644
OS.gtk_tree_model_get (modelHandle, item.handle, Tree.BACKGROUND_COLUMN, ptr, -1);
if (ptr [0] == 0) {
int modelIndex = columnCount == 0 ? Tree.FIRST_COLUMN : columns [columnIndex].modelIndex;
-@@ -2560,7 +2560,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
+@@ -2564,7 +2564,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if ((flags & OS.GTK_CELL_RENDERER_FOCUSED) != 0) drawState |= SWT.FOCUSED;
GdkRectangle rect = new GdkRectangle ();
@@ -52611,7 +52743,7 @@ index 467fe70..be2122d 100644
OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);
OS.gtk_tree_path_free (path);
-@@ -2574,7 +2574,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
+@@ -2578,7 +2578,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
}
//send out measure before erase
@@ -52620,7 +52752,7 @@ index 467fe70..be2122d 100644
if (textRenderer != 0) OS.gtk_cell_renderer_get_size (textRenderer, handle, null, null, null, null, null);
if (hooks (SWT.EraseItem)) {
-@@ -2611,7 +2611,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
+@@ -2615,7 +2615,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if ((drawState & SWT.SELECTED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_SELECTED;
if ((drawState & SWT.FOCUSED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_FOCUSED;
if ((drawState & SWT.SELECTED) != 0) {
@@ -52629,7 +52761,7 @@ index 467fe70..be2122d 100644
//TODO - parity and sorted
byte[] detail = Converter.wcsToMbcs (null, "cell_odd", true);
OS.gtk_paint_flat_box (style, window, OS.GTK_STATE_SELECTED, OS.GTK_SHADOW_NONE, rect, widget, detail, rect.x, rect.y, rect.width, rect.height);
-@@ -2622,7 +2622,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
+@@ -2626,7 +2626,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
}
}
}
@@ -52638,7 +52770,7 @@ index 467fe70..be2122d 100644
if ((drawState & SWT.BACKGROUND) != 0 && (drawState & SWT.SELECTED) == 0) {
GC gc = new GC (this);
gc.setBackground (item.getBackground (columnIndex));
-@@ -2632,7 +2632,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
+@@ -2636,7 +2636,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
gc.dispose ();
}
if ((drawState & SWT.FOREGROUND) != 0 || OS.GTK_IS_CELL_RENDERER_TOGGLE (cell)) {
@@ -52647,7 +52779,7 @@ index 467fe70..be2122d 100644
GtkCellRendererClass klass = new GtkCellRendererClass ();
OS.memmove (klass, g_class);
if (drawForeground != null && OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
-@@ -2645,7 +2645,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
+@@ -2649,7 +2649,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if (hooks (SWT.PaintItem)) {
GdkRectangle rect = new GdkRectangle ();
GdkRectangle clipRect = new GdkRectangle ();
@@ -52656,7 +52788,7 @@ index 467fe70..be2122d 100644
OS.gtk_tree_view_get_cell_area (handle, path, columnHandle, rect);
OS.gtk_tree_view_get_background_area (handle, path, columnHandle, clipRect);
OS.gtk_tree_path_free (path);
-@@ -2709,8 +2709,8 @@ void resetCustomDraw () {
+@@ -2726,8 +2726,8 @@ void resetCustomDraw () {
for (int i=0; i<end; i++) {
boolean customDraw = columnCount != 0 ? columns [i].customDraw : firstCustomDraw;
if (customDraw) {
@@ -52667,7 +52799,7 @@ index 467fe70..be2122d 100644
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, 0, 0, 0);
if (columnCount != 0) columns [i].customDraw = false;
}
-@@ -2771,7 +2771,7 @@ public void setInsertMark (TreeItem item, boolean before) {
+@@ -2788,7 +2788,7 @@ public void setInsertMark (TreeItem item, boolean before) {
if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
if (item.parent != this) return;
Rectangle rect = item.getBounds();
@@ -52676,7 +52808,7 @@ index 467fe70..be2122d 100644
OS.gtk_widget_realize (handle);
if (!OS.gtk_tree_view_get_path_at_pos(handle, rect.x, rect.y, path, null, null, null)) return;
if (path [0] == 0) return;
-@@ -2780,7 +2780,7 @@ public void setInsertMark (TreeItem item, boolean before) {
+@@ -2797,7 +2797,7 @@ public void setInsertMark (TreeItem item, boolean before) {
OS.gtk_tree_path_free (path [0]);
}
@@ -52685,7 +52817,7 @@ index 467fe70..be2122d 100644
int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, parentIter);
if (count == itemCount) return;
boolean isVirtual = (style & SWT.VIRTUAL) != 0;
-@@ -2791,7 +2791,7 @@ void setItemCount (int /*long*/ parentIter, int count) {
+@@ -2808,7 +2808,7 @@ void setItemCount (int /*long*/ parentIter, int count) {
ignoreAccessibility = true;
}
for (int i=itemCount; i<count; i++) {
@@ -52694,7 +52826,7 @@ index 467fe70..be2122d 100644
if (iter == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_tree_store_append (modelHandle, iter, parentIter);
OS.gtk_tree_store_set (modelHandle, iter, ID_COLUMN, -1, -1);
-@@ -2850,7 +2850,7 @@ public void select (TreeItem item) {
+@@ -2867,7 +2867,7 @@ public void select (TreeItem item) {
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
if (item.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
boolean fixColumn = showFirstColumn ();
@@ -52703,7 +52835,7 @@ index 467fe70..be2122d 100644
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_select_iter (selection, item.handle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -2872,7 +2872,7 @@ public void selectAll () {
+@@ -2889,7 +2889,7 @@ public void selectAll () {
checkWidget();
if ((style & SWT.SINGLE) != 0) return;
boolean fixColumn = showFirstColumn ();
@@ -52712,7 +52844,7 @@ index 467fe70..be2122d 100644
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_select_all (selection);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -2950,15 +2950,15 @@ public void setColumnOrder (int [] order) {
+@@ -2967,15 +2967,15 @@ public void setColumnOrder (int [] order) {
if (seen [index]) error (SWT.ERROR_INVALID_ARGUMENT);
seen [index] = true;
}
@@ -52731,7 +52863,16 @@ index 467fe70..be2122d 100644
super.setFontDescription (font);
TreeColumn[] columns = getColumns ();
for (int i = 0; i < columns.length; i++) {
-@@ -3037,12 +3037,12 @@ void setParentBackground () {
+@@ -3039,7 +3039,7 @@ public void setLinesVisible (boolean show) {
+ }
+ }
+
+-void setModel (int /*long*/ newModel) {
++void setModel (long /*int*/ newModel) {
+ display.removeWidget (modelHandle);
+ OS.g_object_unref (modelHandle);
+ modelHandle = newModel;
+@@ -3069,12 +3069,12 @@ void setParentBackground () {
recreateRenderers ();
}
@@ -52747,7 +52888,7 @@ index 467fe70..be2122d 100644
if (columnCount != 0 || currentItem == item) return;
int width = OS.gtk_tree_view_column_get_fixed_width (column);
int itemWidth = calculateWidth (column, item.handle, true);
-@@ -3106,7 +3106,7 @@ public void setSelection (TreeItem [] items) {
+@@ -3138,7 +3138,7 @@ public void setSelection (TreeItem [] items) {
int length = items.length;
if (length == 0 || ((style & SWT.SINGLE) != 0 && length > 1)) return;
boolean fixColumn = showFirstColumn ();
@@ -52756,7 +52897,7 @@ index 467fe70..be2122d 100644
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
boolean first = true;
for (int i = 0; i < length; i++) {
-@@ -3114,7 +3114,7 @@ public void setSelection (TreeItem [] items) {
+@@ -3146,7 +3146,7 @@ public void setSelection (TreeItem [] items) {
if (item == null) continue;
if (item.isDisposed ()) break;
if (item.parent != this) continue;
@@ -52765,7 +52906,7 @@ index 467fe70..be2122d 100644
showItem (path, false);
if (first) {
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
-@@ -3207,7 +3207,7 @@ public void setTopItem (TreeItem item) {
+@@ -3239,7 +3239,7 @@ public void setTopItem (TreeItem item) {
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
if (item.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT);
if (item.parent != this) return;
@@ -52774,7 +52915,7 @@ index 467fe70..be2122d 100644
showItem (path, false);
OS.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0f, 0f);
if (OS.GTK_VERSION < OS.VERSION (2, 8, 0)) {
-@@ -3282,10 +3282,10 @@ boolean showFirstColumn () {
+@@ -3314,10 +3314,10 @@ boolean showFirstColumn () {
*/
int columnCount = Math.max (1, this.columnCount);
for (int i=0; i<columnCount; i++) {
@@ -52787,7 +52928,7 @@ index 467fe70..be2122d 100644
OS.gtk_tree_view_column_set_visible (firstColumn, true);
return true;
}
-@@ -3308,13 +3308,13 @@ public void showSelection () {
+@@ -3340,13 +3340,13 @@ public void showSelection () {
if (items.length != 0 && items [0] != null) showItem (items [0]);
}
@@ -52804,7 +52945,7 @@ index 467fe70..be2122d 100644
for (int i=0; i<indices.length; i++) {
OS.gtk_tree_path_append_index (tempPath, indices [i]);
OS.gtk_tree_view_expand_row (handle, tempPath, false);
-@@ -3390,7 +3390,7 @@ public void showItem (TreeItem item) {
+@@ -3422,7 +3422,7 @@ public void showItem (TreeItem item) {
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
if (item.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT);
if (item.parent != this) return;
@@ -52813,7 +52954,7 @@ index 467fe70..be2122d 100644
showItem (path, true);
OS.gtk_tree_path_free (path);
}
-@@ -3404,19 +3404,19 @@ void updateScrollBarValue (ScrollBar bar) {
+@@ -3436,19 +3436,19 @@ void updateScrollBarValue (ScrollBar bar) {
* The fix is to queue a resize event for each child to
* force the position to be corrected.
*/
@@ -52838,7 +52979,7 @@ index 467fe70..be2122d 100644
switch ((int)/*64*/user_data) {
case EXPOSE_EVENT_INVERSE: {
/*
-@@ -3431,7 +3431,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ us
+@@ -3463,7 +3463,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ us
if (control != null) {
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove (gdkEvent, arg0, GdkEventExpose.sizeof);
@@ -52949,7 +53090,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 43277b1..3317162 100644
+index 9552ddb..20a3b1d 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) {
@@ -52979,14 +53120,7 @@ index 43277b1..3317162 100644
int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_BACKGROUND, ptr, -1);
if (ptr [0] == 0) return _getBackground ();
-@@ -235,13 +235,13 @@ Color _getBackground (int index) {
- }
-
- boolean _getChecked () {
-- int /*long*/ [] ptr = new int /*long*/ [1];
-+ long /*int*/ [] ptr = new long /*int*/ [1];
- OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.CHECKED_COLUMN, ptr, -1);
- return ptr [0] != 0;
+@@ -241,7 +241,7 @@ boolean _getChecked () {
}
Color _getForeground () {
@@ -53022,7 +53156,16 @@ index 43277b1..3317162 100644
int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_TEXT, ptr, -1);
if (ptr [0] == 0) return ""; //$NON-NLS-1$
-@@ -428,15 +428,15 @@ public Rectangle getBounds (int index) {
+@@ -300,7 +300,7 @@ void clear () {
+ OS.gtk_tree_store_set (parent.modelHandle, handle, i, 0, -1);
+ }
+ for (int i=Tree.FOREGROUND_COLUMN; i<columnCount; i++) {
+- OS.gtk_tree_store_set (parent.modelHandle, handle, i, (int /*long*/)0, -1);
++ OS.gtk_tree_store_set (parent.modelHandle, handle, i, (long /*int*/)0, -1);
+ }
+ /*
+ * Bug in GTK. When using fixed-height-mode,
+@@ -432,15 +432,15 @@ public Rectangle getBounds (int index) {
// TODO fully test on early and later versions of GTK
checkWidget();
if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
@@ -53041,7 +53184,7 @@ index 43277b1..3317162 100644
OS.gtk_widget_realize (parentHandle);
GdkRectangle rect = new GdkRectangle ();
OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
-@@ -490,14 +490,14 @@ public Rectangle getBounds () {
+@@ -494,14 +494,14 @@ public Rectangle getBounds () {
// shifted a bit too far right on later versions of GTK - however, old Tree also had this problem
checkWidget ();
if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
@@ -53061,7 +53204,7 @@ index 43277b1..3317162 100644
OS.gtk_widget_realize (parentHandle);
boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
-@@ -581,7 +581,7 @@ public boolean getChecked () {
+@@ -585,7 +585,7 @@ public boolean getChecked () {
*/
public boolean getExpanded () {
checkWidget();
@@ -53070,7 +53213,7 @@ index 43277b1..3317162 100644
boolean answer = OS.gtk_tree_view_row_expanded (parent.handle, path);
OS.gtk_tree_path_free (path);
return answer;
-@@ -733,18 +733,18 @@ public Rectangle getImageBounds (int index) {
+@@ -737,18 +737,18 @@ public Rectangle getImageBounds (int index) {
// TODO fully test on early and later versions of GTK
checkWidget ();
if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
@@ -53093,7 +53236,7 @@ index 43277b1..3317162 100644
OS.gtk_widget_realize (parentHandle);
OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
if ((parent.getStyle () & SWT.MIRRORED) != 0) rect.x = parent.getClientWidth () - rect.width - rect.x;
-@@ -879,12 +879,12 @@ public Tree getParent () {
+@@ -883,12 +883,12 @@ public Tree getParent () {
*/
public TreeItem getParentItem () {
checkWidget();
@@ -53108,7 +53251,7 @@ index 43277b1..3317162 100644
if (OS.gtk_tree_model_get_iter (parent.modelHandle, iter, path)) {
item = parent._getItem (iter);
}
-@@ -942,19 +942,19 @@ public Rectangle getTextBounds (int index) {
+@@ -946,19 +946,19 @@ public Rectangle getTextBounds (int index) {
if (0 > index || index > count - 1) return new Rectangle (0, 0, 0, 0);
// TODO fully test on early and later versions of GTK
// shifted a bit too far right on later versions of GTK - however, old Tree also had this problem
@@ -53133,7 +53276,7 @@ index 43277b1..3317162 100644
OS.gtk_widget_realize (parentHandle);
boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
-@@ -1028,8 +1028,8 @@ public int indexOf (TreeItem item) {
+@@ -1032,8 +1032,8 @@ public int indexOf (TreeItem item) {
if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
int index = -1;
boolean isParent = false;
@@ -53144,7 +53287,7 @@ index 43277b1..3317162 100644
int depth = OS.gtk_tree_path_get_depth (parentPath);
if (depth > 1 && OS.gtk_tree_path_up(parentPath)) {
if (OS.gtk_tree_path_compare(currentPath, parentPath) == 0) isParent = true;
-@@ -1037,9 +1037,9 @@ public int indexOf (TreeItem item) {
+@@ -1041,9 +1041,9 @@ public int indexOf (TreeItem item) {
OS.gtk_tree_path_free (currentPath);
OS.gtk_tree_path_free (parentPath);
if (!isParent) return index;
@@ -53156,7 +53299,7 @@ index 43277b1..3317162 100644
if (indices != 0) {
int[] temp = new int[depth];
OS.memmove (temp, indices, 4 * temp.length);
-@@ -1051,13 +1051,13 @@ public int indexOf (TreeItem item) {
+@@ -1055,13 +1055,13 @@ public int indexOf (TreeItem item) {
}
void redraw () {
@@ -53173,7 +53316,7 @@ index 43277b1..3317162 100644
rect.x = 0;
int [] w = new int [1], h = new int [1];
OS.gdk_drawable_get_size (window, w, h);
-@@ -1098,15 +1098,15 @@ void releaseWidget () {
+@@ -1102,15 +1102,15 @@ void releaseWidget () {
*/
public void removeAll () {
checkWidget ();
@@ -53192,7 +53335,7 @@ index 43277b1..3317162 100644
int [] value = new int [1];
while (OS.gtk_tree_model_iter_children (modelHandle, iter, handle)) {
OS.gtk_tree_model_get (modelHandle, iter, Tree.ID_COLUMN, value, -1);
-@@ -1211,16 +1211,16 @@ public void setBackground (int index, Color color) {
+@@ -1215,16 +1215,16 @@ public void setBackground (int index, Color color) {
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
@@ -53213,7 +53356,7 @@ index 43277b1..3317162 100644
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
-@@ -1271,7 +1271,7 @@ public void setChecked (boolean checked) {
+@@ -1275,7 +1275,7 @@ public void setChecked (boolean checked) {
*/
public void setExpanded (boolean expanded) {
checkWidget();
@@ -53222,7 +53365,7 @@ index 43277b1..3317162 100644
if (expanded != OS.gtk_tree_view_row_expanded (parent.handle, path)) {
if (expanded) {
OS.g_signal_handlers_block_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_EXPAND_ROW);
-@@ -1314,7 +1314,7 @@ public void setFont (Font font){
+@@ -1318,7 +1318,7 @@ public void setFont (Font font){
if (oldFont == font) return;
this.font = font;
if (oldFont != null && oldFont.equals (font)) return;
@@ -53231,7 +53374,7 @@ index 43277b1..3317162 100644
OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.FONT_COLUMN, fontHandle, -1);
/*
* Bug in GTK. When using fixed-height-mode,
-@@ -1365,7 +1365,7 @@ public void setFont (int index, Font font) {
+@@ -1369,7 +1369,7 @@ public void setFont (int index, Font font) {
if (oldFont != null && oldFont.equals (font)) return;
int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
@@ -53240,7 +53383,7 @@ index 43277b1..3317162 100644
OS.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_FONT, fontHandle, -1);
/*
* Bug in GTK. When using fixed-height-mode,
-@@ -1383,16 +1383,16 @@ public void setFont (int index, Font font) {
+@@ -1387,16 +1387,16 @@ public void setFont (int index, Font font) {
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
@@ -53261,7 +53404,7 @@ index 43277b1..3317162 100644
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
-@@ -1490,16 +1490,16 @@ public void setForeground (int index, Color color){
+@@ -1494,16 +1494,16 @@ public void setForeground (int index, Color color){
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
@@ -53282,16 +53425,7 @@ index 43277b1..3317162 100644
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
-@@ -1532,7 +1532,7 @@ public void setGrayed (boolean grayed) {
- * GTK+'s "inconsistent" state does not match SWT's concept of grayed.
- * Render checked+grayed as "inconsistent", unchecked+grayed as blank.
- */
-- int /*long*/ [] ptr = new int /*long*/ [1];
-+ long /*int*/ [] ptr = new long /*int*/ [1];
- OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.CHECKED_COLUMN, ptr, -1);
- OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.GRAYED_COLUMN, ptr [0] == 0 ? false : grayed, -1);
- cached = true;
-@@ -1564,7 +1564,7 @@ public void setImage (int index, Image image) {
+@@ -1568,7 +1568,7 @@ public void setImage (int index, Image image) {
}
int count = Math.max (1, parent.getColumnCount ());
if (0 > index || index > count - 1) return;
@@ -53300,7 +53434,7 @@ index 43277b1..3317162 100644
if (image != null) {
ImageList imageList = parent.imageList;
if (imageList == null) imageList = parent.imageList = new ImageList ();
-@@ -1593,10 +1593,10 @@ public void setImage (int index, Image image) {
+@@ -1597,10 +1597,10 @@ public void setImage (int index, Image image) {
*/
if ((parent.style & SWT.VIRTUAL) != 0 && parent.currentItem == null) {
if (image != null) {
@@ -53314,7 +53448,7 @@ index 43277b1..3317162 100644
OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w);
if (w[0] < image.getBounds().width) {
/*
-@@ -1604,7 +1604,7 @@ public void setImage (int index, Image image) {
+@@ -1608,7 +1608,7 @@ public void setImage (int index, Image image) {
* are relying on the fact that it is done as part of modifying
* the style.
*/
@@ -53324,7 +53458,7 @@ index 43277b1..3317162 100644
}
}
diff --git a/org/eclipse/swt/widgets/Widget.java b/org/eclipse/swt/widgets/Widget.java
-index eb3bbcd..693e4dc 100644
+index 4876ab5..08d042e 100644
--- a/org/eclipse/swt/widgets/Widget.java
+++ b/org/eclipse/swt/widgets/Widget.java
@@ -56,7 +56,7 @@ public abstract class Widget {
@@ -53801,18 +53935,30 @@ index eb3bbcd..693e4dc 100644
if (ptr != 0) {
GdkEvent gdkEvent = new GdkEvent ();
OS.memmove (gdkEvent, ptr, GdkEvent.sizeof);
-@@ -1527,8 +1527,8 @@ public void setData (String key, Object value) {
+@@ -1527,11 +1527,11 @@ public void setData (String key, Object value) {
if (key.equals(SWT.SKIN_CLASS) || key.equals(SWT.SKIN_ID)) this.reskin(SWT.ALL);
}
-void setForegroundColor (int /*long*/ handle, GdkColor color) {
-- int /*long*/ style = OS.gtk_widget_get_modifier_style (handle);
+void setForegroundColor (long /*int*/ handle, GdkColor color) {
+ setForegroundColor (handle, color, true);
+ }
+
+-void setForegroundColor (int /*long*/ handle, GdkColor color, boolean setStateActive) {
++void setForegroundColor (long /*int*/ handle, GdkColor color, boolean setStateActive) {
+ /*
+ * Feature in GTK. When the widget doesn't have focus, then
+ * gtk_default_draw_flat_box () changes the background color state_type
+@@ -1539,7 +1539,7 @@ void setForegroundColor (int /*long*/ handle, GdkColor color, boolean setStateAc
+ * gtk_paint_flat_box or gtk_default_draw_flat_box have to pass false for
+ * setStateActive.
+ */
+- int /*long*/ style = OS.gtk_widget_get_modifier_style (handle);
+ long /*int*/ style = OS.gtk_widget_get_modifier_style (handle);
OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_NORMAL, color);
- OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_ACTIVE, color);
+ if (setStateActive) OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_ACTIVE, color);
OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_PRELIGHT, color);
-@@ -1662,15 +1662,15 @@ boolean setTabItemFocus (boolean next) {
+@@ -1677,15 +1677,15 @@ boolean setTabItemFocus (boolean next) {
return false;
}
@@ -53831,7 +53977,7 @@ index eb3bbcd..693e4dc 100644
return 0;
}
-@@ -1689,11 +1689,11 @@ public String toString () {
+@@ -1704,11 +1704,11 @@ public String toString () {
return getName () + " {" + string + "}";
}
@@ -53845,7 +53991,7 @@ index eb3bbcd..693e4dc 100644
return 0;
}
-@@ -1701,7 +1701,7 @@ boolean translateTraversal (int event) {
+@@ -1716,7 +1716,7 @@ boolean translateTraversal (int event) {
return false;
}
@@ -53854,7 +54000,7 @@ index eb3bbcd..693e4dc 100644
switch ((int)/*64*/user_data) {
case ACTIVATE: return gtk_activate (handle);
case CHANGED: return gtk_changed (handle);
-@@ -1728,13 +1728,13 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) {
+@@ -1743,13 +1743,13 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) {
}
}
@@ -53871,7 +54017,7 @@ index eb3bbcd..693e4dc 100644
if (window != paintWindow) return 0;
return (state & OBSCURED) != 0 ? 1 : 0;
}
-@@ -1777,7 +1777,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ us
+@@ -1792,7 +1792,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ us
}
}
@@ -53880,7 +54026,7 @@ index eb3bbcd..693e4dc 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);
-@@ -1793,7 +1793,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ ar
+@@ -1808,7 +1808,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ ar
}
}
--
Debian packaging for swt-gtk.
More information about the pkg-java-commits
mailing list