[SCM] Debian packaging for swt-gtk. branch, master-3.8, updated. debian/3.8.0-m7-2-5-gb9725b4
Jakub Adam
jakub.adam at ktknet.cz
Sun May 27 13:24:44 UTC 2012
The following commit has been merged in the master-3.8 branch:
commit b9725b46d8312e6c960fcf6a593b22692f638c90
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Sun May 27 14:14:32 2012 +0200
Updated arch64.diff patch for new upstream release
diff --git a/debian/changelog b/debian/changelog
index 9635e84..520490d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ swt-gtk (3.8.0~rc2-1) UNRELEASED; urgency=low
[ Jakub Adam ]
* New upstream release.
+ * Updated arch64.diff patch for new upstream release.
-- Jakub Adam <jakub.adam at ktknet.cz> Sun, 27 May 2012 13:49:43 +0200
diff --git a/debian/patches/64/arch64.diff b/debian/patches/64/arch64.diff
index cd20c83..c3d9d4c 100644
--- a/debian/patches/64/arch64.diff
+++ b/debian/patches/64/arch64.diff
@@ -1,6 +1,6 @@
-From a2c81dcd95a8159db8c741033198854eb88cab11 Mon Sep 17 00:00:00 2001
+From 42835bd001f645ebd07af41fc3b6fdecbdc35b24 Mon Sep 17 00:00:00 2001
From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Sun, 6 May 2012 23:59:03 +0200
+Date: Sun, 27 May 2012 14:10:48 +0200
Subject: [PATCH] arch64
---
@@ -33,7 +33,7 @@ Subject: [PATCH] arch64
org/eclipse/swt/browser/PromptService2Factory.java | 32 +-
org/eclipse/swt/browser/Prompter.java | 98 +-
org/eclipse/swt/browser/SimpleEnumerator.java | 32 +-
- org/eclipse/swt/browser/WebKit.java | 254 +-
+ org/eclipse/swt/browser/WebKit.java | 258 +-
org/eclipse/swt/browser/WindowCreator2.java | 54 +-
org/eclipse/swt/dnd/ByteArrayTransfer.java | 2 +-
org/eclipse/swt/dnd/Clipboard.java | 22 +-
@@ -116,7 +116,7 @@ Subject: [PATCH] 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 | 4970 ++++++++++----------
+ org/eclipse/swt/internal/gtk/OS.java | 4974 ++++++++++----------
org/eclipse/swt/internal/gtk/PangoAttribute.java | 2 +-
org/eclipse/swt/internal/gtk/PangoItem.java | 10 +-
org/eclipse/swt/internal/gtk/PangoLayoutLine.java | 4 +-
@@ -253,7 +253,7 @@ Subject: [PATCH] arch64
.../swt/internal/theme/ToolBarDrawData.java | 6 +-
.../swt/internal/theme/ToolItemDrawData.java | 20 +-
.../swt/internal/webkit/JSClassDefinition.java | 30 +-
- org/eclipse/swt/internal/webkit/WebKitGTK.java | 422 +-
+ org/eclipse/swt/internal/webkit/WebKitGTK.java | 434 +-
org/eclipse/swt/opengl/GLCanvas.java | 34 +-
org/eclipse/swt/printing/PrintDialog.java | 28 +-
org/eclipse/swt/printing/Printer.java | 62 +-
@@ -297,7 +297,7 @@ Subject: [PATCH] arch64
org/eclipse/swt/widgets/TableItem.java | 94 +-
org/eclipse/swt/widgets/Text.java | 214 +-
org/eclipse/swt/widgets/ToolBar.java | 32 +-
- org/eclipse/swt/widgets/ToolItem.java | 66 +-
+ org/eclipse/swt/widgets/ToolItem.java | 68 +-
org/eclipse/swt/widgets/ToolTip.java | 54 +-
org/eclipse/swt/widgets/TouchSource.java | 4 +-
org/eclipse/swt/widgets/Tracker.java | 26 +-
@@ -306,7 +306,7 @@ Subject: [PATCH] arch64
org/eclipse/swt/widgets/TreeColumn.java | 28 +-
org/eclipse/swt/widgets/TreeItem.java | 118 +-
org/eclipse/swt/widgets/Widget.java | 198 +-
- 302 files changed, 9007 insertions(+), 9007 deletions(-)
+ 302 files changed, 9018 insertions(+), 9018 deletions(-)
diff --git a/org/eclipse/swt/accessibility/Accessible.java b/org/eclipse/swt/accessibility/Accessible.java
index 9c2821c..2b8fcc0 100644
@@ -7309,7 +7309,7 @@ index 75f58ad..7da18df 100644
}
}
diff --git a/org/eclipse/swt/browser/WebKit.java b/org/eclipse/swt/browser/WebKit.java
-index 5312ead..56640dc 100644
+index febdb0d..6548acc 100644
--- a/org/eclipse/swt/browser/WebKit.java
+++ b/org/eclipse/swt/browser/WebKit.java
@@ -24,7 +24,7 @@ import org.eclipse.swt.layout.*;
@@ -7832,7 +7832,7 @@ index 5312ead..56640dc 100644
WindowEvent newEvent = new WindowEvent (browser);
newEvent.display = browser.getDisplay ();
newEvent.widget = browser;
-@@ -1598,8 +1598,8 @@ int /*long*/ webkit_create_web_view (int /*long*/ web_view, int /*long*/ frame)
+@@ -1598,14 +1598,14 @@ int /*long*/ webkit_create_web_view (int /*long*/ web_view, int /*long*/ frame)
return 0;
}
@@ -7843,7 +7843,23 @@ index 5312ead..56640dc 100644
int length = OS.strlen (name);
byte[] bytes = new byte[length];
OS.memmove (bytes, name, length);
-@@ -1621,7 +1621,7 @@ int /*long*/ webkit_download_requested (int /*long*/ web_view, int /*long*/ down
+ final String nameString = new String (Converter.mbcsToWcs (null, bytes));
+
+- final int /*long*/ request = WebKitGTK.webkit_download_get_network_request (download);
++ final long /*int*/ request = WebKitGTK.webkit_download_get_network_request (download);
+ OS.g_object_ref (request);
+
+ /*
+@@ -1622,7 +1622,7 @@ int /*long*/ webkit_download_requested (int /*long*/ web_view, int /*long*/ down
+ String path = dialog.open ();
+ if (path != null) {
+ path = URI_FILEROOT + path;
+- int /*long*/ newDownload = WebKitGTK.webkit_download_new (request);
++ long /*int*/ newDownload = WebKitGTK.webkit_download_new (request);
+ byte[] uriBytes = Converter.wcsToMbcs (null, path, true);
+ WebKitGTK.webkit_download_set_destination_uri (newDownload, uriBytes);
+ openDownloadWindow (newDownload);
+@@ -1637,7 +1637,7 @@ int /*long*/ webkit_download_requested (int /*long*/ web_view, int /*long*/ down
return 1;
}
@@ -7852,7 +7868,7 @@ index 5312ead..56640dc 100644
if (uri != 0) {
int length = OS.strlen (uri);
byte[] bytes = new byte[length];
-@@ -1638,7 +1638,7 @@ int /*long*/ webkit_hovering_over_link (int /*long*/ web_view, int /*long*/ titl
+@@ -1654,7 +1654,7 @@ int /*long*/ webkit_hovering_over_link (int /*long*/ web_view, int /*long*/ titl
return 0;
}
@@ -7861,7 +7877,7 @@ index 5312ead..56640dc 100644
boolean canShow = WebKitGTK.webkit_web_view_can_show_mime_type (webView, mimetype) != 0;
if (!canShow) {
WebKitGTK.webkit_web_policy_decision_download (policy_decision);
-@@ -1647,7 +1647,7 @@ int /*long*/ webkit_mime_type_policy_decision_requested (int /*long*/ web_view,
+@@ -1663,7 +1663,7 @@ int /*long*/ webkit_mime_type_policy_decision_requested (int /*long*/ web_view,
return 0;
}
@@ -7870,7 +7886,7 @@ index 5312ead..56640dc 100644
if (loadingText) {
/*
* WebKit is auto-navigating to about:blank in response to a
-@@ -1658,7 +1658,7 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
+@@ -1674,7 +1674,7 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
return 0;
}
@@ -7879,7 +7895,7 @@ index 5312ead..56640dc 100644
int length = OS.strlen (uri);
byte[] bytes = new byte[length];
OS.memmove (bytes, uri, length);
-@@ -1691,12 +1691,12 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
+@@ -1707,12 +1707,12 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
if (jsEnabled != jsEnabledOnNextPage) {
jsEnabled = jsEnabledOnNextPage;
DisabledJSCount += !jsEnabled ? 1 : -1;
@@ -7894,7 +7910,7 @@ index 5312ead..56640dc 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) {
-@@ -1719,22 +1719,22 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
+@@ -1735,22 +1735,22 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
return 0;
}
@@ -7921,7 +7937,7 @@ index 5312ead..56640dc 100644
ProgressEvent event = new ProgressEvent (browser);
event.display = browser.getDisplay ();
event.widget = browser;
-@@ -1746,8 +1746,8 @@ int /*long*/ webkit_notify_progress (int /*long*/ web_view, int /*long*/ pspec)
+@@ -1762,8 +1762,8 @@ int /*long*/ webkit_notify_progress (int /*long*/ web_view, int /*long*/ pspec)
return 0;
}
@@ -7932,7 +7948,7 @@ index 5312ead..56640dc 100644
String titleString;
if (title == 0) {
titleString = ""; //$NON-NLS-1$
-@@ -1767,7 +1767,7 @@ int /*long*/ webkit_notify_title (int /*long*/ web_view, int /*long*/ pspec) {
+@@ -1783,7 +1783,7 @@ int /*long*/ webkit_notify_title (int /*long*/ web_view, int /*long*/ pspec) {
return 0;
}
@@ -7941,7 +7957,7 @@ index 5312ead..56640dc 100644
Point pt = browser.getDisplay ().getCursorLocation ();
Event event = new Event ();
event.x = pt.x;
-@@ -1775,10 +1775,10 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m
+@@ -1791,10 +1791,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 */
@@ -7955,7 +7971,7 @@ index 5312ead..56640dc 100644
OS.gtk_container_remove (webkit_menu, item);
current = OS.g_list_next (current);
}
-@@ -1792,10 +1792,10 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m
+@@ -1808,10 +1808,10 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m
}
menu.setVisible (true);
/* clear the menu */
@@ -7969,7 +7985,7 @@ index 5312ead..56640dc 100644
OS.gtk_container_remove (webkit_menu, item);
current = OS.g_list_next (current);
}
-@@ -1804,18 +1804,18 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m
+@@ -1820,18 +1820,18 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m
return 0;
}
@@ -7992,7 +8008,7 @@ index 5312ead..56640dc 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);
-@@ -1842,7 +1842,7 @@ int /*long*/ webkit_resource_request_starting (int /*long*/ web_view, int /*long
+@@ -1858,7 +1858,7 @@ int /*long*/ webkit_resource_request_starting (int /*long*/ web_view, int /*long
}
/* headers */
@@ -8001,7 +8017,7 @@ index 5312ead..56640dc 100644
for (int i = 0; i < headers.length; i++) {
String current = headers[i];
if (current != null) {
-@@ -1865,7 +1865,7 @@ int /*long*/ webkit_resource_request_starting (int /*long*/ web_view, int /*long
+@@ -1881,7 +1881,7 @@ int /*long*/ webkit_resource_request_starting (int /*long*/ web_view, int /*long
return 0;
}
@@ -8010,7 +8026,7 @@ index 5312ead..56640dc 100644
int length = OS.strlen (text);
byte[] bytes = new byte[length];
OS.memmove (bytes, text, length);
-@@ -1879,12 +1879,12 @@ int /*long*/ webkit_status_bar_text_changed (int /*long*/ web_view, int /*long*/
+@@ -1895,12 +1895,12 @@ int /*long*/ webkit_status_bar_text_changed (int /*long*/ web_view, int /*long*/
return 0;
}
@@ -8025,7 +8041,7 @@ index 5312ead..56640dc 100644
int[] result = new int[1];
OS.g_object_get (settings, WebKitGTK.locationbar_visible, result, 0);
newEvent.addressBar = result[0] != 0;
-@@ -1922,16 +1922,16 @@ int /*long*/ webkit_web_view_ready (int /*long*/ web_view) {
+@@ -1938,16 +1938,16 @@ int /*long*/ webkit_web_view_ready (int /*long*/ web_view) {
return 0;
}
@@ -8046,7 +8062,7 @@ index 5312ead..56640dc 100644
WebKitGTK.JSObjectSetProperty (context, globalObject, name, externalObject, 0, null);
WebKitGTK.JSStringRelease (name);
Enumeration elements = functions.elements ();
-@@ -1939,16 +1939,16 @@ int /*long*/ webkit_window_object_cleared (int /*long*/ web_view, int /*long*/ f
+@@ -1955,16 +1955,16 @@ int /*long*/ webkit_window_object_cleared (int /*long*/ web_view, int /*long*/ f
BrowserFunction current = (BrowserFunction)elements.nextElement ();
execute (current.functionString);
}
@@ -8066,7 +8082,7 @@ index 5312ead..56640dc 100644
C.memmove (result, arguments, C.PTR_SIZEOF);
int type = WebKitGTK.JSValueGetType (ctx, result[0]);
if (type == WebKitGTK.kJSTypeNumber) {
-@@ -1988,7 +1988,7 @@ int /*long*/ callJava (int /*long*/ ctx, int /*long*/ func, int /*long*/ thisObj
+@@ -2004,7 +2004,7 @@ int /*long*/ callJava (int /*long*/ ctx, int /*long*/ func, int /*long*/ thisObj
return convertToJS (ctx, returnValue);
}
@@ -8075,7 +8091,7 @@ index 5312ead..56640dc 100644
if (value == null) {
return WebKitGTK.JSValueMakeUndefined (ctx);
}
-@@ -1999,8 +1999,8 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
+@@ -2015,8 +2015,8 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, (String)value, true);
}
@@ -8086,7 +8102,7 @@ index 5312ead..56640dc 100644
WebKitGTK.JSStringRelease (stringRef);
return result;
}
-@@ -2013,10 +2013,10 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
+@@ -2029,10 +2029,10 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
if (value instanceof Object[]) {
Object[] arrayValue = (Object[]) value;
int length = arrayValue.length;
@@ -8099,7 +8115,7 @@ index 5312ead..56640dc 100644
arguments[i] = jsObject;
}
return WebKitGTK.JSObjectMakeArray (ctx, length, arguments, null);
-@@ -2025,7 +2025,7 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
+@@ -2041,7 +2041,7 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
return 0;
}
@@ -8108,7 +8124,7 @@ index 5312ead..56640dc 100644
int type = WebKitGTK.JSValueGetType (ctx, value);
switch (type) {
case WebKitGTK.kJSTypeBoolean: {
-@@ -2037,9 +2037,9 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) {
+@@ -2053,9 +2053,9 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) {
return new Double(result);
}
case WebKitGTK.kJSTypeString: {
@@ -8120,7 +8136,7 @@ index 5312ead..56640dc 100644
byte[] bytes = new byte[(int)/*64*/length];
length = WebKitGTK.JSStringGetUTF8CString (string, bytes, length);
WebKitGTK.JSStringRelease (string);
-@@ -2060,15 +2060,15 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) {
+@@ -2076,15 +2076,15 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) {
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, PROPERTY_LENGTH, true);
}
@@ -11737,7 +11753,7 @@ index 91f0a09..60a6882 100644
}
diff --git a/org/eclipse/swt/internal/Library.java b/org/eclipse/swt/internal/Library.java
-index 71ce9e4..c0b94f3 100644
+index c7e308c..91d0c70 100644
--- a/org/eclipse/swt/internal/Library.java
+++ b/org/eclipse/swt/internal/Library.java
@@ -42,7 +42,7 @@ public class Library {
@@ -15393,7 +15409,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 62bc7a8..eb1efa2 100644
+index 8827bda..7988d8c 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 {
@@ -17451,7 +17467,18 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_malloc(size);
-@@ -2733,8 +2733,8 @@ public static final int /*long*/ g_malloc(int /*long*/ size) {
+@@ -2732,8 +2732,8 @@ public static final int /*long*/ g_malloc(int /*long*/ size) {
+ * @param oclass cast=(GObjectClass *)
+ * @param property_name cast=(const gchar *)
+ */
+-public static final native int /*long*/ _g_object_class_find_property(int /*long*/ oclass, byte[] property_name);
+-public static final int /*long*/ g_object_class_find_property(int /*long*/ oclass, byte[] property_name) {
++public static final native long /*int*/ _g_object_class_find_property(long /*int*/ oclass, byte[] property_name);
++public static final long /*int*/ g_object_class_find_property(long /*int*/ oclass, byte[] property_name) {
+ 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
* @param first_property_name cast=(const gchar *),flags=no_out
* @param terminator cast=(const gchar *),flags=sentinel
*/
@@ -17462,7 +17489,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_g_object_get(object, first_property_name, value, terminator);
-@@ -2747,8 +2747,8 @@ public static final void g_object_get(int /*long*/ object, byte[] first_property
+@@ -2760,8 +2760,8 @@ public static final void g_object_get(int /*long*/ object, byte[] first_property
* @param first_property_name cast=(const gchar *),flags=no_out
* @param terminator cast=(const gchar *),flags=sentinel
*/
@@ -17473,7 +17500,7 @@ index 62bc7a8..eb1efa2 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
+@@ -2773,8 +2773,8 @@ public static final void g_object_get(int /*long*/ object, byte[] first_property
* @param object cast=(GObject *)
* @param quark cast=(GQuark)
*/
@@ -17484,7 +17511,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_object_get_qdata(object, quark);
-@@ -2773,8 +2773,8 @@ public static final int /*long*/ g_object_get_qdata(int /*long*/ object, int qua
+@@ -2786,8 +2786,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 *)
*/
@@ -17495,7 +17522,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_object_new(type, first_property_name);
-@@ -2786,8 +2786,8 @@ public static final int /*long*/ g_object_new (int /*long*/ type, int /*long*/ f
+@@ -2799,8 +2799,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 *)
*/
@@ -17506,7 +17533,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_g_object_notify(object, property_name);
-@@ -2796,8 +2796,8 @@ public static final void g_object_notify (int /*long*/ object, byte[] property_n
+@@ -2809,8 +2809,8 @@ public static final void g_object_notify (int /*long*/ object, byte[] property_n
}
}
/** @param object cast=(gpointer) */
@@ -17517,7 +17544,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_object_ref(object);
-@@ -2810,8 +2810,8 @@ public static final int /*long*/ g_object_ref(int /*long*/ object) {
+@@ -2823,8 +2823,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
*/
@@ -17528,7 +17555,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2824,8 +2824,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
+@@ -2837,8 +2837,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
*/
@@ -17539,7 +17566,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2838,8 +2838,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
+@@ -2851,8 +2851,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
*/
@@ -17550,7 +17577,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2852,8 +2852,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
+@@ -2865,8 +2865,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
*/
@@ -17561,7 +17588,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2866,8 +2866,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
+@@ -2879,8 +2879,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
*/
@@ -17572,7 +17599,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2880,8 +2880,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
+@@ -2893,8 +2893,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
*/
@@ -17583,7 +17610,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -2894,8 +2894,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
+@@ -2907,8 +2907,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
* @param quark cast=(GQuark)
* @param data cast=(gpointer)
*/
@@ -17594,7 +17621,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_g_object_set_qdata(object, quark, data);
-@@ -2904,8 +2904,8 @@ public static final void g_object_set_qdata(int /*long*/ object, int quark, int
+@@ -2917,8 +2917,8 @@ public static final void g_object_set_qdata(int /*long*/ object, int quark, int
}
}
/** @param object cast=(gpointer) */
@@ -17605,7 +17632,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_g_object_unref(object);
-@@ -2939,8 +2939,8 @@ public static final void g_set_prgname(byte[] prgname) {
+@@ -2952,8 +2952,8 @@ public static final void g_set_prgname(byte[] prgname) {
* @param proc cast=(GCallback)
* @param data cast=(gpointer)
*/
@@ -17616,7 +17643,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_signal_connect(instance, detailed_signal, proc, data);
-@@ -2954,8 +2954,8 @@ public static final int g_signal_connect(int /*long*/ instance, byte[] detailed_
+@@ -2967,8 +2967,8 @@ public static final int g_signal_connect(int /*long*/ instance, byte[] detailed_
* @param closure cast=(GClosure *)
* @param after cast=(gboolean)
*/
@@ -17627,7 +17654,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_signal_connect_closure(instance, detailed_signal, closure, after);
-@@ -2970,8 +2970,8 @@ public static final int g_signal_connect_closure(int /*long*/ instance, byte[] d
+@@ -2983,8 +2983,8 @@ public static final int g_signal_connect_closure(int /*long*/ instance, byte[] d
* @param closure cast=(GClosure *)
* @param after cast=(gboolean)
*/
@@ -17638,7 +17665,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_signal_connect_closure_by_id(instance, signal_id, detail, closure, after);
-@@ -2985,8 +2985,8 @@ public static final int g_signal_connect_closure_by_id(int /*long*/ instance, in
+@@ -2998,8 +2998,8 @@ public static final int g_signal_connect_closure_by_id(int /*long*/ instance, in
* @param proc cast=(GCallback)
* @param data cast=(gpointer)
*/
@@ -17649,7 +17676,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_signal_connect_after(instance, detailed_signal, proc, data);
-@@ -2998,8 +2998,8 @@ public static final int g_signal_connect_after(int /*long*/ instance, byte[] det
+@@ -3011,8 +3011,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
*/
@@ -17660,7 +17687,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal);
-@@ -3011,8 +3011,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
+@@ -3024,8 +3024,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
* @param instance cast=(gpointer)
* @param detailed_signal cast=(const gchar *),flags=no_out
*/
@@ -17671,7 +17698,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data);
-@@ -3024,8 +3024,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
+@@ -3037,8 +3037,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
* @param instance cast=(gpointer)
* @param detailed_signal cast=(const gchar *),flags=no_out
*/
@@ -17682,7 +17709,7 @@ index 62bc7a8..eb1efa2 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
+@@ -3050,8 +3050,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
* @param instance cast=(gpointer)
* @param detailed_signal cast=(const gchar *),flags=no_out
*/
@@ -17693,7 +17720,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data1, data2);
-@@ -3050,8 +3050,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
+@@ -3063,8 +3063,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
* @param instance cast=(gpointer)
* @param detailed_signal cast=(const gchar *),flags=no_out
*/
@@ -17704,7 +17731,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data);
-@@ -3063,8 +3063,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
+@@ -3076,8 +3076,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
* @param instance cast=(gpointer)
* @param handler_id cast=(gulong)
*/
@@ -17715,7 +17742,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_g_signal_handler_disconnect(instance, handler_id);
-@@ -3079,8 +3079,8 @@ public static final void g_signal_handler_disconnect(int /*long*/ instance, int
+@@ -3092,8 +3092,8 @@ public static final void g_signal_handler_disconnect(int /*long*/ instance, int
* @param func cast=(gpointer)
* @param data cast=(gpointer)
*/
@@ -17726,7 +17753,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_signal_handler_find(instance, mask, signal_id, detail, closure, func, data);
-@@ -3097,8 +3097,8 @@ public static final int g_signal_handler_find(int /*long*/ instance, int mask, i
+@@ -3110,8 +3110,8 @@ public static final int g_signal_handler_find(int /*long*/ instance, int mask, i
* @param func cast=(gpointer)
* @param data cast=(gpointer)
*/
@@ -17737,7 +17764,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_signal_handlers_block_matched(instance, mask, signal_id, detail, closure, func, data);
-@@ -3115,8 +3115,8 @@ public static final int g_signal_handlers_block_matched(int /*long*/ instance, i
+@@ -3128,8 +3128,8 @@ public static final int g_signal_handlers_block_matched(int /*long*/ instance, i
* @param func cast=(gpointer)
* @param data cast=(gpointer)
*/
@@ -17748,7 +17775,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_signal_handlers_disconnect_matched(instance, mask, signal_id, detail, closure, func, data);
-@@ -3133,8 +3133,8 @@ public static final int g_signal_handlers_disconnect_matched(int /*long*/ instan
+@@ -3146,8 +3146,8 @@ public static final int g_signal_handlers_disconnect_matched(int /*long*/ instan
* @param func cast=(gpointer)
* @param data cast=(gpointer)
*/
@@ -17759,7 +17786,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_signal_handlers_unblock_matched(instance, mask, signal_id, detail, closure, func, data);
-@@ -3143,8 +3143,8 @@ public static final int g_signal_handlers_unblock_matched(int /*long*/ instance,
+@@ -3156,8 +3156,8 @@ public static final int g_signal_handlers_unblock_matched(int /*long*/ instance,
}
}
/** @param name cast=(const gchar *),flags=no_out */
@@ -17770,7 +17797,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_signal_lookup(name, itype);
-@@ -3156,8 +3156,8 @@ public static final int g_signal_lookup (byte[] name, int /*long*/ itype) {
+@@ -3169,8 +3169,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
*/
@@ -17781,7 +17808,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_g_signal_stop_emission_by_name(instance, detailed_signal);
-@@ -3166,8 +3166,8 @@ public static final void g_signal_stop_emission_by_name(int /*long*/ instance, b
+@@ -3179,8 +3179,8 @@ public static final void g_signal_stop_emission_by_name(int /*long*/ instance, b
}
}
/** @param tag cast=(guint) */
@@ -17792,7 +17819,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_source_remove(tag);
-@@ -3179,8 +3179,8 @@ public static final boolean /*long*/ g_source_remove (int /*long*/ tag) {
+@@ -3192,8 +3192,8 @@ public static final boolean /*long*/ g_source_remove (int /*long*/ tag) {
* @param list cast=(GSList *)
* @param data cast=(gpointer)
*/
@@ -17803,7 +17830,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_slist_append(list, data);
-@@ -3189,8 +3189,8 @@ public static final int /*long*/ g_slist_append(int /*long*/ list, int /*long*/
+@@ -3202,8 +3202,8 @@ public static final int /*long*/ g_slist_append(int /*long*/ list, int /*long*/
}
}
/** @param list cast=(GSList *) */
@@ -17814,7 +17841,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_slist_data(list);
-@@ -3199,8 +3199,8 @@ public static final int /*long*/ g_slist_data (int /*long*/ list) {
+@@ -3212,8 +3212,8 @@ public static final int /*long*/ g_slist_data (int /*long*/ list) {
}
}
/** @param list cast=(GSList *) */
@@ -17825,7 +17852,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_g_slist_free(list);
-@@ -3209,8 +3209,8 @@ public static final void g_slist_free (int /*long*/ list) {
+@@ -3222,8 +3222,8 @@ public static final void g_slist_free (int /*long*/ list) {
}
}
/** @param list cast=(GSList *) */
@@ -17836,7 +17863,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_slist_next(list);
-@@ -3219,8 +3219,8 @@ public static final int /*long*/ g_slist_next (int /*long*/ list) {
+@@ -3232,8 +3232,8 @@ public static final int /*long*/ g_slist_next (int /*long*/ list) {
}
}
/** @param list cast=(GSList *) */
@@ -17847,7 +17874,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_slist_length(list);
-@@ -3229,8 +3229,8 @@ public static final int g_slist_length (int /*long*/ list) {
+@@ -3242,8 +3242,8 @@ public static final int g_slist_length (int /*long*/ list) {
}
}
/** @param string_array cast=(gchar **) */
@@ -17858,7 +17885,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_g_strfreev(string_array);
-@@ -3242,8 +3242,8 @@ public static final void g_strfreev(int /*long*/ string_array) {
+@@ -3255,8 +3255,8 @@ public static final void g_strfreev(int /*long*/ string_array) {
* @method flags=getter
* @param string cast=(GString *)
*/
@@ -17869,7 +17896,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _GString_len(string);
-@@ -3255,8 +3255,8 @@ public static final int GString_len(int /*long*/ string) {
+@@ -3268,8 +3268,8 @@ public static final int GString_len(int /*long*/ string) {
* @method flags=getter
* @param string cast=(GString *)
*/
@@ -17880,7 +17907,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _GString_str(string);
-@@ -3268,8 +3268,8 @@ public static final int /*long*/ GString_str(int /*long*/ string) {
+@@ -3281,8 +3281,8 @@ public static final int /*long*/ GString_str(int /*long*/ string) {
* @param str cast=(const gchar *)
* @param endptr cast=(gchar **)
*/
@@ -17891,7 +17918,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_strtod(str, endptr);
-@@ -3282,8 +3282,8 @@ public static final double g_strtod(int /*long*/ str, int /*long*/[] endptr) {
+@@ -3295,8 +3295,8 @@ public static final double g_strtod(int /*long*/ str, int /*long*/[] endptr) {
* @param interface_type cast=(GType)
* @param info cast=(const GInterfaceInfo *)
*/
@@ -17902,7 +17929,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_g_type_add_interface_static(instance_type, interface_type, info);
-@@ -3292,8 +3292,8 @@ public static final void g_type_add_interface_static (int /*long*/ instance_type
+@@ -3305,8 +3305,8 @@ public static final void g_type_add_interface_static (int /*long*/ instance_type
}
}
/** @param g_class cast=(GType) */
@@ -17913,7 +17940,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_type_class_peek(g_class);
-@@ -3302,8 +3302,8 @@ public static final int /*long*/ g_type_class_peek (int /*long*/ g_class) {
+@@ -3315,8 +3315,8 @@ public static final int /*long*/ g_type_class_peek (int /*long*/ g_class) {
}
}
/** @param g_class cast=(gpointer) */
@@ -17924,7 +17951,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_type_class_peek_parent(g_class);
-@@ -3312,8 +3312,8 @@ public static final int /*long*/ g_type_class_peek_parent (int /*long*/ g_class)
+@@ -3325,8 +3325,8 @@ public static final int /*long*/ g_type_class_peek_parent (int /*long*/ g_class)
}
}
/** @param g_class cast=(GType) */
@@ -17935,7 +17962,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_type_class_ref(g_class);
-@@ -3322,8 +3322,8 @@ public static final int /*long*/ g_type_class_ref (int /*long*/ g_class) {
+@@ -3335,8 +3335,8 @@ public static final int /*long*/ g_type_class_ref (int /*long*/ g_class) {
}
}
/** @param g_class cast=(gpointer) */
@@ -17946,7 +17973,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_g_type_class_unref(g_class);
-@@ -3332,8 +3332,8 @@ public static final void g_type_class_unref (int /*long*/ g_class) {
+@@ -3345,8 +3345,8 @@ public static final void g_type_class_unref (int /*long*/ g_class) {
}
}
/** @param name cast=(const gchar *) */
@@ -17957,7 +17984,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_type_from_name(name);
-@@ -3342,8 +3342,8 @@ public static final int /*long*/ g_type_from_name (byte[] name) {
+@@ -3355,8 +3355,8 @@ public static final int /*long*/ g_type_from_name (byte[] name) {
}
}
/** @param iface cast=(gpointer) */
@@ -17968,7 +17995,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_type_interface_peek_parent(iface);
-@@ -3355,8 +3355,8 @@ public static final int /*long*/ g_type_interface_peek_parent (int /*long*/ ifac
+@@ -3368,8 +3368,8 @@ public static final int /*long*/ g_type_interface_peek_parent (int /*long*/ ifac
* @param type cast=(GType)
* @param is_a_type cast=(GType)
*/
@@ -17979,7 +18006,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_type_is_a(type, is_a_type);
-@@ -3365,8 +3365,8 @@ public static final boolean g_type_is_a (int /*long*/ type, int /*long*/ is_a_ty
+@@ -3378,8 +3378,8 @@ public static final boolean g_type_is_a (int /*long*/ type, int /*long*/ is_a_ty
}
}
/** @param handle cast=(GType) */
@@ -17990,7 +18017,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_type_name(handle);
-@@ -3375,8 +3375,8 @@ public static final int /*long*/ g_type_name (int /*long*/ handle) {
+@@ -3388,8 +3388,8 @@ public static final int /*long*/ g_type_name (int /*long*/ handle) {
}
}
/** @param type cast=(GType) */
@@ -18001,7 +18028,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_type_parent(type);
-@@ -3388,8 +3388,8 @@ public static final int /*long*/ g_type_parent (int /*long*/ type) {
+@@ -3401,8 +3401,8 @@ public static final int /*long*/ g_type_parent (int /*long*/ type) {
* @param type cast=(GType)
* @param query cast=(GTypeQuery *)
*/
@@ -18012,7 +18039,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_g_type_query(type, query);
-@@ -3403,8 +3403,8 @@ public static final void g_type_query (int /*long*/ type, int /*long*/ query) {
+@@ -3416,8 +3416,8 @@ public static final void g_type_query (int /*long*/ type, int /*long*/ query) {
* @param info cast=(const GTypeInfo *)
* @param flags cast=(GTypeFlags)
*/
@@ -18023,7 +18050,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_type_register_static(parent_type, type_name, info, flags);
-@@ -3413,8 +3413,8 @@ public static final int /*long*/ g_type_register_static (int /*long*/ parent_typ
+@@ -3426,8 +3426,8 @@ public static final int /*long*/ g_type_register_static (int /*long*/ parent_typ
}
}
/** @param vtable cast=(GThreadFunctions *) */
@@ -18034,7 +18061,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_g_thread_init(vtable);
-@@ -3438,8 +3438,8 @@ public static final boolean g_thread_supported() {
+@@ -3451,8 +3451,8 @@ public static final boolean g_thread_supported() {
* @param items_written cast=(glong *),flags=critical
* @param error cast=(GError **),flags=critical
*/
@@ -18045,7 +18072,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_utf16_to_utf8(str, len, items_read, items_written, error);
-@@ -3448,8 +3448,8 @@ public static final int /*long*/ g_utf16_to_utf8(char[] str, int /*long*/ len, i
+@@ -3461,8 +3461,8 @@ public static final int /*long*/ g_utf16_to_utf8(char[] str, int /*long*/ len, i
}
}
/** @param str cast=(const gchar *) */
@@ -18056,7 +18083,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_utf8_offset_to_pointer(str, offset);
-@@ -3461,8 +3461,8 @@ public static final int /*long*/ g_utf8_offset_to_pointer(int /*long*/ str, int
+@@ -3474,8 +3474,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 *)
*/
@@ -18067,7 +18094,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_utf8_pointer_to_offset(str, pos);
-@@ -3471,8 +3471,8 @@ public static final int /*long*/ g_utf8_pointer_to_offset(int /*long*/ str, int
+@@ -3484,8 +3484,8 @@ public static final int /*long*/ g_utf8_pointer_to_offset(int /*long*/ str, int
}
}
/** @param str cast=(const gchar *) */
@@ -18078,7 +18105,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_utf16_offset_to_pointer(str, offset);
-@@ -3484,8 +3484,8 @@ public static final int /*long*/ g_utf16_offset_to_pointer(int /*long*/ str, int
+@@ -3497,8 +3497,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 *)
*/
@@ -18089,7 +18116,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_utf16_pointer_to_offset(str, pos);
-@@ -3494,8 +3494,8 @@ public static final int /*long*/ g_utf16_pointer_to_offset(int /*long*/ str, int
+@@ -3507,8 +3507,8 @@ public static final int /*long*/ g_utf16_pointer_to_offset(int /*long*/ str, int
}
}
/** @param str cast=(const gchar *) */
@@ -18100,7 +18127,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_utf16_strlen(str, max);
-@@ -3504,8 +3504,8 @@ public static final int /*long*/ g_utf16_strlen(int /*long*/ str, int /*long*/ m
+@@ -3517,8 +3517,8 @@ public static final int /*long*/ g_utf16_strlen(int /*long*/ str, int /*long*/ m
}
}
/** @param str cast=(const gchar *) */
@@ -18111,7 +18138,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_utf8_offset_to_utf16_offset(str, offset);
-@@ -3514,8 +3514,8 @@ public static final int /*long*/ g_utf8_offset_to_utf16_offset(int /*long*/ str,
+@@ -3527,8 +3527,8 @@ public static final int /*long*/ g_utf8_offset_to_utf16_offset(int /*long*/ str,
}
}
/** @param str cast=(const gchar *) */
@@ -18122,7 +18149,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_utf16_offset_to_utf8_offset(str, offset);
-@@ -3524,8 +3524,8 @@ public static final int /*long*/ g_utf16_offset_to_utf8_offset(int /*long*/ str,
+@@ -3537,8 +3537,8 @@ public static final int /*long*/ g_utf16_offset_to_utf8_offset(int /*long*/ str,
}
}
/** @param str cast=(const gchar *) */
@@ -18133,7 +18160,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_utf8_strlen(str, max);
-@@ -3540,8 +3540,8 @@ public static final int /*long*/ g_utf8_strlen(int /*long*/ str, int /*long*/ ma
+@@ -3553,8 +3553,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
*/
@@ -18144,7 +18171,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_utf8_to_utf16(str, len, items_read, items_written, error);
-@@ -3556,8 +3556,8 @@ public static final int /*long*/ g_utf8_to_utf16(byte[] str, int /*long*/ len, i
+@@ -3569,8 +3569,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
*/
@@ -18155,7 +18182,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_utf8_to_utf16(str, len, items_read, items_written, error);
-@@ -3569,28 +3569,28 @@ public static final int /*long*/ g_utf8_to_utf16(int /*long*/ str, int /*long*/
+@@ -3582,28 +3582,28 @@ public static final int /*long*/ g_utf8_to_utf16(int /*long*/ str, int /*long*/
* @param value cast=(GValue *)
* @param type cast=(GType)
*/
@@ -18196,7 +18223,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_value_peek_pointer(value);
-@@ -3599,8 +3599,8 @@ public static final int /*long*/ g_value_peek_pointer (int /*long*/ value) {
+@@ -3612,8 +3612,8 @@ public static final int /*long*/ g_value_peek_pointer (int /*long*/ value) {
}
}
/** @param atom_name cast=(const gchar *),flags=no_out critical */
@@ -18207,7 +18234,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_atom_intern(atom_name, only_if_exists);
-@@ -3609,8 +3609,8 @@ public static final int /*long*/ gdk_atom_intern(byte[] atom_name, boolean only_
+@@ -3622,8 +3622,8 @@ public static final int /*long*/ gdk_atom_intern(byte[] atom_name, boolean only_
}
}
/** @param atom cast=(GdkAtom) */
@@ -18218,7 +18245,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_atom_name(atom);
-@@ -3633,8 +3633,8 @@ public static final void gdk_beep() {
+@@ -3646,8 +3646,8 @@ public static final void gdk_beep() {
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -18229,7 +18256,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_bitmap_create_from_data(window, data, width, height);
-@@ -3643,8 +3643,8 @@ public static final int /*long*/ gdk_bitmap_create_from_data(int /*long*/ window
+@@ -3656,8 +3656,8 @@ public static final int /*long*/ gdk_bitmap_create_from_data(int /*long*/ window
}
}
/** @method flags=dynamic */
@@ -18240,7 +18267,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_cairo_create(drawable);
-@@ -3653,8 +3653,8 @@ public static final int /*long*/ gdk_cairo_create(int /*long*/ drawable) {
+@@ -3666,8 +3666,8 @@ public static final int /*long*/ gdk_cairo_create(int /*long*/ drawable) {
}
}
/** @method flags=dynamic */
@@ -18251,7 +18278,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_cairo_region(cairo, region);
-@@ -3663,8 +3663,8 @@ public static final void gdk_cairo_region(int /*long*/ cairo, int /*long*/ regio
+@@ -3676,8 +3676,8 @@ public static final void gdk_cairo_region(int /*long*/ cairo, int /*long*/ regio
}
}
/** @method flags=dynamic */
@@ -18262,7 +18289,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_cairo_reset_clip(cairo, drawable);
-@@ -3673,8 +3673,8 @@ public static final void gdk_cairo_reset_clip(int /*long*/ cairo, int /*long*/ d
+@@ -3686,8 +3686,8 @@ public static final void gdk_cairo_reset_clip(int /*long*/ cairo, int /*long*/ d
}
}
/** @method flags=dynamic */
@@ -18273,7 +18300,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_cairo_set_source_color(cairo, color);
-@@ -3686,8 +3686,8 @@ public static final void gdk_cairo_set_source_color(int /*long*/ cairo, GdkColor
+@@ -3699,8 +3699,8 @@ public static final void gdk_cairo_set_source_color(int /*long*/ cairo, GdkColor
* @method flags=dynamic
* @param window cast=(GdkWindow *)
*/
@@ -18284,7 +18311,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_cairo_set_source_window(cairo, window, x, y);
-@@ -3697,8 +3697,8 @@ public static final void gdk_cairo_set_source_window(int /*long*/ cairo, int /*l
+@@ -3710,8 +3710,8 @@ public static final void gdk_cairo_set_source_window(int /*long*/ cairo, int /*l
}
}
/** @param color cast=(GdkColor *) */
@@ -18295,7 +18322,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_color_free(color);
-@@ -3723,8 +3723,8 @@ public static final boolean gdk_color_parse(byte[] spec, GdkColor color) {
+@@ -3736,8 +3736,8 @@ public static final boolean gdk_color_parse(byte[] spec, GdkColor color) {
* @param colormap cast=(GdkColormap *)
* @param color cast=(GdkColor *),flags=no_in
*/
@@ -18306,7 +18333,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_color_white(colormap, color);
-@@ -3738,8 +3738,8 @@ public static final boolean gdk_color_white(int /*long*/ colormap, GdkColor colo
+@@ -3751,8 +3751,8 @@ public static final boolean gdk_color_white(int /*long*/ colormap, GdkColor colo
* @param writeable cast=(gboolean)
* @param best_match cast=(gboolean)
*/
@@ -18317,7 +18344,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_colormap_alloc_color(colormap, color, writeable, best_match);
-@@ -3752,8 +3752,8 @@ public static final boolean gdk_colormap_alloc_color(int /*long*/ colormap, GdkC
+@@ -3765,8 +3765,8 @@ public static final boolean gdk_colormap_alloc_color(int /*long*/ colormap, GdkC
* @param colors cast=(GdkColor *),flags=no_out
* @param ncolors cast=(gint)
*/
@@ -18328,7 +18355,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_colormap_free_colors(colormap, colors, ncolors);
-@@ -3761,8 +3761,8 @@ public static final void gdk_colormap_free_colors(int /*long*/ colormap, GdkColo
+@@ -3774,8 +3774,8 @@ public static final void gdk_colormap_free_colors(int /*long*/ colormap, GdkColo
lock.unlock();
}
}
@@ -18339,7 +18366,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_colormap_get_system();
-@@ -3775,8 +3775,8 @@ public static final int /*long*/ gdk_colormap_get_system() {
+@@ -3788,8 +3788,8 @@ public static final int /*long*/ gdk_colormap_get_system() {
* @param pixel cast=(gulong)
* @param result cast=(GdkColor *)
*/
@@ -18350,7 +18377,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_colormap_query_color(colormap, pixel, result);
-@@ -3785,8 +3785,8 @@ public static final void gdk_colormap_query_color(int /*long*/ colormap, int /*l
+@@ -3798,8 +3798,8 @@ public static final void gdk_colormap_query_color(int /*long*/ colormap, int /*l
}
}
/** @param cursor cast=(GdkCursor *) */
@@ -18361,7 +18388,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_cursor_unref(cursor);
-@@ -3795,8 +3795,8 @@ public static final void gdk_cursor_unref(int /*long*/ cursor) {
+@@ -3808,8 +3808,8 @@ public static final void gdk_cursor_unref(int /*long*/ cursor) {
}
}
/** @param cursor_type cast=(GdkCursorType) */
@@ -18372,7 +18399,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_cursor_new(cursor_type);
-@@ -3812,8 +3812,8 @@ public static final int /*long*/ gdk_cursor_new(int /*long*/ cursor_type) {
+@@ -3825,8 +3825,8 @@ public static final int /*long*/ gdk_cursor_new(int /*long*/ cursor_type) {
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -18383,7 +18410,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_cursor_new_from_pixmap(source, mask, fg, bg, x, y);
-@@ -3822,8 +3822,8 @@ public static final int /*long*/ gdk_cursor_new_from_pixmap(int /*long*/ source,
+@@ -3835,8 +3835,8 @@ public static final int /*long*/ gdk_cursor_new_from_pixmap(int /*long*/ source,
}
}
/** @method flags=dynamic */
@@ -18394,7 +18421,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_cursor_new_from_pixbuf(display, pixbuf, x, y);
-@@ -3832,8 +3832,8 @@ public static final int /*long*/ gdk_cursor_new_from_pixbuf(int /*long*/ display
+@@ -3845,8 +3845,8 @@ public static final int /*long*/ gdk_cursor_new_from_pixbuf(int /*long*/ display
}
}
/** @method flags=dynamic */
@@ -18405,7 +18432,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_display_get_default();
-@@ -3842,8 +3842,8 @@ public static final int /*long*/ gdk_display_get_default() {
+@@ -3855,8 +3855,8 @@ public static final int /*long*/ gdk_display_get_default() {
}
}
/** @method flags=dynamic */
@@ -18416,7 +18443,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_display_supports_cursor_color(display);
-@@ -3856,8 +3856,8 @@ public static final boolean gdk_display_supports_cursor_color(int /*long*/ displ
+@@ -3869,8 +3869,8 @@ public static final boolean gdk_display_supports_cursor_color(int /*long*/ displ
* @param action cast=(GdkDragAction)
* @param time cast=(guint32)
*/
@@ -18427,7 +18454,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_drag_status(context, action, time);
-@@ -3875,8 +3875,8 @@ public static final void gdk_drag_status(int /*long*/ context, int action, int t
+@@ -3888,8 +3888,8 @@ public static final void gdk_drag_status(int /*long*/ context, int action, int t
* @param angle1 cast=(gint)
* @param angle2 cast=(gint)
*/
@@ -18438,7 +18465,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_draw_arc(drawable, gc, filled, x, y, width, height, angle1, angle2);
-@@ -3895,8 +3895,8 @@ public static final void gdk_draw_arc(int /*long*/ drawable, int /*long*/ gc, in
+@@ -3908,8 +3908,8 @@ public static final void gdk_draw_arc(int /*long*/ drawable, int /*long*/ gc, in
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -18449,7 +18476,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_draw_drawable(drawable, gc, src, xsrc, ysrc, xdest, ydest, width, height);
-@@ -3909,8 +3909,8 @@ public static final void gdk_draw_drawable(int /*long*/ drawable, int /*long*/ g
+@@ -3922,8 +3922,8 @@ public static final void gdk_draw_drawable(int /*long*/ drawable, int /*long*/ g
* @param gc cast=(GdkGC *)
* @param image cast=(GdkImage *)
*/
@@ -18460,7 +18487,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_draw_image(drawable, gc, image, xsrc, ysrc, xdest, ydest, width, height);
-@@ -3925,8 +3925,8 @@ public static final void gdk_draw_image(int /*long*/ drawable, int /*long*/ gc,
+@@ -3938,8 +3938,8 @@ public static final void gdk_draw_image(int /*long*/ drawable, int /*long*/ gc,
* @param y cast=(gint)
* @param layout cast=(PangoLayout *)
*/
@@ -18471,7 +18498,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_draw_layout(drawable, gc, x, y, layout);
-@@ -3942,8 +3942,8 @@ public static final void gdk_draw_layout(int /*long*/ drawable, int /*long*/ gc,
+@@ -3955,8 +3955,8 @@ public static final void gdk_draw_layout(int /*long*/ drawable, int /*long*/ gc,
* @param foreground flags=no_out
* @param background flags=no_out
*/
@@ -18482,7 +18509,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_draw_layout_with_colors(drawable, gc, x, y, layout, foreground, background);
-@@ -3958,8 +3958,8 @@ public static final void gdk_draw_layout_with_colors(int /*long*/ drawable, int
+@@ -3971,8 +3971,8 @@ public static final void gdk_draw_layout_with_colors(int /*long*/ drawable, int
* @param x2 cast=(gint)
* @param y2 cast=(gint)
*/
@@ -18493,7 +18520,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_draw_line(drawable, gc, x1, y1, x2, y2);
-@@ -3972,8 +3972,8 @@ public static final void gdk_draw_line(int /*long*/ drawable, int /*long*/ gc, i
+@@ -3985,8 +3985,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)
*/
@@ -18504,7 +18531,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_draw_lines(drawable, gc, points, npoints);
-@@ -3996,8 +3996,8 @@ public static final void gdk_draw_lines(int /*long*/ drawable, int /*long*/ gc,
+@@ -4009,8 +4009,8 @@ public static final void gdk_draw_lines(int /*long*/ drawable, int /*long*/ gc,
* @param x_dither cast=(gint)
* @param y_dither cast=(gint)
*/
@@ -18515,7 +18542,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_draw_pixbuf(drawable, gc, pixbuf, xsrc, ysrc, xdest, ydest, width, height, dither, x_dither, y_dither);
-@@ -4008,8 +4008,8 @@ public static final void gdk_draw_pixbuf(int /*long*/ drawable, int /*long*/ gc,
+@@ -4021,8 +4021,8 @@ public static final void gdk_draw_pixbuf(int /*long*/ drawable, int /*long*/ gc,
/**
* @method flags=dynamic
*/
@@ -18526,7 +18553,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_draw_point(drawable, gc, x, y);
-@@ -4024,8 +4024,8 @@ public static final void gdk_draw_point(int /*long*/ drawable, int /*long*/ gc,
+@@ -4037,8 +4037,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)
*/
@@ -18537,7 +18564,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_draw_polygon(drawable, gc, filled, points, npoints);
-@@ -4042,8 +4042,8 @@ public static final void gdk_draw_polygon(int /*long*/ drawable, int /*long*/ gc
+@@ -4055,8 +4055,8 @@ public static final void gdk_draw_polygon(int /*long*/ drawable, int /*long*/ gc
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -18548,7 +18575,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_draw_rectangle(drawable, gc, filled, x, y, width, height);
-@@ -4052,8 +4052,8 @@ public static final void gdk_draw_rectangle(int /*long*/ drawable, int /*long*/
+@@ -4065,8 +4065,8 @@ public static final void gdk_draw_rectangle(int /*long*/ drawable, int /*long*/
}
}
/** @param drawable cast=(GdkDrawable *) */
@@ -18559,7 +18586,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_drawable_get_depth(drawable);
-@@ -4069,8 +4069,8 @@ public static final int gdk_drawable_get_depth(int /*long*/ drawable) {
+@@ -4082,8 +4082,8 @@ public static final int gdk_drawable_get_depth(int /*long*/ drawable) {
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -18570,7 +18597,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_drawable_get_image(drawable, x, y, width, height);
-@@ -4083,8 +4083,8 @@ public static final int /*long*/ gdk_drawable_get_image(int /*long*/ drawable, i
+@@ -4096,8 +4096,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
*/
@@ -18581,7 +18608,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_drawable_get_size(drawable, width, height);
-@@ -4093,8 +4093,8 @@ public static final void gdk_drawable_get_size(int /*long*/ drawable, int[] widt
+@@ -4106,8 +4106,8 @@ public static final void gdk_drawable_get_size(int /*long*/ drawable, int[] widt
}
}
/** @param drawable cast=(GdkDrawable *) */
@@ -18592,7 +18619,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_drawable_get_visible_region(drawable);
-@@ -4103,8 +4103,8 @@ public static final int /*long*/ gdk_drawable_get_visible_region(int /*long*/ dr
+@@ -4116,8 +4116,8 @@ public static final int /*long*/ gdk_drawable_get_visible_region(int /*long*/ dr
}
}
/** @param event cast=(GdkEvent *) */
@@ -18603,7 +18630,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_event_copy(event);
-@@ -4113,8 +4113,8 @@ public static final int /*long*/ gdk_event_copy(int /*long*/ event) {
+@@ -4126,8 +4126,8 @@ public static final int /*long*/ gdk_event_copy(int /*long*/ event) {
}
}
/** @param event cast=(GdkEvent *) */
@@ -18614,7 +18641,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_event_free(event);
-@@ -4122,8 +4122,8 @@ public static final void gdk_event_free(int /*long*/ event) {
+@@ -4135,8 +4135,8 @@ public static final void gdk_event_free(int /*long*/ event) {
lock.unlock();
}
}
@@ -18625,7 +18652,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_event_get();
-@@ -4136,8 +4136,8 @@ public static final int /*long*/ gdk_event_get() {
+@@ -4149,8 +4149,8 @@ public static final int /*long*/ gdk_event_get() {
* @param px cast=(gdouble *)
* @param py cast=(gdouble *)
*/
@@ -18636,7 +18663,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_event_get_root_coords(event, px, py);
-@@ -4150,8 +4150,8 @@ public static final boolean gdk_event_get_root_coords(int /*long*/ event, double
+@@ -4163,8 +4163,8 @@ public static final boolean gdk_event_get_root_coords(int /*long*/ event, double
* @param px cast=(gdouble *)
* @param py cast=(gdouble *)
*/
@@ -18647,7 +18674,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_event_get_coords(event, px, py);
-@@ -4163,8 +4163,8 @@ public static final boolean gdk_event_get_coords(int /*long*/ event, double[] px
+@@ -4176,8 +4176,8 @@ public static final boolean gdk_event_get_coords(int /*long*/ event, double[] px
* @param event cast=(GdkEvent *)
* @param pmod cast=(GdkModifierType *)
*/
@@ -18658,7 +18685,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_event_get_state(event, pmod);
-@@ -4173,8 +4173,8 @@ public static final boolean gdk_event_get_state(int /*long*/ event, int[] pmod)
+@@ -4186,8 +4186,8 @@ public static final boolean gdk_event_get_state(int /*long*/ event, int[] pmod)
}
}
/** @param event cast=(GdkEvent *) */
@@ -18669,7 +18696,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_event_get_time(event);
-@@ -4187,8 +4187,8 @@ public static final int gdk_event_get_time(int /*long*/ event) {
+@@ -4200,8 +4200,8 @@ public static final int gdk_event_get_time(int /*long*/ event) {
* @param data cast=(gpointer)
* @param notify cast=(GDestroyNotify)
*/
@@ -18680,7 +18707,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_event_handler_set(func, data, notify);
-@@ -4196,8 +4196,8 @@ public static final void gdk_event_handler_set(int /*long*/ func, int /*long*/ d
+@@ -4209,8 +4209,8 @@ public static final void gdk_event_handler_set(int /*long*/ func, int /*long*/ d
lock.unlock();
}
}
@@ -18691,7 +18718,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_event_new(type);
-@@ -4205,8 +4205,8 @@ public static final int /*long*/ gdk_event_new(int type) {
+@@ -4218,8 +4218,8 @@ public static final int /*long*/ gdk_event_new(int type) {
lock.unlock();
}
}
@@ -18702,7 +18729,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_event_peek();
-@@ -4215,8 +4215,8 @@ public static final int /*long*/ gdk_event_peek() {
+@@ -4228,8 +4228,8 @@ public static final int /*long*/ gdk_event_peek() {
}
}
/** @param event cast=(GdkEvent *) */
@@ -18713,7 +18740,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_event_put(event);
-@@ -4255,8 +4255,8 @@ public static final void gdk_flush() {
+@@ -4268,8 +4268,8 @@ public static final void gdk_flush() {
* @param gc cast=(GdkGC *)
* @param values cast=(GdkGCValues *),flags=no_in
*/
@@ -18724,7 +18751,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_gc_get_values(gc, values);
-@@ -4265,8 +4265,8 @@ public static final void gdk_gc_get_values(int /*long*/ gc, GdkGCValues values)
+@@ -4278,8 +4278,8 @@ public static final void gdk_gc_get_values(int /*long*/ gc, GdkGCValues values)
}
}
/** @param window cast=(GdkDrawable *) */
@@ -18735,7 +18762,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_gc_new(window);
-@@ -4278,8 +4278,8 @@ public static final int /*long*/ gdk_gc_new(int /*long*/ window) {
+@@ -4291,8 +4291,8 @@ public static final int /*long*/ gdk_gc_new(int /*long*/ window) {
* @method flags=dynamic
* @param color cast=(GdkColor *),flags=no_out
*/
@@ -18746,7 +18773,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_gc_set_background(gc, color);
-@@ -4290,8 +4290,8 @@ public static final void gdk_gc_set_background(int /*long*/ gc, GdkColor color)
+@@ -4303,8 +4303,8 @@ public static final void gdk_gc_set_background(int /*long*/ gc, GdkColor color)
/**
* @method flags=dynamic
*/
@@ -18757,7 +18784,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_gc_set_clip_mask(gc, mask);
-@@ -4304,8 +4304,8 @@ public static final void gdk_gc_set_clip_mask(int /*long*/ gc, int /*long*/ mask
+@@ -4317,8 +4317,8 @@ public static final void gdk_gc_set_clip_mask(int /*long*/ gc, int /*long*/ mask
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -18768,7 +18795,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_gc_set_clip_origin(gc, x, y);
-@@ -4317,8 +4317,8 @@ public static final void gdk_gc_set_clip_origin(int /*long*/ gc, int x, int y) {
+@@ -4330,8 +4330,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 *)
*/
@@ -18779,7 +18806,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_gc_set_clip_region(gc, region);
-@@ -4332,8 +4332,8 @@ public static final void gdk_gc_set_clip_region(int /*long*/ gc, int /*long*/ re
+@@ -4345,8 +4345,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)
*/
@@ -18790,7 +18817,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_gc_set_dashes(gc, dash_offset, dash_list, n);
-@@ -4345,8 +4345,8 @@ public static final void gdk_gc_set_dashes(int /*long*/ gc, int dash_offset, byt
+@@ -4358,8 +4358,8 @@ public static final void gdk_gc_set_dashes(int /*long*/ gc, int dash_offset, byt
* @param gc cast=(GdkGC *)
* @param exposures cast=(gboolean)
*/
@@ -18801,7 +18828,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_gc_set_exposures(gc, exposures);
-@@ -4358,8 +4358,8 @@ public static final void gdk_gc_set_exposures(int /*long*/ gc, boolean exposures
+@@ -4371,8 +4371,8 @@ public static final void gdk_gc_set_exposures(int /*long*/ gc, boolean exposures
* @param gc cast=(GdkGC *)
* @param fill cast=(GdkFill)
*/
@@ -18812,7 +18839,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_gc_set_fill(gc, fill);
-@@ -4371,8 +4371,8 @@ public static final void gdk_gc_set_fill(int /*long*/ gc, int fill) {
+@@ -4384,8 +4384,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
*/
@@ -18823,7 +18850,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_gc_set_foreground(gc, color);
-@@ -4384,8 +4384,8 @@ public static final void gdk_gc_set_foreground(int /*long*/ gc, GdkColor color)
+@@ -4397,8 +4397,8 @@ public static final void gdk_gc_set_foreground(int /*long*/ gc, GdkColor color)
* @param gc cast=(GdkGC *)
* @param function cast=(GdkFunction)
*/
@@ -18834,7 +18861,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_gc_set_function(gc, function);
-@@ -4396,8 +4396,8 @@ public static final void gdk_gc_set_function(int /*long*/ gc, int /*long*/ funct
+@@ -4409,8 +4409,8 @@ public static final void gdk_gc_set_function(int /*long*/ gc, int /*long*/ funct
/**
* @method flags=dynamic
*/
@@ -18845,7 +18872,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_gc_set_line_attributes(gc, line_width, line_style, cap_style, join_style);
-@@ -4409,8 +4409,8 @@ public static final void gdk_gc_set_line_attributes(int /*long*/ gc, int line_wi
+@@ -4422,8 +4422,8 @@ public static final void gdk_gc_set_line_attributes(int /*long*/ gc, int line_wi
* @param gc cast=(GdkGC *)
* @param stipple cast=(GdkPixmap *)
*/
@@ -18856,7 +18883,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_gc_set_stipple(gc, stipple);
-@@ -4422,8 +4422,8 @@ public static final void gdk_gc_set_stipple(int /*long*/ gc, int /*long*/ stippl
+@@ -4435,8 +4435,8 @@ public static final void gdk_gc_set_stipple(int /*long*/ gc, int /*long*/ stippl
* @param gc cast=(GdkGC *)
* @param mode cast=(GdkSubwindowMode)
*/
@@ -18867,7 +18894,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_gc_set_subwindow(gc, mode);
-@@ -4434,8 +4434,8 @@ public static final void gdk_gc_set_subwindow(int /*long*/ gc, int /*long*/ mode
+@@ -4447,8 +4447,8 @@ public static final void gdk_gc_set_subwindow(int /*long*/ gc, int /*long*/ mode
/**
* @method flags=dynamic
*/
@@ -18878,7 +18905,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_gc_set_tile(gc, tile);
-@@ -4446,8 +4446,8 @@ public static final void gdk_gc_set_tile(int /*long*/ gc, int /*long*/ tile) {
+@@ -4459,8 +4459,8 @@ public static final void gdk_gc_set_tile(int /*long*/ gc, int /*long*/ tile) {
/**
* @method flags=dynamic
*/
@@ -18889,7 +18916,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_gc_set_ts_origin(gc, x, y);
-@@ -4460,8 +4460,8 @@ public static final void gdk_gc_set_ts_origin(int /*long*/ gc, int x, int y) {
+@@ -4473,8 +4473,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)
*/
@@ -18900,7 +18927,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_gc_set_values(gc, values, values_mask);
-@@ -4469,8 +4469,8 @@ public static final void gdk_gc_set_values(int /*long*/ gc, GdkGCValues values,
+@@ -4482,8 +4482,8 @@ public static final void gdk_gc_set_values(int /*long*/ gc, GdkGCValues values,
lock.unlock();
}
}
@@ -18911,7 +18938,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_get_default_root_window();
-@@ -4487,8 +4487,8 @@ public static final void gdk_keyboard_ungrab(int time) {
+@@ -4500,8 +4500,8 @@ public static final void gdk_keyboard_ungrab(int time) {
lock.unlock();
}
}
@@ -18922,7 +18949,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_keymap_get_default();
-@@ -4504,8 +4504,8 @@ public static final int /*long*/ gdk_keymap_get_default() {
+@@ -4517,8 +4517,8 @@ public static final int /*long*/ gdk_keymap_get_default() {
* @param level cast=(gint*)
* @param consumed_modifiers cast=(GdkModifierType *)
*/
@@ -18933,7 +18960,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_keymap_translate_keyboard_state(keymap, hardware_keycode, state, group, keyval, effective_group, level, consumed_modifiers);
-@@ -4531,8 +4531,8 @@ public static final int gdk_keyval_to_unicode(int keyval) {
+@@ -4544,8 +4544,8 @@ public static final int gdk_keyval_to_unicode(int keyval) {
lock.unlock();
}
}
@@ -18944,7 +18971,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_pango_attr_embossed_new(embossed);
-@@ -4540,8 +4540,8 @@ public static final int /*long*/ gdk_pango_attr_embossed_new(boolean embossed) {
+@@ -4553,8 +4553,8 @@ public static final int /*long*/ gdk_pango_attr_embossed_new(boolean embossed) {
lock.unlock();
}
}
@@ -18955,7 +18982,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_pango_context_get();
-@@ -4554,8 +4554,8 @@ public static final int /*long*/ gdk_pango_context_get() {
+@@ -4567,8 +4567,8 @@ public static final int /*long*/ gdk_pango_context_get() {
* @param context cast=(PangoContext *)
* @param colormap cast=(GdkColormap *)
*/
@@ -18966,7 +18993,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_pango_context_set_colormap(context, colormap);
-@@ -4564,8 +4564,8 @@ public static final void gdk_pango_context_set_colormap(int /*long*/ context, in
+@@ -4577,8 +4577,8 @@ public static final void gdk_pango_context_set_colormap(int /*long*/ context, in
}
}
/** @param layout cast=(PangoLayout *) */
@@ -18977,7 +19004,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_pango_layout_get_clip_region(layout, x_origin, y_origin, index_ranges, n_ranges);
-@@ -4577,8 +4577,8 @@ public static final int /*long*/ gdk_pango_layout_get_clip_region(int /*long*/ l
+@@ -4590,8 +4590,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 *)
*/
@@ -18988,7 +19015,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_pixbuf_copy_area(src_pixbuf, src_x, src_y, width, height, dest_pixbuf, dest_x, dest_y);
-@@ -4591,8 +4591,8 @@ public static final void gdk_pixbuf_copy_area(int /*long*/ src_pixbuf, int src_x
+@@ -4604,8 +4604,8 @@ public static final void gdk_pixbuf_copy_area(int /*long*/ src_pixbuf, int src_x
* @param src cast=(GdkDrawable *)
* @param cmap cast=(GdkColormap *)
*/
@@ -18999,7 +19026,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_pixbuf_get_from_drawable(dest, src, cmap, src_x, src_y, dest_x, dest_y, width, height);
-@@ -4601,8 +4601,8 @@ public static final int /*long*/ gdk_pixbuf_get_from_drawable(int /*long*/ dest,
+@@ -4614,8 +4614,8 @@ public static final int /*long*/ gdk_pixbuf_get_from_drawable(int /*long*/ dest,
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -19010,7 +19037,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_pixbuf_get_has_alpha(pixbuf);
-@@ -4611,8 +4611,8 @@ public static final boolean gdk_pixbuf_get_has_alpha(int /*long*/ pixbuf) {
+@@ -4624,8 +4624,8 @@ public static final boolean gdk_pixbuf_get_has_alpha(int /*long*/ pixbuf) {
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -19021,7 +19048,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_pixbuf_get_height(pixbuf);
-@@ -4621,8 +4621,8 @@ public static final int gdk_pixbuf_get_height(int /*long*/ pixbuf) {
+@@ -4634,8 +4634,8 @@ public static final int gdk_pixbuf_get_height(int /*long*/ pixbuf) {
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -19032,7 +19059,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_pixbuf_get_pixels(pixbuf);
-@@ -4631,8 +4631,8 @@ public static final int /*long*/ gdk_pixbuf_get_pixels(int /*long*/ pixbuf) {
+@@ -4644,8 +4644,8 @@ public static final int /*long*/ gdk_pixbuf_get_pixels(int /*long*/ pixbuf) {
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -19043,7 +19070,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_pixbuf_get_rowstride(pixbuf);
-@@ -4641,8 +4641,8 @@ public static final int gdk_pixbuf_get_rowstride(int /*long*/ pixbuf) {
+@@ -4654,8 +4654,8 @@ public static final int gdk_pixbuf_get_rowstride(int /*long*/ pixbuf) {
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
@@ -19054,7 +19081,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_pixbuf_get_width(pixbuf);
-@@ -4650,8 +4650,8 @@ public static final int gdk_pixbuf_get_width(int /*long*/ pixbuf) {
+@@ -4663,8 +4663,8 @@ public static final int gdk_pixbuf_get_width(int /*long*/ pixbuf) {
lock.unlock();
}
}
@@ -19065,7 +19092,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_pixbuf_loader_new();
-@@ -4663,8 +4663,8 @@ public static final int /*long*/ gdk_pixbuf_loader_new() {
+@@ -4676,8 +4676,8 @@ public static final int /*long*/ gdk_pixbuf_loader_new() {
* @param loader cast=(GdkPixbufLoader *)
* @param error cast=(GError **)
*/
@@ -19076,7 +19103,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_pixbuf_loader_close(loader, error);
-@@ -4673,8 +4673,8 @@ public static final boolean gdk_pixbuf_loader_close(int /*long*/ loader, int /*l
+@@ -4686,8 +4686,8 @@ public static final boolean gdk_pixbuf_loader_close(int /*long*/ loader, int /*l
}
}
/** @param loader cast=(GdkPixbufLoader *) */
@@ -19087,7 +19114,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_pixbuf_loader_get_pixbuf(loader);
-@@ -4688,8 +4688,8 @@ public static final int /*long*/ gdk_pixbuf_loader_get_pixbuf(int /*long*/ loade
+@@ -4701,8 +4701,8 @@ public static final int /*long*/ gdk_pixbuf_loader_get_pixbuf(int /*long*/ loade
* @param count cast=(gsize)
* @param error cast=(GError **)
*/
@@ -19098,7 +19125,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_pixbuf_loader_write(loader, buffer, count, error);
-@@ -4701,8 +4701,8 @@ public static final boolean gdk_pixbuf_loader_write(int /*long*/ loader, int /*l
+@@ -4714,8 +4714,8 @@ public static final boolean gdk_pixbuf_loader_write(int /*long*/ loader, int /*l
* @param colorspace cast=(GdkColorspace)
* @param has_alpha cast=(gboolean)
*/
@@ -19109,7 +19136,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_pixbuf_new(colorspace, has_alpha, bits_per_sample, width, height);
-@@ -4714,8 +4714,8 @@ public static final int /*long*/ gdk_pixbuf_new(int colorspace, boolean has_alph
+@@ -4727,8 +4727,8 @@ public static final int /*long*/ gdk_pixbuf_new(int colorspace, boolean has_alph
* @param filename cast=(const char *)
* @param error cast=(GError**)
*/
@@ -19120,7 +19147,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_pixbuf_new_from_file(filename, error);
-@@ -4729,8 +4729,8 @@ public static final int /*long*/ gdk_pixbuf_new_from_file(byte[] filename, int /
+@@ -4742,8 +4742,8 @@ public static final int /*long*/ gdk_pixbuf_new_from_file(byte[] filename, int /
* @param gc cast=(GdkGC *)
* @param dither cast=(GdkRgbDither)
*/
@@ -19131,7 +19158,7 @@ index 62bc7a8..eb1efa2 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);
-@@ -4743,8 +4743,8 @@ public static final void gdk_pixbuf_render_to_drawable(int /*long*/ pixbuf, int
+@@ -4756,8 +4756,8 @@ public static final void gdk_pixbuf_render_to_drawable(int /*long*/ pixbuf, int
* @param pixmap_return cast=(GdkDrawable **)
* @param mask_return cast=(GdkBitmap **)
*/
@@ -19142,7 +19169,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap_return, mask_return, alpha_threshold);
-@@ -4762,8 +4762,8 @@ public static final void gdk_pixbuf_render_pixmap_and_mask(int /*long*/ pixbuf,
+@@ -4775,8 +4775,8 @@ public static final void gdk_pixbuf_render_pixmap_and_mask(int /*long*/ pixbuf,
* @param option_values cast=(char **)
* @param error cast=(GError **)
*/
@@ -19153,7 +19180,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_pixbuf_save_to_bufferv(pixbuf, buffer, buffer_size, type, option_keys, option_values, error);
-@@ -4779,8 +4779,8 @@ public static final boolean gdk_pixbuf_save_to_bufferv(int /*long*/ pixbuf, int
+@@ -4792,8 +4792,8 @@ public static final boolean gdk_pixbuf_save_to_bufferv(int /*long*/ pixbuf, int
* @param scale_x cast=(double)
* @param scale_y cast=(double)
*/
@@ -19164,7 +19191,7 @@ index 62bc7a8..eb1efa2 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);
-@@ -4792,8 +4792,8 @@ public static final void gdk_pixbuf_scale(int /*long*/ src, int /*long*/ dest, i
+@@ -4805,8 +4805,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)
*/
@@ -19175,7 +19202,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_pixbuf_scale_simple(src, dest_width, dest_height, interp_type);
-@@ -4807,8 +4807,8 @@ public static final int /*long*/ gdk_pixbuf_scale_simple(int /*long*/ src, int d
+@@ -4820,8 +4820,8 @@ public static final int /*long*/ gdk_pixbuf_scale_simple(int /*long*/ src, int d
* @param height cast=(gint)
* @param depth cast=(gint)
*/
@@ -19186,7 +19213,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_pixmap_new(window, width, height, depth);
-@@ -4824,8 +4824,8 @@ public static final int /*long*/ gdk_pixmap_new(int /*long*/ window, int width,
+@@ -4837,8 +4837,8 @@ public static final int /*long*/ gdk_pixmap_new(int /*long*/ window, int width,
* @param cursor cast=(GdkCursor *)
* @param time cast=(guint32)
*/
@@ -19197,7 +19224,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_pointer_grab(window, owner_events, event_mask, confine_to, cursor, time);
-@@ -4861,8 +4861,8 @@ public static final void gdk_pointer_ungrab(int time) {
+@@ -4874,8 +4874,8 @@ public static final void gdk_pointer_ungrab(int time) {
* @param actual_length cast=(gint *)
* @param data cast=(guchar **)
*/
@@ -19208,7 +19235,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_property_get(window, property, type, offset, length, pdelete, actual_property_type, actual_format, actual_length, data);
-@@ -4871,8 +4871,8 @@ public static final boolean gdk_property_get(int /*long*/ window, int /*long*/ p
+@@ -4884,8 +4884,8 @@ public static final boolean gdk_property_get(int /*long*/ window, int /*long*/ p
}
}
/** @param region cast=(GdkRegion *) */
@@ -19219,7 +19246,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_region_destroy(region);
-@@ -4881,8 +4881,8 @@ public static final void gdk_region_destroy(int /*long*/ region) {
+@@ -4894,8 +4894,8 @@ public static final void gdk_region_destroy(int /*long*/ region) {
}
}
/** @param region cast=(GdkRegion *) */
@@ -19230,7 +19257,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_region_empty(region);
-@@ -4894,8 +4894,8 @@ public static final boolean gdk_region_empty(int /*long*/ region) {
+@@ -4907,8 +4907,8 @@ public static final boolean gdk_region_empty(int /*long*/ region) {
* @param region cast=(GdkRegion *)
* @param rectangle cast=(GdkRectangle *),flags=no_in
*/
@@ -19241,7 +19268,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_region_get_clipbox(region, rectangle);
-@@ -4908,8 +4908,8 @@ public static final void gdk_region_get_clipbox(int /*long*/ region, GdkRectangl
+@@ -4921,8 +4921,8 @@ public static final void gdk_region_get_clipbox(int /*long*/ region, GdkRectangl
* @param rectangles cast=(GdkRectangle **)
* @param n_rectangles cast=(gint *)
*/
@@ -19252,7 +19279,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_region_get_rectangles(region, rectangles, n_rectangles);
-@@ -4921,8 +4921,8 @@ public static final void gdk_region_get_rectangles(int /*long*/ region, int /*lo
+@@ -4934,8 +4934,8 @@ public static final void gdk_region_get_rectangles(int /*long*/ region, int /*lo
* @param source1 cast=(GdkRegion *)
* @param source2 cast=(GdkRegion *)
*/
@@ -19263,7 +19290,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_region_intersect(source1, source2);
-@@ -4930,8 +4930,8 @@ public static final void gdk_region_intersect(int /*long*/ source1, int /*long*/
+@@ -4943,8 +4943,8 @@ public static final void gdk_region_intersect(int /*long*/ source1, int /*long*/
lock.unlock();
}
}
@@ -19274,7 +19301,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_region_new();
-@@ -4944,8 +4944,8 @@ public static final int /*long*/ gdk_region_new() {
+@@ -4957,8 +4957,8 @@ public static final int /*long*/ gdk_region_new() {
* @param dx cast=(gint)
* @param dy cast=(gint)
*/
@@ -19285,7 +19312,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_region_offset(region, dx, dy);
-@@ -4958,8 +4958,8 @@ public static final void gdk_region_offset(int /*long*/ region, int dx, int dy)
+@@ -4971,8 +4971,8 @@ public static final void gdk_region_offset(int /*long*/ region, int dx, int dy)
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -19296,7 +19323,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_region_point_in(region, x, y);
-@@ -4971,8 +4971,8 @@ public static final boolean gdk_region_point_in(int /*long*/ region, int x, int
+@@ -4984,8 +4984,8 @@ public static final boolean gdk_region_point_in(int /*long*/ region, int x, int
* @param points cast=(GdkPoint *)
* @param fill_rule cast=(GdkFillRule)
*/
@@ -19307,7 +19334,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_region_polygon(points, npoints, fill_rule);
-@@ -4981,8 +4981,8 @@ public static final int /*long*/ gdk_region_polygon(int[] points, int npoints, i
+@@ -4994,8 +4994,8 @@ public static final int /*long*/ gdk_region_polygon(int[] points, int npoints, i
}
}
/** @param rectangle flags=no_out */
@@ -19318,7 +19345,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_region_rectangle(rectangle);
-@@ -4994,8 +4994,8 @@ public static final int /*long*/ gdk_region_rectangle(GdkRectangle rectangle) {
+@@ -5007,8 +5007,8 @@ public static final int /*long*/ gdk_region_rectangle(GdkRectangle rectangle) {
* @param region cast=(GdkRegion *)
* @param rect cast=(GdkRectangle *),flags=no_out
*/
@@ -19329,7 +19356,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_region_rect_in(region, rect);
-@@ -5007,8 +5007,8 @@ public static final int /*long*/ gdk_region_rect_in(int /*long*/ region, GdkRect
+@@ -5020,8 +5020,8 @@ public static final int /*long*/ gdk_region_rect_in(int /*long*/ region, GdkRect
* @param source1 cast=(GdkRegion *)
* @param source2 cast=(GdkRegion *)
*/
@@ -19340,7 +19367,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_region_subtract(source1, source2);
-@@ -5020,8 +5020,8 @@ public static final void gdk_region_subtract(int /*long*/ source1, int /*long*/
+@@ -5033,8 +5033,8 @@ public static final void gdk_region_subtract(int /*long*/ source1, int /*long*/
* @param source1 cast=(GdkRegion *)
* @param source2 cast=(GdkRegion *)
*/
@@ -19351,7 +19378,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_region_union(source1, source2);
-@@ -5033,8 +5033,8 @@ public static final void gdk_region_union(int /*long*/ source1, int /*long*/ sou
+@@ -5046,8 +5046,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
*/
@@ -19362,7 +19389,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_region_union_with_rect(region, rect);
-@@ -5043,8 +5043,8 @@ public static final void gdk_region_union_with_rect(int /*long*/ region, GdkRect
+@@ -5056,8 +5056,8 @@ public static final void gdk_region_union_with_rect(int /*long*/ region, GdkRect
}
}
/** @method flags=dynamic */
@@ -19373,7 +19400,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_screen_get_default();
-@@ -5058,8 +5058,8 @@ public static final int /*long*/ gdk_screen_get_default() {
+@@ -5071,8 +5071,8 @@ public static final int /*long*/ gdk_screen_get_default() {
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -19384,7 +19411,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_screen_get_monitor_at_point (screen, x, y);
-@@ -5072,8 +5072,8 @@ public static final int gdk_screen_get_monitor_at_point (int /*long*/ screen, in
+@@ -5085,8 +5085,8 @@ public static final int gdk_screen_get_monitor_at_point (int /*long*/ screen, in
* @param screen cast=(GdkScreen *)
* @param window cast=(GdkWindow *)
*/
@@ -19395,7 +19422,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_screen_get_monitor_at_window(screen, window);
-@@ -5086,8 +5086,8 @@ public static final int gdk_screen_get_monitor_at_window(int /*long*/ screen, in
+@@ -5099,8 +5099,8 @@ public static final int gdk_screen_get_monitor_at_window(int /*long*/ screen, in
* @param screen cast=(GdkScreen *)
* @param dest flags=no_in
*/
@@ -19406,7 +19433,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_screen_get_monitor_geometry(screen, monitor_num, dest);
-@@ -5099,8 +5099,8 @@ public static final void gdk_screen_get_monitor_geometry (int /*long*/ screen, i
+@@ -5112,8 +5112,8 @@ public static final void gdk_screen_get_monitor_geometry (int /*long*/ screen, i
* @method flags=dynamic
* @param screen cast=(GdkScreen *)
*/
@@ -19417,7 +19444,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_screen_get_n_monitors(screen);
-@@ -5112,8 +5112,8 @@ public static final int gdk_screen_get_n_monitors(int /*long*/ screen) {
+@@ -5125,8 +5125,8 @@ public static final int gdk_screen_get_n_monitors(int /*long*/ screen) {
* @method flags=dynamic
* @param screen cast=(GdkScreen *)
*/
@@ -19428,7 +19455,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_screen_get_number(screen);
-@@ -5165,8 +5165,8 @@ public static final void gdk_set_program_class(byte[] program_class) {
+@@ -5178,8 +5178,8 @@ public static final void gdk_set_program_class(byte[] program_class) {
* @param ctext cast=(guchar **)
* @param length cast=(gint *)
*/
@@ -19439,7 +19466,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_utf8_to_compound_text(str, encoding, format, ctext, length);
-@@ -5175,8 +5175,8 @@ public static final boolean gdk_utf8_to_compound_text(byte[] str, int /*long*/[]
+@@ -5188,8 +5188,8 @@ public static final boolean gdk_utf8_to_compound_text(byte[] str, int /*long*/[]
}
}
/** @param str cast=(const gchar *) */
@@ -19450,7 +19477,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_utf8_to_string_target(str);
-@@ -5190,8 +5190,8 @@ public static final int /*long*/ gdk_utf8_to_string_target(byte[] str) {
+@@ -5203,8 +5203,8 @@ public static final int /*long*/ gdk_utf8_to_string_target(byte[] str) {
* @param text cast=(guchar *)
* @param list cast=(gchar ***)
*/
@@ -19461,7 +19488,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_text_property_to_utf8_list_for_display(display, encoding, format, text, length, list);
-@@ -5205,7 +5205,7 @@ public static final native void gdk_threads_leave ();
+@@ -5218,7 +5218,7 @@ public static final native void gdk_threads_leave ();
/**
* @method flags=dynamic
*/
@@ -19470,7 +19497,7 @@ index 62bc7a8..eb1efa2 100644
public static final native int _gdk_unicode_to_keyval(int wc);
public static final int gdk_unicode_to_keyval(int wc) {
-@@ -5216,8 +5216,8 @@ public static final int gdk_unicode_to_keyval(int wc) {
+@@ -5229,8 +5229,8 @@ public static final int gdk_unicode_to_keyval(int wc) {
lock.unlock();
}
}
@@ -19481,7 +19508,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_visual_get_system();
-@@ -5229,8 +5229,8 @@ public static final int /*long*/ gdk_visual_get_system() {
+@@ -5242,8 +5242,8 @@ public static final int /*long*/ gdk_visual_get_system() {
* @param win_x cast=(gint *)
* @param win_y cast=(gint *)
*/
@@ -19492,7 +19519,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_window_at_pointer(win_x, win_y);
-@@ -5242,8 +5242,8 @@ public static final int /*long*/ gdk_window_at_pointer(int[] win_x, int[] win_y)
+@@ -5255,8 +5255,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
*/
@@ -19503,7 +19530,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_begin_paint_rect(window, rectangle);
-@@ -5252,8 +5252,8 @@ public static final void gdk_window_begin_paint_rect(int /*long*/ window, GdkRec
+@@ -5265,8 +5265,8 @@ public static final void gdk_window_begin_paint_rect(int /*long*/ window, GdkRec
}
}
/** @param window cast=(GdkWindow *) */
@@ -19514,7 +19541,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_clear_area(window, x, y, width, height);
-@@ -5265,8 +5265,8 @@ public static final void gdk_window_clear_area(int /*long*/ window, int x, int y
+@@ -5278,8 +5278,8 @@ public static final void gdk_window_clear_area(int /*long*/ window, int x, int y
* @method flags=dynamic
* @param window cast=(GdkWindow *)
*/
@@ -19525,7 +19552,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_window_create_similar_surface(window, content, width, height);
-@@ -5275,8 +5275,8 @@ public static final int /*long*/ gdk_window_create_similar_surface(int /*long*/
+@@ -5288,8 +5288,8 @@ public static final int /*long*/ gdk_window_create_similar_surface(int /*long*/
}
}
/** @param window cast=(GdkWindow *) */
@@ -19536,7 +19563,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_destroy(window);
-@@ -5285,8 +5285,8 @@ public static final void gdk_window_destroy(int /*long*/ window) {
+@@ -5298,8 +5298,8 @@ public static final void gdk_window_destroy(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19547,7 +19574,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_end_paint(window);
-@@ -5295,8 +5295,8 @@ public static final void gdk_window_end_paint(int /*long*/ window) {
+@@ -5308,8 +5308,8 @@ public static final void gdk_window_end_paint(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19558,7 +19585,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_window_get_children(window);
-@@ -5305,8 +5305,8 @@ public static final int /*long*/ gdk_window_get_children(int /*long*/ window) {
+@@ -5318,8 +5318,8 @@ public static final int /*long*/ gdk_window_get_children(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19569,7 +19596,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_window_get_events(window);
-@@ -5315,8 +5315,8 @@ public static final int gdk_window_get_events(int /*long*/ window) {
+@@ -5328,8 +5328,8 @@ public static final int gdk_window_get_events(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19580,7 +19607,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_focus(window, timestamp);
-@@ -5325,8 +5325,8 @@ public static final void gdk_window_focus(int /*long*/ window, int timestamp) {
+@@ -5338,8 +5338,8 @@ public static final void gdk_window_focus(int /*long*/ window, int timestamp) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19591,7 +19618,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_freeze_updates(window);
-@@ -5338,8 +5338,8 @@ public static final void gdk_window_freeze_updates(int /*long*/ window) {
+@@ -5351,8 +5351,8 @@ public static final void gdk_window_freeze_updates(int /*long*/ window) {
* @param window cast=(GdkWindow *)
* @param rect cast=(GdkRectangle *),flags=no_in
*/
@@ -19602,7 +19629,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_get_frame_extents(window, rect);
-@@ -5353,8 +5353,8 @@ public static final void gdk_window_get_frame_extents(int /*long*/ window, GdkRe
+@@ -5366,8 +5366,8 @@ public static final void gdk_window_get_frame_extents(int /*long*/ window, GdkRe
* @param x_offset cast=(gint *)
* @param y_offset cast=(gint *)
*/
@@ -19613,7 +19640,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_get_internal_paint_info(window, real_drawable, x_offset, y_offset);
-@@ -5367,8 +5367,8 @@ public static final void gdk_window_get_internal_paint_info(int /*long*/ window,
+@@ -5380,8 +5380,8 @@ public static final void gdk_window_get_internal_paint_info(int /*long*/ window,
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
@@ -19624,7 +19651,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_window_get_origin(window, x, y);
-@@ -5377,8 +5377,8 @@ public static final int gdk_window_get_origin(int /*long*/ window, int[] x, int[
+@@ -5390,8 +5390,8 @@ public static final int gdk_window_get_origin(int /*long*/ window, int[] x, int[
}
}
/** @param window cast=(GdkWindow *) */
@@ -19635,7 +19662,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_window_get_parent(window);
-@@ -5392,8 +5392,8 @@ public static final int /*long*/ gdk_window_get_parent(int /*long*/ window) {
+@@ -5405,8 +5405,8 @@ public static final int /*long*/ gdk_window_get_parent(int /*long*/ window) {
* @param y cast=(gint *)
* @param mask cast=(GdkModifierType *)
*/
@@ -19646,7 +19673,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_window_get_pointer(window, x, y, mask);
-@@ -5406,8 +5406,8 @@ public static final int /*long*/ gdk_window_get_pointer(int /*long*/ window, int
+@@ -5419,8 +5419,8 @@ public static final int /*long*/ gdk_window_get_pointer(int /*long*/ window, int
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
@@ -19657,7 +19684,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_get_position(window, x, y);
-@@ -5419,8 +5419,8 @@ public static final void gdk_window_get_position(int /*long*/ window, int[] x, i
+@@ -5432,8 +5432,8 @@ public static final void gdk_window_get_position(int /*long*/ window, int[] x, i
* @param window cast=(GdkWindow *)
* @param data cast=(gpointer *)
*/
@@ -19668,7 +19695,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_get_user_data(window, data);
-@@ -5429,8 +5429,8 @@ public static final void gdk_window_get_user_data(int /*long*/ window, int /*lon
+@@ -5442,8 +5442,8 @@ public static final void gdk_window_get_user_data(int /*long*/ window, int /*lon
}
}
/** @param window cast=(GdkWindow *) */
@@ -19679,7 +19706,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_hide(window);
-@@ -5443,8 +5443,8 @@ public static final void gdk_window_hide(int /*long*/ window) {
+@@ -5456,8 +5456,8 @@ public static final void gdk_window_hide(int /*long*/ window) {
* @param rectangle cast=(GdkRectangle *),flags=no_out
* @param invalidate_children cast=(gboolean)
*/
@@ -19690,7 +19717,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_invalidate_rect(window, rectangle, invalidate_children);
-@@ -5457,8 +5457,8 @@ public static final void gdk_window_invalidate_rect(int /*long*/ window, GdkRect
+@@ -5470,8 +5470,8 @@ public static final void gdk_window_invalidate_rect(int /*long*/ window, GdkRect
* @param region cast=(GdkRegion *)
* @param invalidate_children cast=(gboolean)
*/
@@ -19701,7 +19728,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_invalidate_region(window, region, invalidate_children);
-@@ -5467,8 +5467,8 @@ public static final void gdk_window_invalidate_region(int /*long*/ window, int /
+@@ -5480,8 +5480,8 @@ public static final void gdk_window_invalidate_region(int /*long*/ window, int /
}
}
/** @param window cast=(GdkWindow *) */
@@ -19712,7 +19739,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_window_is_visible(window);
-@@ -5477,8 +5477,8 @@ public static final boolean gdk_window_is_visible(int /*long*/ window) {
+@@ -5490,8 +5490,8 @@ public static final boolean gdk_window_is_visible(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19723,7 +19750,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_window_is_viewable (window);
-@@ -5487,8 +5487,8 @@ public static final boolean gdk_window_is_viewable (int /*long*/ window) {
+@@ -5500,8 +5500,8 @@ public static final boolean gdk_window_is_viewable (int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19734,7 +19761,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_move(window, x, y);
-@@ -5497,8 +5497,8 @@ public static final void gdk_window_move(int /*long*/ window, int x, int y) {
+@@ -5510,8 +5510,8 @@ public static final void gdk_window_move(int /*long*/ window, int x, int y) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19745,7 +19772,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_move_resize(window, x, y, width, height);
-@@ -5510,8 +5510,8 @@ public static final void gdk_window_move_resize(int /*long*/ window, int x, int
+@@ -5523,8 +5523,8 @@ public static final void gdk_window_move_resize(int /*long*/ window, int x, int
* @param parent cast=(GdkWindow *)
* @param attributes flags=no_out
*/
@@ -19756,7 +19783,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gdk_window_new(parent, attributes, attributes_mask);
-@@ -5520,8 +5520,8 @@ public static final int /*long*/ gdk_window_new(int /*long*/ parent, GdkWindowAt
+@@ -5533,8 +5533,8 @@ public static final int /*long*/ gdk_window_new(int /*long*/ parent, GdkWindowAt
}
}
/** @param window cast=(GdkWindow *) */
@@ -19767,7 +19794,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_lower(window);
-@@ -5542,8 +5542,8 @@ public static final void gdk_window_process_all_updates() {
+@@ -5555,8 +5555,8 @@ public static final void gdk_window_process_all_updates() {
* @param window cast=(GdkWindow *)
* @param update_children cast=(gboolean)
*/
@@ -19778,7 +19805,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_process_updates(window, update_children);
-@@ -5552,8 +5552,8 @@ public static final void gdk_window_process_updates(int /*long*/ window, boolean
+@@ -5565,8 +5565,8 @@ public static final void gdk_window_process_updates(int /*long*/ window, boolean
}
}
/** @param window cast=(GdkWindow *) */
@@ -19789,7 +19816,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_raise(window);
-@@ -5562,8 +5562,8 @@ public static final void gdk_window_raise(int /*long*/ window) {
+@@ -5575,8 +5575,8 @@ public static final void gdk_window_raise(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19800,7 +19827,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_resize(window, width, height);
-@@ -5577,8 +5577,8 @@ public static final void gdk_window_resize(int /*long*/ window, int width, int h
+@@ -5590,8 +5590,8 @@ public static final void gdk_window_resize(int /*long*/ window, int width, int h
* @param sibling cast=(GdkWindow *)
* @param above cast=(gboolean)
*/
@@ -19811,7 +19838,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_restack(window, sibling, above);
-@@ -5587,8 +5587,8 @@ public static final void gdk_window_restack(int /*long*/ window, int /*long*/ si
+@@ -5600,8 +5600,8 @@ public static final void gdk_window_restack(int /*long*/ window, int /*long*/ si
}
}
/** @param window cast=(GdkWindow *) */
@@ -19822,7 +19849,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_scroll(window, dx, dy);
-@@ -5601,8 +5601,8 @@ public static final void gdk_window_scroll(int /*long*/ window, int dx, int dy)
+@@ -5614,8 +5614,8 @@ public static final void gdk_window_scroll(int /*long*/ window, int dx, int dy)
* @param window cast=(GdkWindow *)
* @param accept_focus cast=(gboolean)
*/
@@ -19833,7 +19860,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_set_accept_focus(window, accept_focus);
-@@ -5615,8 +5615,8 @@ public static final void gdk_window_set_accept_focus(int /*long*/ window, boolea
+@@ -5628,8 +5628,8 @@ public static final void gdk_window_set_accept_focus(int /*long*/ window, boolea
* @param pixmap cast=(GdkPixmap *)
* @param parent_relative cast=(gboolean)
*/
@@ -19844,7 +19871,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_set_back_pixmap(window, pixmap, parent_relative);
-@@ -5628,8 +5628,8 @@ public static final void gdk_window_set_back_pixmap(int /*long*/ window, int /*l
+@@ -5641,8 +5641,8 @@ public static final void gdk_window_set_back_pixmap(int /*long*/ window, int /*l
* @param window cast=(GdkWindow *)
* @param cursor cast=(GdkCursor *)
*/
@@ -19855,7 +19882,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_set_cursor(window, cursor);
-@@ -5651,8 +5651,8 @@ public static final void gdk_window_set_debug_updates(boolean setting) {
+@@ -5664,8 +5664,8 @@ public static final void gdk_window_set_debug_updates(boolean setting) {
* @param window cast=(GdkWindow *)
* @param decorations cast=(GdkWMDecoration)
*/
@@ -19866,7 +19893,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_set_decorations(window, decorations);
-@@ -5661,8 +5661,8 @@ public static final void gdk_window_set_decorations(int /*long*/ window, int dec
+@@ -5674,8 +5674,8 @@ public static final void gdk_window_set_decorations(int /*long*/ window, int dec
}
}
/** @param window cast=(GdkWindow *) */
@@ -19877,7 +19904,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_set_events(window, event_mask);
-@@ -5676,8 +5676,8 @@ public static final void gdk_window_set_events(int /*long*/ window, int event_ma
+@@ -5689,8 +5689,8 @@ public static final void gdk_window_set_events(int /*long*/ window, int event_ma
* @param pixmap cast=(GdkPixmap *)
* @param mask cast=(GdkBitmap *)
*/
@@ -19888,7 +19915,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_set_icon(window, icon_window, pixmap, mask);
-@@ -5689,8 +5689,8 @@ public static final void gdk_window_set_icon(int /*long*/ window, int /*long*/ i
+@@ -5702,8 +5702,8 @@ public static final void gdk_window_set_icon(int /*long*/ window, int /*long*/ i
* @param window cast=(GdkWindow *)
* @param pixbufs cast=(GList *)
*/
@@ -19899,7 +19926,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_set_icon_list(window, pixbufs);
-@@ -5703,8 +5703,8 @@ public static final void gdk_window_set_icon_list(int /*long*/ window, int /*lon
+@@ -5716,8 +5716,8 @@ public static final void gdk_window_set_icon_list(int /*long*/ window, int /*lon
* @param window cast=(GdkWindow *)
* @param setting cast=(gboolean)
*/
@@ -19910,7 +19937,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_set_keep_above(window, setting);
-@@ -5716,8 +5716,8 @@ public static final void gdk_window_set_keep_above(int /*long*/ window, boolean
+@@ -5729,8 +5729,8 @@ public static final void gdk_window_set_keep_above(int /*long*/ window, boolean
* @param window cast=(GdkWindow *)
* @param override_redirect cast=(gboolean)
*/
@@ -19921,7 +19948,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_set_override_redirect(window, override_redirect);
-@@ -5729,8 +5729,8 @@ public static final void gdk_window_set_override_redirect(int /*long*/ window, b
+@@ -5742,8 +5742,8 @@ public static final void gdk_window_set_override_redirect(int /*long*/ window, b
* @param window cast=(GdkWindow *)
* @param user_data cast=(gpointer)
*/
@@ -19932,7 +19959,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_set_user_data(window, user_data);
-@@ -5742,8 +5742,8 @@ public static final void gdk_window_set_user_data(int /*long*/ window, int /*lon
+@@ -5755,8 +5755,8 @@ public static final void gdk_window_set_user_data(int /*long*/ window, int /*lon
* @param window cast=(GdkWindow *)
* @param shape_region cast=(GdkRegion *)
*/
@@ -19943,7 +19970,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_shape_combine_region(window, shape_region, offset_x, offset_y);
-@@ -5752,8 +5752,8 @@ public static final void gdk_window_shape_combine_region (int /*long*/ window, i
+@@ -5765,8 +5765,8 @@ public static final void gdk_window_shape_combine_region (int /*long*/ window, i
}
}
/** @param window cast=(GdkWindow *) */
@@ -19954,7 +19981,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_show(window);
-@@ -5762,8 +5762,8 @@ public static final void gdk_window_show(int /*long*/ window) {
+@@ -5775,8 +5775,8 @@ public static final void gdk_window_show(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19965,7 +19992,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_show_unraised(window);
-@@ -5772,8 +5772,8 @@ public static final void gdk_window_show_unraised(int /*long*/ window) {
+@@ -5785,8 +5785,8 @@ public static final void gdk_window_show_unraised(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
@@ -19976,7 +20003,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gdk_window_thaw_updates(window);
-@@ -5795,8 +5795,8 @@ public static final int gtk_accelerator_get_default_mod_mask() {
+@@ -5808,8 +5808,8 @@ public static final int gtk_accelerator_get_default_mod_mask() {
* @param accelerator_key cast=(guint *)
* @param accelerator_mods cast=(GdkModifierType *)
*/
@@ -19987,7 +20014,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_accelerator_parse(accelerator, accelerator_key, accelerator_mods);
-@@ -5804,8 +5804,8 @@ public static final void gtk_accelerator_parse(int /*long*/ accelerator, int []
+@@ -5817,8 +5817,8 @@ public static final void gtk_accelerator_parse(int /*long*/ accelerator, int []
lock.unlock();
}
}
@@ -19998,7 +20025,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_accel_group_new();
-@@ -5818,8 +5818,8 @@ public static final int /*long*/ gtk_accel_group_new() {
+@@ -5831,8 +5831,8 @@ public static final int /*long*/ gtk_accel_group_new() {
* @param accelKey cast=(guint)
* @param accelMods cast=(GdkModifierType)
*/
@@ -20009,7 +20036,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_accel_groups_activate(accelGroup, accelKey, accelMods);
-@@ -5831,8 +5831,8 @@ public static final boolean gtk_accel_groups_activate(int /*long*/ accelGroup, i
+@@ -5844,8 +5844,8 @@ public static final boolean gtk_accel_groups_activate(int /*long*/ accelGroup, i
* @param accel_label cast=(GtkAccelLabel *)
* @param accel_widget cast=(GtkWidget *)
*/
@@ -20020,7 +20047,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_accel_label_set_accel_widget(accel_label, accel_widget);
-@@ -5841,8 +5841,8 @@ public static final void gtk_accel_label_set_accel_widget(int /*long*/ accel_lab
+@@ -5854,8 +5854,8 @@ public static final void gtk_accel_label_set_accel_widget(int /*long*/ accel_lab
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -20031,7 +20058,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_adjustment_changed(adjustment);
-@@ -5857,8 +5857,8 @@ public static final void gtk_adjustment_changed(int /*long*/ adjustment) {
+@@ -5870,8 +5870,8 @@ public static final void gtk_adjustment_changed(int /*long*/ adjustment) {
* @param step_increment cast=(gdouble)
* @param page_increment cast=(gdouble)
*/
@@ -20042,7 +20069,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_adjustment_new(value, lower, upper, step_increment, page_increment, page_size);
-@@ -5870,8 +5870,8 @@ public static final int /*long*/ gtk_adjustment_new(double value, double lower,
+@@ -5883,8 +5883,8 @@ public static final int /*long*/ gtk_adjustment_new(double value, double lower,
* @param adjustment cast=(GtkAdjustment *)
* @param value cast=(gdouble)
*/
@@ -20053,7 +20080,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_adjustment_set_value(adjustment, value);
-@@ -5880,8 +5880,8 @@ public static final void gtk_adjustment_set_value(int /*long*/ adjustment, doubl
+@@ -5893,8 +5893,8 @@ public static final void gtk_adjustment_set_value(int /*long*/ adjustment, doubl
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -20064,7 +20091,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_adjustment_value_changed(adjustment);
-@@ -5893,8 +5893,8 @@ public static final void gtk_adjustment_value_changed(int /*long*/ adjustment) {
+@@ -5906,8 +5906,8 @@ public static final void gtk_adjustment_value_changed(int /*long*/ adjustment) {
* @param arrow_type cast=(GtkArrowType)
* @param shadow_type cast=(GtkShadowType)
*/
@@ -20075,7 +20102,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_arrow_new(arrow_type, shadow_type);
-@@ -5907,8 +5907,8 @@ public static final int /*long*/ gtk_arrow_new(int arrow_type, int shadow_type)
+@@ -5920,8 +5920,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)
*/
@@ -20086,7 +20113,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_arrow_set(arrow, arrow_type, shadow_type);
-@@ -5917,8 +5917,8 @@ public static final void gtk_arrow_set(int /*long*/ arrow, int arrow_type, int s
+@@ -5930,8 +5930,8 @@ public static final void gtk_arrow_set(int /*long*/ arrow, int arrow_type, int s
}
}
/** @param bin cast=(GtkBin *) */
@@ -20097,7 +20124,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_bin_get_child(bin);
-@@ -5927,8 +5927,8 @@ public static final int /*long*/ gtk_bin_get_child(int /*long*/ bin) {
+@@ -5940,8 +5940,8 @@ public static final int /*long*/ gtk_bin_get_child(int /*long*/ bin) {
}
}
/** @param border cast=(GtkBorder *) */
@@ -20108,7 +20135,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_border_free(border);
-@@ -5937,8 +5937,8 @@ public static final void gtk_border_free(int /*long*/ border) {
+@@ -5950,8 +5950,8 @@ public static final void gtk_border_free(int /*long*/ border) {
}
}
/** @param box cast=(GtkBox *) */
@@ -20119,7 +20146,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_box_set_spacing(box, spacing);
-@@ -5950,8 +5950,8 @@ public static final void gtk_box_set_spacing(int /*long*/ box, int spacing) {
+@@ -5963,8 +5963,8 @@ public static final void gtk_box_set_spacing(int /*long*/ box, int spacing) {
* @param box cast=(GtkBox *)
* @param child cast=(GtkWidget *)
*/
@@ -20130,7 +20157,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_box_set_child_packing(box, child, expand, fill, padding, pack_type);
-@@ -5960,8 +5960,8 @@ public static final void gtk_box_set_child_packing(int /*long*/ box, int /*long*
+@@ -5973,8 +5973,8 @@ public static final void gtk_box_set_child_packing(int /*long*/ box, int /*long*
}
}
/** @param button cast=(GtkButton *) */
@@ -20141,7 +20168,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_button_clicked(button);
-@@ -5970,8 +5970,8 @@ public static final void gtk_button_clicked(int /*long*/ button) {
+@@ -5983,8 +5983,8 @@ public static final void gtk_button_clicked(int /*long*/ button) {
}
}
/** @param button cast=(GtkButton *) */
@@ -20152,7 +20179,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_button_get_relief(button);
-@@ -5979,8 +5979,8 @@ public static final int gtk_button_get_relief(int /*long*/ button) {
+@@ -5992,8 +5992,8 @@ public static final int gtk_button_get_relief(int /*long*/ button) {
lock.unlock();
}
}
@@ -20163,7 +20190,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_button_new();
-@@ -5992,8 +5992,8 @@ public static final int /*long*/ gtk_button_new() {
+@@ -6005,8 +6005,8 @@ public static final int /*long*/ gtk_button_new() {
* @param button cast=(GtkButton *)
* @param newstyle cast=(GtkReliefStyle)
*/
@@ -20174,7 +20201,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_button_set_relief(button, newstyle);
-@@ -6002,8 +6002,8 @@ public static final void gtk_button_set_relief(int /*long*/ button, int newstyle
+@@ -6015,8 +6015,8 @@ public static final void gtk_button_set_relief(int /*long*/ button, int newstyle
}
}
/** @method flags=dynamic */
@@ -20185,7 +20212,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_calendar_new();
-@@ -6017,8 +6017,8 @@ public static final int /*long*/ gtk_calendar_new() {
+@@ -6030,8 +6030,8 @@ public static final int /*long*/ gtk_calendar_new() {
* @param month cast=(guint)
* @param year cast=(guint)
*/
@@ -20196,7 +20223,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_calendar_select_month(calendar, month, year);
-@@ -6031,8 +6031,8 @@ public static final boolean /*long*/ gtk_calendar_select_month(int /*long*/ cale
+@@ -6044,8 +6044,8 @@ public static final boolean /*long*/ gtk_calendar_select_month(int /*long*/ cale
* @param calendar cast=(GtkCalendar *)
* @param day cast=(guint)
*/
@@ -20207,7 +20234,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_calendar_select_day(calendar, day);
-@@ -6045,8 +6045,8 @@ public static final void gtk_calendar_select_day(int /*long*/ calendar, int day)
+@@ -6058,8 +6058,8 @@ public static final void gtk_calendar_select_day(int /*long*/ calendar, int day)
* @param calendar cast=(GtkCalendar *)
* @param day cast=(guint)
*/
@@ -20218,7 +20245,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_calendar_mark_day(calendar, day);
-@@ -6058,8 +6058,8 @@ public static final void gtk_calendar_mark_day(int /*long*/ calendar, int day) {
+@@ -6071,8 +6071,8 @@ public static final void gtk_calendar_mark_day(int /*long*/ calendar, int day) {
* @method flags=dynamic
* @param calendar cast=(GtkCalendar *)
*/
@@ -20229,7 +20256,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_calendar_clear_marks(calendar);
-@@ -6072,8 +6072,8 @@ public static final void gtk_calendar_clear_marks(int /*long*/ calendar) {
+@@ -6085,8 +6085,8 @@ public static final void gtk_calendar_clear_marks(int /*long*/ calendar) {
* @param calendar cast=(GtkCalendar *)
* @param flags cast=(GtkCalendarDisplayOptions)
*/
@@ -20240,7 +20267,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_calendar_set_display_options(calendar, flags);
-@@ -6088,8 +6088,8 @@ public static final void gtk_calendar_set_display_options(int /*long*/ calendar,
+@@ -6101,8 +6101,8 @@ public static final void gtk_calendar_set_display_options(int /*long*/ calendar,
* @param month cast=(guint *)
* @param day cast=(guint *)
*/
@@ -20251,7 +20278,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_calendar_get_date(calendar, year, month, day);
-@@ -6098,8 +6098,8 @@ public static final void gtk_calendar_get_date(int /*long*/ calendar, int[] year
+@@ -6111,8 +6111,8 @@ public static final void gtk_calendar_get_date(int /*long*/ calendar, int[] year
}
}
/** @method flags=dynamic */
@@ -20262,7 +20289,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_cell_layout_clear(cell_layout);
-@@ -6108,8 +6108,8 @@ public static final void gtk_cell_layout_clear(int /*long*/ cell_layout) {
+@@ -6121,8 +6121,8 @@ public static final void gtk_cell_layout_clear(int /*long*/ cell_layout) {
}
}
/** @method flags=dynamic */
@@ -20273,7 +20300,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_cell_layout_get_cells(cell_layout);
-@@ -6118,8 +6118,8 @@ public static final int /*long*/ gtk_cell_layout_get_cells(int /*long*/ cell_lay
+@@ -6131,8 +6131,8 @@ public static final int /*long*/ gtk_cell_layout_get_cells(int /*long*/ cell_lay
}
}
/** @method flags=no_gen */
@@ -20284,7 +20311,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_cell_layout_set_attributes(cell_layout, cell, attribute, column, sentinel);
-@@ -6128,8 +6128,8 @@ public static final void gtk_cell_layout_set_attributes(int /*long*/ cell_layout
+@@ -6141,8 +6141,8 @@ public static final void gtk_cell_layout_set_attributes(int /*long*/ cell_layout
}
}
/** @method flags=dynamic */
@@ -20295,7 +20322,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_cell_layout_pack_start(cell_layout, cell, expand);
-@@ -6146,8 +6146,8 @@ public static final void gtk_cell_layout_pack_start(int /*long*/ cell_layout, in
+@@ -6159,8 +6159,8 @@ public static final void gtk_cell_layout_pack_start(int /*long*/ cell_layout, in
* @param width cast=(gint *)
* @param height cast=(gint *)
*/
@@ -20306,7 +20333,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_cell_renderer_get_size(cell, widget, area, x_offset, y_offset, width, height);
-@@ -6155,8 +6155,8 @@ public static final void gtk_cell_renderer_get_size(int /*long*/ cell, int /*lon
+@@ -6168,8 +6168,8 @@ public static final void gtk_cell_renderer_get_size(int /*long*/ cell, int /*lon
lock.unlock();
}
}
@@ -20317,7 +20344,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_cell_renderer_pixbuf_new();
-@@ -6164,8 +6164,8 @@ public static final int /*long*/ gtk_cell_renderer_pixbuf_new() {
+@@ -6177,8 +6177,8 @@ public static final int /*long*/ gtk_cell_renderer_pixbuf_new() {
lock.unlock();
}
}
@@ -20328,7 +20355,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_cell_renderer_text_new();
-@@ -6173,8 +6173,8 @@ public static final int /*long*/ gtk_cell_renderer_text_new() {
+@@ -6186,8 +6186,8 @@ public static final int /*long*/ gtk_cell_renderer_text_new() {
lock.unlock();
}
}
@@ -20339,7 +20366,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_cell_renderer_toggle_new();
-@@ -6182,8 +6182,8 @@ public static final int /*long*/ gtk_cell_renderer_toggle_new() {
+@@ -6195,8 +6195,8 @@ public static final int /*long*/ gtk_cell_renderer_toggle_new() {
lock.unlock();
}
}
@@ -20350,7 +20377,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_check_button_new();
-@@ -6192,8 +6192,8 @@ public static final int /*long*/ gtk_check_button_new() {
+@@ -6205,8 +6205,8 @@ public static final int /*long*/ gtk_check_button_new() {
}
}
/** @param check_menu_item cast=(GtkCheckMenuItem *) */
@@ -20361,7 +20388,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_check_menu_item_get_active(check_menu_item);
-@@ -6202,8 +6202,8 @@ public static final boolean gtk_check_menu_item_get_active(int /*long*/ check_me
+@@ -6215,8 +6215,8 @@ public static final boolean gtk_check_menu_item_get_active(int /*long*/ check_me
}
}
/** @param label cast=(const gchar *) */
@@ -20372,7 +20399,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_check_menu_item_new_with_label(label);
-@@ -6215,8 +6215,8 @@ public static final int /*long*/ gtk_check_menu_item_new_with_label(byte[] label
+@@ -6228,8 +6228,8 @@ public static final int /*long*/ gtk_check_menu_item_new_with_label(byte[] label
* @param wid cast=(GtkCheckMenuItem *)
* @param active cast=(gboolean)
*/
@@ -20383,7 +20410,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_check_menu_item_set_active(wid, active);
-@@ -6224,8 +6224,8 @@ public static final void gtk_check_menu_item_set_active(int /*long*/ wid, boolea
+@@ -6237,8 +6237,8 @@ public static final void gtk_check_menu_item_set_active(int /*long*/ wid, boolea
lock.unlock();
}
}
@@ -20394,7 +20421,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_check_version(required_major, required_minor, required_micro);
-@@ -6234,8 +6234,8 @@ public static final int /*long*/ gtk_check_version(int required_major, int requi
+@@ -6247,8 +6247,8 @@ public static final int /*long*/ gtk_check_version(int required_major, int requi
}
}
/** @param clipboard cast=(GtkClipboard *) */
@@ -20405,7 +20432,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_clipboard_clear(clipboard);
-@@ -6244,8 +6244,8 @@ public static final void gtk_clipboard_clear(int /*long*/ clipboard) {
+@@ -6257,8 +6257,8 @@ public static final void gtk_clipboard_clear(int /*long*/ clipboard) {
}
}
/** @param selection cast=(GdkAtom) */
@@ -20416,7 +20443,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_clipboard_get(selection);
-@@ -6261,8 +6261,8 @@ public static final int /*long*/ gtk_clipboard_get(int /*long*/ selection) {
+@@ -6274,8 +6274,8 @@ public static final int /*long*/ gtk_clipboard_get(int /*long*/ selection) {
* @param clear_func cast=(GtkClipboardClearFunc)
* @param user_data cast=(GObject *)
*/
@@ -20427,7 +20454,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_clipboard_set_with_data(clipboard, target, n_targets, get_func, clear_func, user_data);
-@@ -6278,8 +6278,8 @@ public static final boolean gtk_clipboard_set_with_data(int /*long*/ clipboard,
+@@ -6291,8 +6291,8 @@ public static final boolean gtk_clipboard_set_with_data(int /*long*/ clipboard,
* @param clear_func cast=(GtkClipboardClearFunc)
* @param user_data cast=(GObject *)
*/
@@ -20438,7 +20465,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_clipboard_set_with_owner(clipboard, target, n_targets, get_func, clear_func, user_data);
-@@ -6293,8 +6293,8 @@ public static final boolean gtk_clipboard_set_with_owner(int /*long*/ clipboard,
+@@ -6306,8 +6306,8 @@ public static final boolean gtk_clipboard_set_with_owner(int /*long*/ clipboard,
* @param targets cast=(const GtkTargetEntry *)
* @param n_targets cast=(gint)
*/
@@ -20449,7 +20476,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_clipboard_set_can_store(clipboard, targets, n_targets);
-@@ -6306,8 +6306,8 @@ public static final void gtk_clipboard_set_can_store(int /*long*/ clipboard, int
+@@ -6319,8 +6319,8 @@ public static final void gtk_clipboard_set_can_store(int /*long*/ clipboard, int
* @method flags=dynamic
* @param clipboard cast=(GtkClipboard *)
*/
@@ -20460,7 +20487,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_clipboard_store(clipboard);
-@@ -6319,8 +6319,8 @@ public static final void gtk_clipboard_store(int /*long*/ clipboard) {
+@@ -6332,8 +6332,8 @@ public static final void gtk_clipboard_store(int /*long*/ clipboard) {
* @param clipboard cast=(GtkClipboard *)
* @param target cast=(GdkAtom)
*/
@@ -20471,7 +20498,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_clipboard_wait_for_contents(clipboard, target);
-@@ -6329,8 +6329,8 @@ public static final int /*long*/ gtk_clipboard_wait_for_contents(int /*long*/ cl
+@@ -6342,8 +6342,8 @@ public static final int /*long*/ gtk_clipboard_wait_for_contents(int /*long*/ cl
}
}
/** @param title cast=(const gchar *) */
@@ -20482,7 +20509,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_color_selection_dialog_new(title);
-@@ -6342,8 +6342,8 @@ public static final int /*long*/ gtk_color_selection_dialog_new(byte[] title) {
+@@ -6355,8 +6355,8 @@ public static final int /*long*/ gtk_color_selection_dialog_new(byte[] title) {
* @param colorsel cast=(GtkColorSelection *)
* @param color cast=(GdkColor *),flags=no_in
*/
@@ -20493,7 +20520,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_color_selection_get_current_color(colorsel, color);
-@@ -6356,8 +6356,8 @@ public static final void gtk_color_selection_get_current_color(int /*long*/ colo
+@@ -6369,8 +6369,8 @@ public static final void gtk_color_selection_get_current_color(int /*long*/ colo
* @param colors cast=(GdkColor **)
* @param n_colors cast=(gint *)
*/
@@ -20504,7 +20531,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_color_selection_palette_from_string(str, colors, n_colors);
-@@ -6369,8 +6369,8 @@ public static final void gtk_color_selection_palette_from_string(byte[] str, int
+@@ -6382,8 +6382,8 @@ public static final void gtk_color_selection_palette_from_string(byte[] str, int
* @param colors cast=(GdkColor *)
* @param n_colors cast=(gint)
*/
@@ -20515,7 +20542,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_color_selection_palette_to_string(colors, n_colors);
-@@ -6382,8 +6382,8 @@ public static final int /*long*/ gtk_color_selection_palette_to_string(int /*lon
+@@ -6395,8 +6395,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
*/
@@ -20526,7 +20553,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_color_selection_set_current_color(colorsel, color);
-@@ -6392,8 +6392,8 @@ public static final void gtk_color_selection_set_current_color(int /*long*/ colo
+@@ -6405,8 +6405,8 @@ public static final void gtk_color_selection_set_current_color(int /*long*/ colo
}
}
/** @param colorsel cast=(GtkColorSelection *) */
@@ -20537,7 +20564,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_color_selection_set_has_palette(colorsel, has_palette);
-@@ -6402,8 +6402,8 @@ public static final void gtk_color_selection_set_has_palette(int /*long*/ colors
+@@ -6415,8 +6415,8 @@ public static final void gtk_color_selection_set_has_palette(int /*long*/ colors
}
}
/** @method flags=dynamic */
@@ -20548,7 +20575,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_combo_box_set_focus_on_click(combo, val);
-@@ -6412,8 +6412,8 @@ public static final void gtk_combo_box_set_focus_on_click(int /*long*/ combo, bo
+@@ -6425,8 +6425,8 @@ public static final void gtk_combo_box_set_focus_on_click(int /*long*/ combo, bo
}
}
/** @method flags=dynamic */
@@ -20559,7 +20586,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_combo_box_entry_new_text();
-@@ -6422,8 +6422,8 @@ public static final int /*long*/ gtk_combo_box_entry_new_text() {
+@@ -6435,8 +6435,8 @@ public static final int /*long*/ gtk_combo_box_entry_new_text() {
}
}
/** @method flags=dynamic */
@@ -20570,7 +20597,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_combo_box_new_text();
-@@ -6432,8 +6432,8 @@ public static final int /*long*/ gtk_combo_box_new_text() {
+@@ -6445,8 +6445,8 @@ public static final int /*long*/ gtk_combo_box_new_text() {
}
}
/** @method flags=dynamic */
@@ -20581,7 +20608,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_combo_box_insert_text(combo_box, position, text);
-@@ -6442,8 +6442,8 @@ public static final void gtk_combo_box_insert_text(int /*long*/ combo_box, int p
+@@ -6455,8 +6455,8 @@ public static final void gtk_combo_box_insert_text(int /*long*/ combo_box, int p
}
}
/** @method flags=dynamic */
@@ -20592,7 +20619,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_combo_box_remove_text(combo_box, position);
-@@ -6452,8 +6452,8 @@ public static final void gtk_combo_box_remove_text(int /*long*/ combo_box, int p
+@@ -6465,8 +6465,8 @@ public static final void gtk_combo_box_remove_text(int /*long*/ combo_box, int p
}
}
/** @method flags=dynamic */
@@ -20603,7 +20630,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_combo_box_get_active(combo_box);
-@@ -6462,8 +6462,8 @@ public static final int gtk_combo_box_get_active(int /*long*/ combo_box) {
+@@ -6475,8 +6475,8 @@ public static final int gtk_combo_box_get_active(int /*long*/ combo_box) {
}
}
/** @method flags=dynamic */
@@ -20614,7 +20641,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_combo_box_get_model(combo_box);
-@@ -6472,8 +6472,8 @@ public static final int /*long*/ gtk_combo_box_get_model(int /*long*/ combo_box)
+@@ -6485,8 +6485,8 @@ public static final int /*long*/ gtk_combo_box_get_model(int /*long*/ combo_box)
}
}
/** @method flags=dynamic */
@@ -20625,7 +20652,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_combo_box_set_active(combo_box, index);
-@@ -6482,8 +6482,8 @@ public static final void gtk_combo_box_set_active(int /*long*/ combo_box, int in
+@@ -6495,8 +6495,8 @@ public static final void gtk_combo_box_set_active(int /*long*/ combo_box, int in
}
}
/** @method flags=dynamic */
@@ -20636,7 +20663,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_combo_box_popup(combo_box);
-@@ -6492,8 +6492,8 @@ public static final void gtk_combo_box_popup(int /*long*/ combo_box) {
+@@ -6505,8 +6505,8 @@ public static final void gtk_combo_box_popup(int /*long*/ combo_box) {
}
}
/** @method flags=dynamic */
@@ -20647,7 +20674,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_combo_box_popdown(combo_box);
-@@ -6505,8 +6505,8 @@ public static final void gtk_combo_box_popdown(int /*long*/ combo_box) {
+@@ -6518,8 +6518,8 @@ public static final void gtk_combo_box_popdown(int /*long*/ combo_box) {
* @param container cast=(GtkContainer *)
* @param widget cast=(GtkWidget *)
*/
@@ -20658,7 +20685,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_container_add(container, widget);
-@@ -6519,8 +6519,8 @@ public static final void gtk_container_add(int /*long*/ container, int /*long*/
+@@ -6532,8 +6532,8 @@ public static final void gtk_container_add(int /*long*/ container, int /*long*/
* @param callback cast=(GtkCallback)
* @param callback_data cast=(gpointer)
*/
@@ -20669,7 +20696,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_container_forall(container, callback, callback_data);
-@@ -6529,8 +6529,8 @@ public static final void gtk_container_forall(int /*long*/ container, int /*long
+@@ -6542,8 +6542,8 @@ public static final void gtk_container_forall(int /*long*/ container, int /*long
}
}
/** @param container cast=(GtkContainer *) */
@@ -20680,7 +20707,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_container_get_border_width(container);
-@@ -6539,8 +6539,8 @@ public static final int gtk_container_get_border_width(int /*long*/ container) {
+@@ -6552,8 +6552,8 @@ public static final int gtk_container_get_border_width(int /*long*/ container) {
}
}
/** @param container cast=(GtkContainer *) */
@@ -20691,7 +20718,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_container_get_children(container);
-@@ -6552,8 +6552,8 @@ public static final int /*long*/ gtk_container_get_children(int /*long*/ contain
+@@ -6565,8 +6565,8 @@ public static final int /*long*/ gtk_container_get_children(int /*long*/ contain
* @param container cast=(GtkContainer *)
* @param widget cast=(GtkWidget *)
*/
@@ -20702,7 +20729,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_container_remove(container, widget);
-@@ -6562,8 +6562,8 @@ public static final void gtk_container_remove(int /*long*/ container, int /*long
+@@ -6575,8 +6575,8 @@ public static final void gtk_container_remove(int /*long*/ container, int /*long
}
}
/** @param container cast=(GtkContainer *) */
@@ -20713,7 +20740,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_container_resize_children(container);
-@@ -6575,8 +6575,8 @@ public static final void gtk_container_resize_children(int /*long*/ container) {
+@@ -6588,8 +6588,8 @@ public static final void gtk_container_resize_children(int /*long*/ container) {
* @param container cast=(GtkContainer *)
* @param border_width cast=(guint)
*/
@@ -20724,7 +20751,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_container_set_border_width(container, border_width);
-@@ -6589,8 +6589,8 @@ public static final void gtk_container_set_border_width(int /*long*/ container,
+@@ -6602,8 +6602,8 @@ public static final void gtk_container_set_border_width(int /*long*/ container,
* @param button_text cast=(const gchar *)
* @param response_id cast=(gint)
*/
@@ -20735,7 +20762,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_dialog_add_button(dialog, button_text, response_id);
-@@ -6599,8 +6599,8 @@ public static final int /*long*/ gtk_dialog_add_button(int /*long*/ dialog, byte
+@@ -6612,8 +6612,8 @@ public static final int /*long*/ gtk_dialog_add_button(int /*long*/ dialog, byte
}
}
/** @param dialog cast=(GtkDialog *) */
@@ -20746,7 +20773,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_dialog_run(dialog);
-@@ -6615,8 +6615,8 @@ public static final int gtk_dialog_run(int /*long*/ dialog) {
+@@ -6628,8 +6628,8 @@ public static final int gtk_dialog_run(int /*long*/ dialog) {
* @param button cast=(gint)
* @param event cast=(GdkEvent *)
*/
@@ -20757,7 +20784,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_drag_begin(widget, targets, actions, button, event);
-@@ -6631,8 +6631,8 @@ public static final int /*long*/ gtk_drag_begin(int /*long*/ widget, int /*long*
+@@ -6644,8 +6644,8 @@ public static final int /*long*/ gtk_drag_begin(int /*long*/ widget, int /*long*
* @param current_x cast=(gint)
* @param current_y cast=(gint)
*/
@@ -20768,7 +20795,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_drag_check_threshold(widget, start_x, start_y, current_x, current_y);
-@@ -6645,8 +6645,8 @@ public static final boolean gtk_drag_check_threshold(int /*long*/ widget, int st
+@@ -6658,8 +6658,8 @@ public static final boolean gtk_drag_check_threshold(int /*long*/ widget, int st
* @param context cast=(GdkDragContext *)
* @param target_list cast=(GtkTargetList *)
*/
@@ -20779,7 +20806,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_drag_dest_find_target(widget, context, target_list);
-@@ -6661,8 +6661,8 @@ public static final int /*long*/ gtk_drag_dest_find_target(int /*long*/ widget,
+@@ -6674,8 +6674,8 @@ public static final int /*long*/ gtk_drag_dest_find_target(int /*long*/ widget,
* @param n_targets cast=(gint)
* @param actions cast=(GdkDragAction)
*/
@@ -20790,7 +20817,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_drag_dest_set(widget, flags, targets, n_targets, actions);
-@@ -6671,8 +6671,8 @@ public static final void gtk_drag_dest_set(int /*long*/ widget, int flags, int /
+@@ -6684,8 +6684,8 @@ public static final void gtk_drag_dest_set(int /*long*/ widget, int flags, int /
}
}
/** @param widget cast=(GtkWidget *) */
@@ -20801,7 +20828,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_drag_dest_unset(widget);
-@@ -6686,8 +6686,8 @@ public static final void gtk_drag_dest_unset(int /*long*/ widget) {
+@@ -6699,8 +6699,8 @@ public static final void gtk_drag_dest_unset(int /*long*/ widget) {
* @param delete cast=(gboolean)
* @param time cast=(guint32)
*/
@@ -20812,7 +20839,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_drag_finish(context, success, delete, time);
-@@ -6701,8 +6701,8 @@ public static final void gtk_drag_finish(int /*long*/ context, boolean success,
+@@ -6714,8 +6714,8 @@ public static final void gtk_drag_finish(int /*long*/ context, boolean success,
* @param target cast=(GdkAtom)
* @param time cast=(guint32)
*/
@@ -20823,7 +20850,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_drag_get_data(widget, context, target, time);
-@@ -6714,8 +6714,8 @@ public static final void gtk_drag_get_data(int /*long*/ widget, int /*long*/ con
+@@ -6727,8 +6727,8 @@ public static final void gtk_drag_get_data(int /*long*/ widget, int /*long*/ con
* @param context cast=(GdkDragContext *)
* @param pixbuf cast=(GdkPixbuf *)
*/
@@ -20834,7 +20861,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_drag_set_icon_pixbuf(context, pixbuf, hot_x, hot_y);
-@@ -6723,8 +6723,8 @@ public static final void gtk_drag_set_icon_pixbuf(int /*long*/ context, int /*lo
+@@ -6736,8 +6736,8 @@ public static final void gtk_drag_set_icon_pixbuf(int /*long*/ context, int /*lo
lock.unlock();
}
}
@@ -20845,7 +20872,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_drawing_area_new();
-@@ -6733,8 +6733,8 @@ public static final int /*long*/ gtk_drawing_area_new() {
+@@ -6746,8 +6746,8 @@ public static final int /*long*/ gtk_drawing_area_new() {
}
}
/** @param editable cast=(GtkEditable *) */
@@ -20856,7 +20883,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_editable_copy_clipboard(editable);
-@@ -6743,8 +6743,8 @@ public static final void gtk_editable_copy_clipboard(int /*long*/ editable) {
+@@ -6756,8 +6756,8 @@ public static final void gtk_editable_copy_clipboard(int /*long*/ editable) {
}
}
/** @param editable cast=(GtkEditable *) */
@@ -20867,7 +20894,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_editable_cut_clipboard(editable);
-@@ -6753,8 +6753,8 @@ public static final void gtk_editable_cut_clipboard(int /*long*/ editable) {
+@@ -6766,8 +6766,8 @@ public static final void gtk_editable_cut_clipboard(int /*long*/ editable) {
}
}
/** @param editable cast=(GtkEditable *) */
@@ -20878,7 +20905,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_editable_delete_selection(editable);
-@@ -6767,8 +6767,8 @@ public static final void gtk_editable_delete_selection(int /*long*/ editable) {
+@@ -6780,8 +6780,8 @@ public static final void gtk_editable_delete_selection(int /*long*/ editable) {
* @param start_pos cast=(gint)
* @param end_pos cast=(gint)
*/
@@ -20889,7 +20916,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_editable_delete_text(editable, start_pos, end_pos);
-@@ -6781,8 +6781,8 @@ public static final void gtk_editable_delete_text(int /*long*/ editable, int sta
+@@ -6794,8 +6794,8 @@ public static final void gtk_editable_delete_text(int /*long*/ editable, int sta
* @param start_pos cast=(gint)
* @param end_pos cast=(gint)
*/
@@ -20900,7 +20927,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_editable_get_chars(editable, start_pos, end_pos);
-@@ -6791,8 +6791,8 @@ public static final int /*long*/ gtk_editable_get_chars(int /*long*/ editable, i
+@@ -6804,8 +6804,8 @@ public static final int /*long*/ gtk_editable_get_chars(int /*long*/ editable, i
}
}
/** @param editable cast=(GtkEditable *) */
@@ -20911,7 +20938,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_editable_get_editable(editable);
-@@ -6801,8 +6801,8 @@ public static final boolean gtk_editable_get_editable(int /*long*/ editable) {
+@@ -6814,8 +6814,8 @@ public static final boolean gtk_editable_get_editable(int /*long*/ editable) {
}
}
/** @param editable cast=(GtkEditable *) */
@@ -20922,7 +20949,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_editable_get_position(editable);
-@@ -6815,8 +6815,8 @@ public static final int gtk_editable_get_position(int /*long*/ editable) {
+@@ -6828,8 +6828,8 @@ public static final int gtk_editable_get_position(int /*long*/ editable) {
* @param start cast=(gint *)
* @param end cast=(gint *)
*/
@@ -20933,7 +20960,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_editable_get_selection_bounds(editable, start, end);
-@@ -6830,8 +6830,8 @@ public static final boolean gtk_editable_get_selection_bounds(int /*long*/ edita
+@@ -6843,8 +6843,8 @@ public static final boolean gtk_editable_get_selection_bounds(int /*long*/ edita
* @param new_text_length cast=(gint)
* @param position cast=(gint *)
*/
@@ -20944,7 +20971,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_editable_insert_text(editable, new_text, new_text_length, position);
-@@ -6840,8 +6840,8 @@ public static final void gtk_editable_insert_text(int /*long*/ editable, byte[]
+@@ -6853,8 +6853,8 @@ public static final void gtk_editable_insert_text(int /*long*/ editable, byte[]
}
}
/** @param editable cast=(GtkEditable *) */
@@ -20955,7 +20982,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_editable_paste_clipboard(editable);
-@@ -6854,8 +6854,8 @@ public static final void gtk_editable_paste_clipboard(int /*long*/ editable) {
+@@ -6867,8 +6867,8 @@ public static final void gtk_editable_paste_clipboard(int /*long*/ editable) {
* @param start cast=(gint)
* @param end cast=(gint)
*/
@@ -20966,7 +20993,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_editable_select_region(editable, start, end);
-@@ -6867,8 +6867,8 @@ public static final void gtk_editable_select_region(int /*long*/ editable, int s
+@@ -6880,8 +6880,8 @@ public static final void gtk_editable_select_region(int /*long*/ editable, int s
* @param entry cast=(GtkEditable *)
* @param editable cast=(gboolean)
*/
@@ -20977,7 +21004,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_editable_set_editable(entry, editable);
-@@ -6880,8 +6880,8 @@ public static final void gtk_editable_set_editable(int /*long*/ entry, boolean e
+@@ -6893,8 +6893,8 @@ public static final void gtk_editable_set_editable(int /*long*/ entry, boolean e
* @param editable cast=(GtkEditable *)
* @param position cast=(gint)
*/
@@ -20988,7 +21015,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_editable_set_position(editable, position);
-@@ -6890,8 +6890,8 @@ public static final void gtk_editable_set_position(int /*long*/ editable, int po
+@@ -6903,8 +6903,8 @@ public static final void gtk_editable_set_position(int /*long*/ editable, int po
}
}
/** @method flags=dynamic */
@@ -20999,7 +21026,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_entry_get_inner_border(entry);
-@@ -6900,8 +6900,8 @@ public static final int /*long*/ gtk_entry_get_inner_border (int /*long*/ entry)
+@@ -6913,8 +6913,8 @@ public static final int /*long*/ gtk_entry_get_inner_border (int /*long*/ entry)
}
}
/** @param entry cast=(GtkEntry *) */
@@ -21010,7 +21037,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_entry_get_invisible_char(entry);
-@@ -6910,8 +6910,8 @@ public static final char gtk_entry_get_invisible_char(int /*long*/ entry) {
+@@ -6923,8 +6923,8 @@ public static final char gtk_entry_get_invisible_char(int /*long*/ entry) {
}
}
/** @param entry cast=(GtkEntry *) */
@@ -21021,7 +21048,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_entry_get_layout(entry);
-@@ -6920,8 +6920,8 @@ public static final int /*long*/ gtk_entry_get_layout (int /*long*/ entry) {
+@@ -6933,8 +6933,8 @@ public static final int /*long*/ gtk_entry_get_layout (int /*long*/ entry) {
}
}
/** @param entry cast=(GtkEntry *) */
@@ -21032,7 +21059,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_entry_get_layout_offsets(entry, x, y);
-@@ -6930,8 +6930,8 @@ public static final void gtk_entry_get_layout_offsets (int /*long*/ entry, int[]
+@@ -6943,8 +6943,8 @@ public static final void gtk_entry_get_layout_offsets (int /*long*/ entry, int[]
}
}
/** @method flags=dynamic */
@@ -21043,7 +21070,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_entry_text_index_to_layout_index(entry, index);
-@@ -6940,8 +6940,8 @@ public static final int gtk_entry_text_index_to_layout_index (int /*long*/ entry
+@@ -6953,8 +6953,8 @@ public static final int gtk_entry_text_index_to_layout_index (int /*long*/ entry
}
}
/** @param entry cast=(GtkEntry *) */
@@ -21054,7 +21081,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_entry_get_max_length(entry);
-@@ -6950,8 +6950,8 @@ public static final int gtk_entry_get_max_length(int /*long*/ entry) {
+@@ -6963,8 +6963,8 @@ public static final int gtk_entry_get_max_length(int /*long*/ entry) {
}
}
/** @param entry cast=(GtkEntry *) */
@@ -21065,7 +21092,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_entry_get_text(entry);
-@@ -6960,8 +6960,8 @@ public static final int /*long*/ gtk_entry_get_text(int /*long*/ entry) {
+@@ -6973,8 +6973,8 @@ public static final int /*long*/ gtk_entry_get_text(int /*long*/ entry) {
}
}
/** @method flags=dynamic */
@@ -21076,7 +21103,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _FcConfigAppFontAddFile(config, file);
-@@ -6970,8 +6970,8 @@ public static final boolean FcConfigAppFontAddFile(int /*long*/ config, byte[] f
+@@ -6983,8 +6983,8 @@ public static final boolean FcConfigAppFontAddFile(int /*long*/ config, byte[] f
}
}
/** @param entry cast=(GtkEntry *) */
@@ -21087,7 +21114,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_entry_get_visibility(entry);
-@@ -6979,8 +6979,8 @@ public static final boolean gtk_entry_get_visibility(int /*long*/ entry) {
+@@ -6992,8 +6992,8 @@ public static final boolean gtk_entry_get_visibility(int /*long*/ entry) {
lock.unlock();
}
}
@@ -21098,7 +21125,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_entry_new();
-@@ -6992,8 +6992,8 @@ public static final int /*long*/ gtk_entry_new() {
+@@ -7005,8 +7005,8 @@ public static final int /*long*/ gtk_entry_new() {
* @param entry cast=(GtkEntry *)
* @param setting cast=(gboolean)
*/
@@ -21109,7 +21136,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_entry_set_activates_default(entry, setting);
-@@ -7006,8 +7006,8 @@ public static final void gtk_entry_set_activates_default(int /*long*/ entry, boo
+@@ -7019,8 +7019,8 @@ public static final void gtk_entry_set_activates_default(int /*long*/ entry, boo
* @param entry cast=(GtkEntry *)
* @param xalign cast=(gfloat)
*/
@@ -21120,7 +21147,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_entry_set_alignment(entry, xalign);
-@@ -7019,8 +7019,8 @@ public static final void gtk_entry_set_alignment(int /*long*/ entry, float xalig
+@@ -7032,8 +7032,8 @@ public static final void gtk_entry_set_alignment(int /*long*/ entry, float xalig
* @param entry cast=(GtkEntry *)
* @param setting cast=(gboolean)
*/
@@ -21131,7 +21158,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_entry_set_has_frame(entry, setting);
-@@ -7029,8 +7029,8 @@ public static final void gtk_entry_set_has_frame(int /*long*/ entry, boolean set
+@@ -7042,8 +7042,8 @@ public static final void gtk_entry_set_has_frame(int /*long*/ entry, boolean set
}
}
/** @method flags=dynamic */
@@ -21142,7 +21169,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_entry_set_icon_from_stock(entry, icon, stock);
-@@ -7039,8 +7039,8 @@ public static final void gtk_entry_set_icon_from_stock(int /*long*/ entry, int i
+@@ -7052,8 +7052,8 @@ public static final void gtk_entry_set_icon_from_stock(int /*long*/ entry, int i
}
}
/** @method flags=dynamic */
@@ -21153,7 +21180,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_entry_set_icon_sensitive(entry, icon_pos, sensitive);
-@@ -7052,8 +7052,8 @@ public static final void gtk_entry_set_icon_sensitive(int /*long*/ entry, int ic
+@@ -7065,8 +7065,8 @@ public static final void gtk_entry_set_icon_sensitive(int /*long*/ entry, int ic
* @param entry cast=(GtkEntry *)
* @param ch cast=(gint)
*/
@@ -21164,7 +21191,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_entry_set_invisible_char(entry, ch);
-@@ -7065,8 +7065,8 @@ public static final void gtk_entry_set_invisible_char(int /*long*/ entry, char c
+@@ -7078,8 +7078,8 @@ public static final void gtk_entry_set_invisible_char(int /*long*/ entry, char c
* @param entry cast=(GtkEntry *)
* @param max cast=(gint)
*/
@@ -21175,7 +21202,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_entry_set_max_length(entry, max);
-@@ -7078,8 +7078,8 @@ public static final void gtk_entry_set_max_length(int /*long*/ entry, int max) {
+@@ -7091,8 +7091,8 @@ public static final void gtk_entry_set_max_length(int /*long*/ entry, int max) {
* @param entry cast=(GtkEntry *)
* @param text cast=(const gchar *)
*/
@@ -21186,7 +21213,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_entry_set_text(entry, text);
-@@ -7091,8 +7091,8 @@ public static final void gtk_entry_set_text(int /*long*/ entry, byte[] text) {
+@@ -7104,8 +7104,8 @@ public static final void gtk_entry_set_text(int /*long*/ entry, byte[] text) {
* @param entry cast=(GtkEntry *)
* @param visible cast=(gboolean)
*/
@@ -21197,7 +21224,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_entry_set_visibility(entry, visible);
-@@ -7110,8 +7110,8 @@ public static final int gtk_events_pending() {
+@@ -7123,8 +7123,8 @@ public static final int gtk_events_pending() {
}
}
/** @method flags=dynamic */
@@ -21208,7 +21235,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_expander_get_expanded(expander);
-@@ -7120,8 +7120,8 @@ public static final boolean gtk_expander_get_expanded(int /*long*/ expander) {
+@@ -7133,8 +7133,8 @@ public static final boolean gtk_expander_get_expanded(int /*long*/ expander) {
}
}
/** @method flags=dynamic */
@@ -21219,7 +21246,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_expander_get_label_widget(expander);
-@@ -7133,8 +7133,8 @@ public static final int /*long*/ gtk_expander_get_label_widget(int /*long*/ expa
+@@ -7146,8 +7146,8 @@ public static final int /*long*/ gtk_expander_get_label_widget(int /*long*/ expa
* @method flags=dynamic
* @param label cast=(const gchar *)
*/
@@ -21230,7 +21257,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_expander_new(label);
-@@ -7143,8 +7143,8 @@ public static final int /*long*/ gtk_expander_new(byte[] label) {
+@@ -7156,8 +7156,8 @@ public static final int /*long*/ gtk_expander_new(byte[] label) {
}
}
/** @method flags=dynamic */
@@ -21241,7 +21268,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_expander_set_expanded(expander, expanded);
-@@ -7156,8 +7156,8 @@ public static final void gtk_expander_set_expanded(int /*long*/ expander, boolea
+@@ -7169,8 +7169,8 @@ public static final void gtk_expander_set_expanded(int /*long*/ expander, boolea
* @method flags=dynamic
* @param label cast=(const gchar *)
*/
@@ -21252,7 +21279,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_expander_set_label(expander, label);
-@@ -7166,8 +7166,8 @@ public static final void gtk_expander_set_label(int /*long*/ expander, byte[] la
+@@ -7179,8 +7179,8 @@ public static final void gtk_expander_set_label(int /*long*/ expander, byte[] la
}
}
/** @method flags=dynamic */
@@ -21263,7 +21290,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_expander_set_label_widget(expander, label_widget);
-@@ -7176,8 +7176,8 @@ public static final void gtk_expander_set_label_widget(int /*long*/ expander, i
+@@ -7189,8 +7189,8 @@ public static final void gtk_expander_set_label_widget(int /*long*/ expander, i
}
}
/** @method flags=dynamic */
@@ -21274,7 +21301,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_file_chooser_add_filter(chooser, filter);
-@@ -7186,8 +7186,8 @@ public static final void gtk_file_chooser_add_filter(int /*long*/ chooser, int /
+@@ -7199,8 +7199,8 @@ public static final void gtk_file_chooser_add_filter(int /*long*/ chooser, int /
}
}
/** @method flags=no_gen */
@@ -21285,7 +21312,7 @@ index 62bc7a8..eb1efa2 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);
-@@ -7196,8 +7196,8 @@ public static final int /*long*/ gtk_file_chooser_dialog_new(byte[] title, int /
+@@ -7209,8 +7209,8 @@ public static final int /*long*/ gtk_file_chooser_dialog_new(byte[] title, int /
}
}
/** @method flags=dynamic */
@@ -21296,7 +21323,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_file_chooser_get_current_folder(chooser);
-@@ -7206,8 +7206,8 @@ public static final int /*long*/ gtk_file_chooser_get_current_folder(int /*long*
+@@ -7219,8 +7219,8 @@ public static final int /*long*/ gtk_file_chooser_get_current_folder(int /*long*
}
}
/** @method flags=dynamic */
@@ -21307,7 +21334,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_file_chooser_get_filename(chooser);
-@@ -7216,8 +7216,8 @@ public static final int /*long*/ gtk_file_chooser_get_filename(int /*long*/ choo
+@@ -7229,8 +7229,8 @@ public static final int /*long*/ gtk_file_chooser_get_filename(int /*long*/ choo
}
}
/** @method flags=dynamic */
@@ -21318,7 +21345,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_file_chooser_get_filenames(chooser);
-@@ -7226,8 +7226,8 @@ public static final int /*long*/ gtk_file_chooser_get_filenames(int /*long*/ cho
+@@ -7239,8 +7239,8 @@ public static final int /*long*/ gtk_file_chooser_get_filenames(int /*long*/ cho
}
}
/** @method flags=dynamic */
@@ -21329,7 +21356,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_file_chooser_get_uri(chooser);
-@@ -7236,8 +7236,8 @@ public static final int /*long*/ gtk_file_chooser_get_uri(int /*long*/ chooser)
+@@ -7249,8 +7249,8 @@ public static final int /*long*/ gtk_file_chooser_get_uri(int /*long*/ chooser)
}
}
/** @method flags=dynamic */
@@ -21340,7 +21367,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_file_chooser_get_uris(chooser);
-@@ -7246,8 +7246,8 @@ public static final int /*long*/ gtk_file_chooser_get_uris(int /*long*/ chooser)
+@@ -7259,8 +7259,8 @@ public static final int /*long*/ gtk_file_chooser_get_uris(int /*long*/ chooser)
}
}
/** @method flags=dynamic */
@@ -21351,7 +21378,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_file_chooser_get_filter(chooser);
-@@ -7256,8 +7256,8 @@ public static final int /*long*/ gtk_file_chooser_get_filter(int /*long*/ choose
+@@ -7269,8 +7269,8 @@ public static final int /*long*/ gtk_file_chooser_get_filter(int /*long*/ choose
}
}
/** @method flags=dynamic */
@@ -21362,7 +21389,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_file_chooser_set_current_folder(chooser, filename);
-@@ -7266,8 +7266,8 @@ public static final void gtk_file_chooser_set_current_folder(int /*long*/ choose
+@@ -7279,8 +7279,8 @@ public static final void gtk_file_chooser_set_current_folder(int /*long*/ choose
}
}
/** @method flags=dynamic */
@@ -21373,7 +21400,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_file_chooser_set_current_folder_uri(chooser, uri);
-@@ -7276,8 +7276,8 @@ public static final void gtk_file_chooser_set_current_folder_uri(int /*long*/ ch
+@@ -7289,8 +7289,8 @@ public static final void gtk_file_chooser_set_current_folder_uri(int /*long*/ ch
}
}
/** @method flags=dynamic */
@@ -21384,7 +21411,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_file_chooser_set_current_name(chooser, name);
-@@ -7286,8 +7286,8 @@ public static final void gtk_file_chooser_set_current_name(int /*long*/ chooser,
+@@ -7299,8 +7299,8 @@ public static final void gtk_file_chooser_set_current_name(int /*long*/ chooser,
}
}
/** @method flags=dynamic */
@@ -21395,7 +21422,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_file_chooser_set_local_only(chooser, local_only);
-@@ -7296,8 +7296,8 @@ public static final void gtk_file_chooser_set_local_only(int /*long*/ chooser, b
+@@ -7309,8 +7309,8 @@ public static final void gtk_file_chooser_set_local_only(int /*long*/ chooser, b
}
}
/** @method flags=dynamic */
@@ -21406,7 +21433,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_file_chooser_set_do_overwrite_confirmation(chooser, do_overwrite_confirmation);
-@@ -7306,8 +7306,8 @@ public static final void gtk_file_chooser_set_do_overwrite_confirmation(int /*lo
+@@ -7319,8 +7319,8 @@ public static final void gtk_file_chooser_set_do_overwrite_confirmation(int /*lo
}
}
/** @method flags=dynamic */
@@ -21417,7 +21444,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_file_chooser_set_extra_widget(chooser, extra_widget);
-@@ -7316,8 +7316,8 @@ public static final void gtk_file_chooser_set_extra_widget(int /*long*/ chooser,
+@@ -7329,8 +7329,8 @@ public static final void gtk_file_chooser_set_extra_widget(int /*long*/ chooser,
}
}
/** @method flags=dynamic */
@@ -21428,7 +21455,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_file_chooser_set_filename(chooser, name);
-@@ -7326,8 +7326,8 @@ public static final void gtk_file_chooser_set_filename(int /*long*/ chooser, int
+@@ -7339,8 +7339,8 @@ public static final void gtk_file_chooser_set_filename(int /*long*/ chooser, int
}
}
/** @method flags=dynamic */
@@ -21439,7 +21466,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_file_chooser_set_filter(chooser, filter);
-@@ -7336,8 +7336,8 @@ public static final void gtk_file_chooser_set_filter(int /*long*/ chooser, int /
+@@ -7349,8 +7349,8 @@ public static final void gtk_file_chooser_set_filter(int /*long*/ chooser, int /
}
}
/** @method flags=dynamic */
@@ -21450,7 +21477,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_file_chooser_set_uri(chooser, uri);
-@@ -7346,8 +7346,8 @@ public static final void gtk_file_chooser_set_uri(int /*long*/ chooser, byte []
+@@ -7359,8 +7359,8 @@ public static final void gtk_file_chooser_set_uri(int /*long*/ chooser, byte []
}
}
/** @method flags=dynamic */
@@ -21461,7 +21488,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_file_chooser_set_select_multiple(chooser, select_multiple);
-@@ -7356,8 +7356,8 @@ public static final void gtk_file_chooser_set_select_multiple(int /*long*/ choos
+@@ -7369,8 +7369,8 @@ public static final void gtk_file_chooser_set_select_multiple(int /*long*/ choos
}
}
/** @method flags=dynamic */
@@ -21472,7 +21499,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_file_filter_add_pattern(filter, pattern);
-@@ -7366,8 +7366,8 @@ public static final void gtk_file_filter_add_pattern(int /*long*/ filter, byte[]
+@@ -7379,8 +7379,8 @@ public static final void gtk_file_filter_add_pattern(int /*long*/ filter, byte[]
}
}
/** @method flags=dynamic */
@@ -21483,7 +21510,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_file_filter_new();
-@@ -7376,8 +7376,8 @@ public static final int /*long*/ gtk_file_filter_new() {
+@@ -7389,8 +7389,8 @@ public static final int /*long*/ gtk_file_filter_new() {
}
}
/** @method flags=dynamic */
@@ -21494,7 +21521,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_file_filter_get_name(filter);
-@@ -7386,8 +7386,8 @@ public static final int /*long*/ gtk_file_filter_get_name(int /*long*/ filter) {
+@@ -7399,8 +7399,8 @@ public static final int /*long*/ gtk_file_filter_get_name(int /*long*/ filter) {
}
}
/** @method flags=dynamic */
@@ -21505,7 +21532,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_file_filter_set_name(filter, name);
-@@ -7401,8 +7401,8 @@ public static final void gtk_file_filter_set_name(int /*long*/ filter, byte[] na
+@@ -7414,8 +7414,8 @@ public static final void gtk_file_filter_set_name(int /*long*/ filter, byte[] na
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -21516,7 +21543,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_fixed_move(fixed, widget, x, y);
-@@ -7410,8 +7410,8 @@ public static final void gtk_fixed_move(int /*long*/ fixed, int /*long*/ widget,
+@@ -7423,8 +7423,8 @@ public static final void gtk_fixed_move(int /*long*/ fixed, int /*long*/ widget,
lock.unlock();
}
}
@@ -21527,7 +21554,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_fixed_new();
-@@ -7423,8 +7423,8 @@ public static final int /*long*/ gtk_fixed_new() {
+@@ -7436,8 +7436,8 @@ public static final int /*long*/ gtk_fixed_new() {
* @param fixed cast=(GtkFixed *)
* @param has_window cast=(gboolean)
*/
@@ -21538,7 +21565,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_fixed_set_has_window(fixed, has_window);
-@@ -7433,8 +7433,8 @@ public static final void gtk_fixed_set_has_window(int /*long*/ fixed, boolean ha
+@@ -7446,8 +7446,8 @@ public static final void gtk_fixed_set_has_window(int /*long*/ fixed, boolean ha
}
}
/** @param fsd cast=(GtkFontSelectionDialog *) */
@@ -21549,7 +21576,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_font_selection_dialog_get_font_name(fsd);
-@@ -7443,8 +7443,8 @@ public static final int /*long*/ gtk_font_selection_dialog_get_font_name(int /*l
+@@ -7456,8 +7456,8 @@ public static final int /*long*/ gtk_font_selection_dialog_get_font_name(int /*l
}
}
/** @param title cast=(const gchar *) */
@@ -21560,7 +21587,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_font_selection_dialog_new(title);
-@@ -7456,8 +7456,8 @@ public static final int /*long*/ gtk_font_selection_dialog_new(byte[] title) {
+@@ -7469,8 +7469,8 @@ public static final int /*long*/ gtk_font_selection_dialog_new(byte[] title) {
* @param fsd cast=(GtkFontSelectionDialog *)
* @param fontname cast=(const gchar *)
*/
@@ -21571,7 +21598,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_font_selection_dialog_set_font_name(fsd, fontname);
-@@ -7466,8 +7466,8 @@ public static final boolean gtk_font_selection_dialog_set_font_name(int /*long*/
+@@ -7479,8 +7479,8 @@ public static final boolean gtk_font_selection_dialog_set_font_name(int /*long*/
}
}
/** @param label cast=(const gchar *) */
@@ -21582,7 +21609,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_frame_new(label);
-@@ -7476,8 +7476,8 @@ public static final int /*long*/ gtk_frame_new(byte[] label) {
+@@ -7489,8 +7489,8 @@ public static final int /*long*/ gtk_frame_new(byte[] label) {
}
}
/** @param frame cast=(GtkFrame *) */
@@ -21593,7 +21620,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_frame_get_label_widget(frame);
-@@ -7489,8 +7489,8 @@ public static final int /*long*/ gtk_frame_get_label_widget(int /*long*/ frame)
+@@ -7502,8 +7502,8 @@ public static final int /*long*/ gtk_frame_get_label_widget(int /*long*/ frame)
* @param frame cast=(GtkFrame *)
* @param label cast=(const gchar *)
*/
@@ -21604,7 +21631,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_frame_set_label(frame, label);
-@@ -7502,8 +7502,8 @@ public static final void gtk_frame_set_label(int /*long*/ frame, byte[] label) {
+@@ -7515,8 +7515,8 @@ public static final void gtk_frame_set_label(int /*long*/ frame, byte[] label) {
* @param frame cast=(GtkFrame *)
* @param label_widget cast=(GtkWidget *)
*/
@@ -21615,7 +21642,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_frame_set_label_widget(frame, label_widget);
-@@ -7515,8 +7515,8 @@ public static final void gtk_frame_set_label_widget(int /*long*/ frame, int /*lo
+@@ -7528,8 +7528,8 @@ public static final void gtk_frame_set_label_widget(int /*long*/ frame, int /*lo
* @param frame cast=(GtkFrame *)
* @param type cast=(GtkShadowType)
*/
@@ -21626,7 +21653,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_frame_set_shadow_type(frame, type);
-@@ -7524,8 +7524,8 @@ public static final void gtk_frame_set_shadow_type(int /*long*/ frame, int type)
+@@ -7537,8 +7537,8 @@ public static final void gtk_frame_set_shadow_type(int /*long*/ frame, int type)
lock.unlock();
}
}
@@ -21637,7 +21664,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_get_current_event();
-@@ -7552,8 +7552,8 @@ public static final int gtk_get_current_event_time() {
+@@ -7565,8 +7565,8 @@ public static final int gtk_get_current_event_time() {
lock.unlock();
}
}
@@ -21648,7 +21675,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_get_default_language();
-@@ -7562,8 +7562,8 @@ public static final int /*long*/ gtk_get_default_language() {
+@@ -7575,8 +7575,8 @@ public static final int /*long*/ gtk_get_default_language() {
}
}
/** @param event cast=(GdkEvent *) */
@@ -21659,7 +21686,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_get_event_widget(event);
-@@ -7572,8 +7572,8 @@ public static final int /*long*/ gtk_get_event_widget(int /*long*/ event) {
+@@ -7585,8 +7585,8 @@ public static final int /*long*/ gtk_get_event_widget(int /*long*/ event) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -21670,7 +21697,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_grab_add(widget);
-@@ -7581,8 +7581,8 @@ public static final void gtk_grab_add(int /*long*/ widget) {
+@@ -7594,8 +7594,8 @@ public static final void gtk_grab_add(int /*long*/ widget) {
lock.unlock();
}
}
@@ -21681,7 +21708,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_grab_get_current();
-@@ -7591,8 +7591,8 @@ public static final int /*long*/ gtk_grab_get_current() {
+@@ -7604,8 +7604,8 @@ public static final int /*long*/ gtk_grab_get_current() {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -21692,7 +21719,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_grab_remove(widget);
-@@ -7604,8 +7604,8 @@ public static final void gtk_grab_remove(int /*long*/ widget) {
+@@ -7617,8 +7617,8 @@ public static final void gtk_grab_remove(int /*long*/ widget) {
* @param homogeneous cast=(gboolean)
* @param spacing cast=(gint)
*/
@@ -21703,7 +21730,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_hbox_new(homogeneous, spacing);
-@@ -7614,8 +7614,8 @@ public static final int /*long*/ gtk_hbox_new(boolean homogeneous, int spacing)
+@@ -7627,8 +7627,8 @@ public static final int /*long*/ gtk_hbox_new(boolean homogeneous, int spacing)
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -21714,7 +21741,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_hscale_new(adjustment);
-@@ -7624,8 +7624,8 @@ public static final int /*long*/ gtk_hscale_new(int /*long*/ adjustment) {
+@@ -7637,8 +7637,8 @@ public static final int /*long*/ gtk_hscale_new(int /*long*/ adjustment) {
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -21725,7 +21752,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_hscrollbar_new(adjustment);
-@@ -7633,8 +7633,8 @@ public static final int /*long*/ gtk_hscrollbar_new(int /*long*/ adjustment) {
+@@ -7646,8 +7646,8 @@ public static final int /*long*/ gtk_hscrollbar_new(int /*long*/ adjustment) {
lock.unlock();
}
}
@@ -21736,7 +21763,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_hseparator_new();
-@@ -7642,8 +7642,8 @@ public static final int /*long*/ gtk_hseparator_new() {
+@@ -7655,8 +7655,8 @@ public static final int /*long*/ gtk_hseparator_new() {
lock.unlock();
}
}
@@ -21747,7 +21774,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_status_icon_position_menu_func();
-@@ -7654,8 +7654,8 @@ public static final int /*long*/ gtk_status_icon_position_menu_func() {
+@@ -7667,8 +7667,8 @@ public static final int /*long*/ gtk_status_icon_position_menu_func() {
/**
* @method flags=dynamic
*/
@@ -21758,7 +21785,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_icon_info_free(icon_info);
-@@ -7664,8 +7664,8 @@ public static final void gtk_icon_info_free(int /*long*/ icon_info) {
+@@ -7677,8 +7677,8 @@ public static final void gtk_icon_info_free(int /*long*/ icon_info) {
}
}
/** @param stock_id cast=(const gchar *) */
@@ -21769,7 +21796,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_icon_factory_lookup_default(stock_id);
-@@ -7674,8 +7674,8 @@ public static final int /*long*/ gtk_icon_factory_lookup_default(byte[] stock_id
+@@ -7687,8 +7687,8 @@ public static final int /*long*/ gtk_icon_factory_lookup_default(byte[] stock_id
}
}
/** @param source cast=(GtkIconSource *) */
@@ -21780,7 +21807,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_icon_source_free(source);
-@@ -7683,8 +7683,8 @@ public static final void gtk_icon_source_free(int /*long*/ source) {
+@@ -7696,8 +7696,8 @@ public static final void gtk_icon_source_free(int /*long*/ source) {
lock.unlock();
}
}
@@ -21791,7 +21818,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_icon_source_new();
-@@ -7696,8 +7696,8 @@ public static final int /*long*/ gtk_icon_source_new() {
+@@ -7709,8 +7709,8 @@ public static final int /*long*/ gtk_icon_source_new() {
* @param source cast=(GtkIconSource *)
* @param pixbuf cast=(GdkPixbuf *)
*/
@@ -21802,7 +21829,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_icon_source_set_pixbuf(source, pixbuf);
-@@ -7714,8 +7714,8 @@ public static final void gtk_icon_source_set_pixbuf(int /*long*/ source, int /*l
+@@ -7727,8 +7727,8 @@ public static final void gtk_icon_source_set_pixbuf(int /*long*/ source, int /*l
* @param widget cast=(GtkWidget *)
* @param detail cast=(const char *)
*/
@@ -21813,7 +21840,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_icon_set_render_icon(icon_set, style, direction, state, size, widget, detail);
-@@ -7726,8 +7726,8 @@ public static final int /*long*/ gtk_icon_set_render_icon(int /*long*/ icon_set,
+@@ -7739,8 +7739,8 @@ public static final int /*long*/ gtk_icon_set_render_icon(int /*long*/ icon_set,
/**
* @method flags=dynamic
*/
@@ -21824,7 +21851,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_icon_theme_get_default ();
-@@ -7738,8 +7738,8 @@ public static final int /*long*/ gtk_icon_theme_get_default() {
+@@ -7751,8 +7751,8 @@ public static final int /*long*/ gtk_icon_theme_get_default() {
/**
* @method flags=dynamic
*/
@@ -21835,7 +21862,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_icon_theme_lookup_by_gicon (icon_theme, icon, size, flags);
-@@ -7750,8 +7750,8 @@ public static final int /*long*/ gtk_icon_theme_lookup_by_gicon(int /*long*/ ico
+@@ -7763,8 +7763,8 @@ public static final int /*long*/ gtk_icon_theme_lookup_by_gicon(int /*long*/ ico
/**
* @method flags=dynamic
*/
@@ -21846,7 +21873,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_icon_info_load_icon(icon_info, error);
-@@ -7763,8 +7763,8 @@ public static final int /*long*/ gtk_icon_info_load_icon(int /*long*/ icon_info,
+@@ -7776,8 +7776,8 @@ public static final int /*long*/ gtk_icon_info_load_icon(int /*long*/ icon_info,
* @param context cast=(GtkIMContext *)
* @param event cast=(GdkEventKey *)
*/
@@ -21857,7 +21884,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_im_context_filter_keypress(context, event);
-@@ -7773,8 +7773,8 @@ public static final boolean gtk_im_context_filter_keypress(int /*long*/ context,
+@@ -7786,8 +7786,8 @@ public static final boolean gtk_im_context_filter_keypress(int /*long*/ context,
}
}
/** @param context cast=(GtkIMContext *) */
@@ -21868,7 +21895,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_im_context_focus_in(context);
-@@ -7783,8 +7783,8 @@ public static final void gtk_im_context_focus_in(int /*long*/ context) {
+@@ -7796,8 +7796,8 @@ public static final void gtk_im_context_focus_in(int /*long*/ context) {
}
}
/** @param context cast=(GtkIMContext *) */
@@ -21879,7 +21906,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_im_context_focus_out(context);
-@@ -7798,8 +7798,8 @@ public static final void gtk_im_context_focus_out(int /*long*/ context) {
+@@ -7811,8 +7811,8 @@ public static final void gtk_im_context_focus_out(int /*long*/ context) {
* @param attrs cast=(PangoAttrList **)
* @param cursor_pos cast=(gint *)
*/
@@ -21890,7 +21917,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_im_context_get_preedit_string(context, str, attrs, cursor_pos);
-@@ -7807,8 +7807,8 @@ public static final void gtk_im_context_get_preedit_string(int /*long*/ context,
+@@ -7820,8 +7820,8 @@ public static final void gtk_im_context_get_preedit_string(int /*long*/ context,
lock.unlock();
}
}
@@ -21901,7 +21928,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_im_context_get_type();
-@@ -7817,8 +7817,8 @@ public static final int /*long*/ gtk_im_context_get_type() {
+@@ -7830,8 +7830,8 @@ public static final int /*long*/ gtk_im_context_get_type() {
}
}
/** @param context cast=(GtkIMContext *) */
@@ -21912,7 +21939,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_im_context_reset(context);
-@@ -7830,8 +7830,8 @@ public static final void gtk_im_context_reset(int /*long*/ context) {
+@@ -7843,8 +7843,8 @@ public static final void gtk_im_context_reset(int /*long*/ context) {
* @param context cast=(GtkIMContext *)
* @param window cast=(GdkWindow *)
*/
@@ -21923,7 +21950,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_im_context_set_client_window(context, window);
-@@ -7843,8 +7843,8 @@ public static final void gtk_im_context_set_client_window(int /*long*/ context,
+@@ -7856,8 +7856,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
*/
@@ -21934,7 +21961,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_im_context_set_cursor_location(context, area);
-@@ -7856,8 +7856,8 @@ public static final void gtk_im_context_set_cursor_location(int /*long*/ context
+@@ -7869,8 +7869,8 @@ public static final void gtk_im_context_set_cursor_location(int /*long*/ context
* @param context cast=(GtkIMMulticontext *)
* @param menushell cast=(GtkMenuShell *)
*/
@@ -21945,7 +21972,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_im_multicontext_append_menuitems(context, menushell);
-@@ -7865,8 +7865,8 @@ public static final void gtk_im_multicontext_append_menuitems (int /*long*/ cont
+@@ -7878,8 +7878,8 @@ public static final void gtk_im_multicontext_append_menuitems (int /*long*/ cont
lock.unlock();
}
}
@@ -21956,7 +21983,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_im_multicontext_new();
-@@ -7875,8 +7875,8 @@ public static final int /*long*/ gtk_im_multicontext_new() {
+@@ -7888,8 +7888,8 @@ public static final int /*long*/ gtk_im_multicontext_new() {
}
}
/** @param label cast=(const gchar *) */
@@ -21967,7 +21994,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_image_menu_item_new_with_label(label);
-@@ -7888,8 +7888,8 @@ public static final int /*long*/ gtk_image_menu_item_new_with_label(byte[] label
+@@ -7901,8 +7901,8 @@ public static final int /*long*/ gtk_image_menu_item_new_with_label(byte[] label
* @param menu_item cast=(GtkImageMenuItem *)
* @param image cast=(GtkWidget *)
*/
@@ -21978,7 +22005,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_image_menu_item_set_image(menu_item, image);
-@@ -7897,8 +7897,8 @@ public static final void gtk_image_menu_item_set_image(int /*long*/ menu_item, i
+@@ -7910,8 +7910,8 @@ public static final void gtk_image_menu_item_set_image(int /*long*/ menu_item, i
lock.unlock();
}
}
@@ -21989,7 +22016,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_image_new();
-@@ -7907,8 +7907,8 @@ public static final int /*long*/ gtk_image_new() {
+@@ -7920,8 +7920,8 @@ public static final int /*long*/ gtk_image_new() {
}
}
/** @param pixbuf cast=(GdkPixbuf *) */
@@ -22000,7 +22027,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_image_new_from_pixbuf(pixbuf);
-@@ -7920,8 +7920,8 @@ public static final int /*long*/ gtk_image_new_from_pixbuf(int /*long*/ pixbuf)
+@@ -7933,8 +7933,8 @@ public static final int /*long*/ gtk_image_new_from_pixbuf(int /*long*/ pixbuf)
* @param pixmap cast=(GdkPixmap *)
* @param mask cast=(GdkBitmap *)
*/
@@ -22011,7 +22038,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_image_new_from_pixmap(pixmap, mask);
-@@ -7933,8 +7933,8 @@ public static final int /*long*/ gtk_image_new_from_pixmap(int /*long*/ pixmap,
+@@ -7946,8 +7946,8 @@ public static final int /*long*/ gtk_image_new_from_pixmap(int /*long*/ pixmap,
* @param image cast=(GtkImage *)
* @param pixbuf cast=(GdkPixbuf *)
*/
@@ -22022,7 +22049,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_image_set_from_pixbuf(image, pixbuf);
-@@ -7947,8 +7947,8 @@ public static final void gtk_image_set_from_pixbuf(int /*long*/ image, int /*lon
+@@ -7960,8 +7960,8 @@ public static final void gtk_image_set_from_pixbuf(int /*long*/ image, int /*lon
* @param pixmap cast=(GdkBitmap *)
* @param mask cast=(GdkBitmap *)
*/
@@ -22033,7 +22060,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_image_set_from_pixmap(image, pixmap, mask);
-@@ -7960,8 +7960,8 @@ public static final void gtk_image_set_from_pixmap(int /*long*/ image, int /*lon
+@@ -7973,8 +7973,8 @@ public static final void gtk_image_set_from_pixmap(int /*long*/ image, int /*lon
* @param argc cast=(int *)
* @param argv cast=(char ***)
*/
@@ -22044,7 +22071,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_init_check(argc, argv);
-@@ -7970,8 +7970,8 @@ public static final boolean gtk_init_check(int /*long*/[] argc, int /*long*/[] a
+@@ -7983,8 +7983,8 @@ public static final boolean gtk_init_check(int /*long*/[] argc, int /*long*/[] a
}
}
/** @param label cast=(GtkLabel *) */
@@ -22055,7 +22082,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_label_get_layout(label);
-@@ -7980,8 +7980,8 @@ public static final int /*long*/ gtk_label_get_layout(int /*long*/ label) {
+@@ -7993,8 +7993,8 @@ public static final int /*long*/ gtk_label_get_layout(int /*long*/ label) {
}
}
/** @param label cast=(GtkLabel *) */
@@ -22066,7 +22093,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_label_get_mnemonic_keyval(label);
-@@ -7990,8 +7990,8 @@ public static final int gtk_label_get_mnemonic_keyval(int /*long*/ label) {
+@@ -8003,8 +8003,8 @@ public static final int gtk_label_get_mnemonic_keyval(int /*long*/ label) {
}
}
/** @param label cast=(const gchar *) */
@@ -22077,7 +22104,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_label_new(label);
-@@ -8000,8 +8000,8 @@ public static final int /*long*/ gtk_label_new(byte[] label) {
+@@ -8013,8 +8013,8 @@ public static final int /*long*/ gtk_label_new(byte[] label) {
}
}
/** @param str cast=(const gchar *) */
@@ -22088,7 +22115,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_label_new_with_mnemonic(str);
-@@ -8013,8 +8013,8 @@ public static final int /*long*/ gtk_label_new_with_mnemonic(byte[] str) {
+@@ -8026,8 +8026,8 @@ public static final int /*long*/ gtk_label_new_with_mnemonic(byte[] str) {
* @param label cast=(GtkLabel *)
* @param attrs cast=(PangoAttrList *)
*/
@@ -22099,7 +22126,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_label_set_attributes(label, attrs);
-@@ -8026,8 +8026,8 @@ public static final void gtk_label_set_attributes(int /*long*/ label, int /*long
+@@ -8039,8 +8039,8 @@ public static final void gtk_label_set_attributes(int /*long*/ label, int /*long
* @param label cast=(GtkLabel *)
* @param jtype cast=(GtkJustification)
*/
@@ -22110,7 +22137,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_label_set_justify(label, jtype);
-@@ -8039,8 +8039,8 @@ public static final void gtk_label_set_justify(int /*long*/ label, int jtype) {
+@@ -8052,8 +8052,8 @@ public static final void gtk_label_set_justify(int /*long*/ label, int jtype) {
* @param label cast=(GtkLabel *)
* @param wrap cast=(gboolean)
*/
@@ -22121,7 +22148,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_label_set_line_wrap(label, wrap);
-@@ -8049,8 +8049,8 @@ public static final void gtk_label_set_line_wrap(int /*long*/ label, boolean wra
+@@ -8062,8 +8062,8 @@ public static final void gtk_label_set_line_wrap(int /*long*/ label, boolean wra
}
}
/** @method flags=dynamic */
@@ -22132,7 +22159,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_label_set_line_wrap_mode(label, wrap_mode);
-@@ -8062,8 +8062,8 @@ public static final void gtk_label_set_line_wrap_mode(int /*long*/ label, int wr
+@@ -8075,8 +8075,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 *)
*/
@@ -22143,7 +22170,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_label_set_text(label, str);
-@@ -8075,8 +8075,8 @@ public static final void gtk_label_set_text(int /*long*/ label, int /*long*/ str
+@@ -8088,8 +8088,8 @@ public static final void gtk_label_set_text(int /*long*/ label, int /*long*/ str
* @param label cast=(GtkLabel *)
* @param str cast=(const gchar *)
*/
@@ -22154,7 +22181,7 @@ index 62bc7a8..eb1efa2 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, byte[] str) {
+@@ -8101,8 +8101,8 @@ public static final void gtk_label_set_text(int /*long*/ label, byte[] str) {
* @param label cast=(GtkLabel *)
* @param str cast=(const gchar *)
*/
@@ -22165,7 +22192,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_label_set_text_with_mnemonic(label, str);
-@@ -8101,8 +8101,8 @@ public static final void gtk_label_set_text_with_mnemonic(int /*long*/ label, by
+@@ -8114,8 +8114,8 @@ public static final void gtk_label_set_text_with_mnemonic(int /*long*/ label, by
* @param list_store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -22176,7 +22203,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_list_store_append(list_store, iter);
-@@ -8111,8 +8111,8 @@ public static final void gtk_list_store_append(int /*long*/ list_store, int /*lo
+@@ -8124,8 +8124,8 @@ public static final void gtk_list_store_append(int /*long*/ list_store, int /*lo
}
}
/** @param store cast=(GtkListStore *) */
@@ -22187,7 +22214,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_list_store_clear(store);
-@@ -8125,8 +8125,8 @@ public static final void gtk_list_store_clear(int /*long*/ store) {
+@@ -8138,8 +8138,8 @@ public static final void gtk_list_store_clear(int /*long*/ store) {
* @param iter cast=(GtkTreeIter *)
* @param position cast=(gint)
*/
@@ -22198,7 +22225,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_list_store_insert(list_store, iter, position);
-@@ -8138,8 +8138,8 @@ public static final void gtk_list_store_insert(int /*long*/ list_store, int /*lo
+@@ -8151,8 +8151,8 @@ public static final void gtk_list_store_insert(int /*long*/ list_store, int /*lo
* @param numColumns cast=(gint)
* @param types cast=(GType *)
*/
@@ -22209,7 +22236,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_list_store_newv(numColumns, types);
-@@ -8151,8 +8151,8 @@ public static final int /*long*/ gtk_list_store_newv(int numColumns, int /*long*
+@@ -8164,8 +8164,8 @@ public static final int /*long*/ gtk_list_store_newv(int numColumns, int /*long*
* @param list_store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -22220,7 +22247,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_list_store_remove(list_store, iter);
-@@ -8164,8 +8164,8 @@ public static final void gtk_list_store_remove(int /*long*/ list_store, int /*lo
+@@ -8177,8 +8177,8 @@ public static final void gtk_list_store_remove(int /*long*/ list_store, int /*lo
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -22231,7 +22258,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -8177,8 +8177,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
+@@ -8190,8 +8190,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -22242,7 +22269,7 @@ index 62bc7a8..eb1efa2 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
+@@ -8203,8 +8203,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -22253,7 +22280,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -8204,8 +8204,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
+@@ -8217,8 +8217,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
* @param iter cast=(GtkTreeIter *)
* @param value flags=no_out
*/
@@ -22264,7 +22291,7 @@ index 62bc7a8..eb1efa2 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
+@@ -8230,8 +8230,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -22275,7 +22302,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -8275,8 +8275,8 @@ public static final int gtk_main_iteration() {
+@@ -8288,8 +8288,8 @@ public static final int gtk_main_iteration() {
}
}
/** @param event cast=(GdkEvent *) */
@@ -22286,7 +22313,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_main_do_event(event);
-@@ -8284,8 +8284,8 @@ public static final void gtk_main_do_event(int /*long*/ event) {
+@@ -8297,8 +8297,8 @@ public static final void gtk_main_do_event(int /*long*/ event) {
lock.unlock();
}
}
@@ -22297,7 +22324,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_menu_bar_new();
-@@ -8294,8 +8294,8 @@ public static final int /*long*/ gtk_menu_bar_new() {
+@@ -8307,8 +8307,8 @@ public static final int /*long*/ gtk_menu_bar_new() {
}
}
/** @param menu cast=(GtkMenu *) */
@@ -22308,7 +22335,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_menu_get_attach_widget(menu);
-@@ -8307,8 +8307,8 @@ public static final int /*long*/ gtk_menu_get_attach_widget(int /*long*/ menu) {
+@@ -8320,8 +8320,8 @@ public static final int /*long*/ gtk_menu_get_attach_widget(int /*long*/ menu) {
* @method flags=dynamic
* @param menu_item cast=(GtkMenuItem *)
*/
@@ -22319,7 +22346,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_menu_item_remove_submenu(menu_item);
-@@ -8317,8 +8317,8 @@ public static final void gtk_menu_item_remove_submenu(int /*long*/ menu_item) {
+@@ -8330,8 +8330,8 @@ public static final void gtk_menu_item_remove_submenu(int /*long*/ menu_item) {
}
}
/** @param menu_item cast=(GtkMenuItem *) */
@@ -22330,7 +22357,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_menu_item_get_submenu(menu_item);
-@@ -8330,8 +8330,8 @@ public static final int /*long*/ gtk_menu_item_get_submenu(int /*long*/ menu_ite
+@@ -8343,8 +8343,8 @@ public static final int /*long*/ gtk_menu_item_get_submenu(int /*long*/ menu_ite
* @param menu_item cast=(GtkMenuItem *)
* @param submenu cast=(GtkWidget *)
*/
@@ -22341,7 +22368,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_menu_item_set_submenu(menu_item, submenu);
-@@ -8339,8 +8339,8 @@ public static final void gtk_menu_item_set_submenu(int /*long*/ menu_item, int /
+@@ -8352,8 +8352,8 @@ public static final void gtk_menu_item_set_submenu(int /*long*/ menu_item, int /
lock.unlock();
}
}
@@ -22352,7 +22379,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_menu_new();
-@@ -8349,8 +8349,8 @@ public static final int /*long*/ gtk_menu_new() {
+@@ -8362,8 +8362,8 @@ public static final int /*long*/ gtk_menu_new() {
}
}
/** @param menu cast=(GtkMenu *) */
@@ -22363,7 +22390,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_menu_popdown(menu);
-@@ -8367,8 +8367,8 @@ public static final void gtk_menu_popdown(int /*long*/ menu) {
+@@ -8380,8 +8380,8 @@ public static final void gtk_menu_popdown(int /*long*/ menu) {
* @param button cast=(guint)
* @param activate_time cast=(guint32)
*/
@@ -22374,7 +22401,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_menu_popup(menu, parent_menu_shell, parent_menu_item, func, data, button, activate_time);
-@@ -8377,8 +8377,8 @@ public static final void gtk_menu_popup(int /*long*/ menu, int /*long*/ parent_m
+@@ -8390,8 +8390,8 @@ public static final void gtk_menu_popup(int /*long*/ menu, int /*long*/ parent_m
}
}
/** @param menu_shell cast=(GtkMenuShell *) */
@@ -22385,7 +22412,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_menu_shell_deactivate(menu_shell);
-@@ -8391,8 +8391,8 @@ public static final void gtk_menu_shell_deactivate(int /*long*/ menu_shell) {
+@@ -8404,8 +8404,8 @@ public static final void gtk_menu_shell_deactivate(int /*long*/ menu_shell) {
* @param child cast=(GtkWidget *)
* @param position cast=(gint)
*/
@@ -22396,7 +22423,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_menu_shell_insert(menu_shell, child, position);
-@@ -8404,8 +8404,8 @@ public static final void gtk_menu_shell_insert(int /*long*/ menu_shell, int /*lo
+@@ -8417,8 +8417,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 *)
*/
@@ -22407,7 +22434,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_menu_shell_select_item(menu_shell, menu_item);
-@@ -8418,8 +8418,8 @@ public static final void gtk_menu_shell_select_item(int /*long*/ menu_shell, int
+@@ -8431,8 +8431,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)
*/
@@ -22418,7 +22445,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_menu_shell_set_take_focus(menu_shell, take_focus);
-@@ -8428,8 +8428,8 @@ public static final void gtk_menu_shell_set_take_focus(int /*long*/ menu_shell,
+@@ -8441,8 +8441,8 @@ public static final void gtk_menu_shell_set_take_focus(int /*long*/ menu_shell,
}
}
/** @method flags=dynamic */
@@ -22429,7 +22456,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_menu_tool_button_new(icon_widget, label);
-@@ -8444,8 +8444,8 @@ public static final int /*long*/ gtk_menu_tool_button_new(int /*long*/ icon_widg
+@@ -8457,8 +8457,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 *)
*/
@@ -22440,7 +22467,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_message_dialog_new(parent, flags, type, buttons, message_format);
-@@ -8458,8 +8458,8 @@ public static final int /*long*/ gtk_message_dialog_new(int /*long*/ parent, int
+@@ -8471,8 +8471,8 @@ public static final int /*long*/ gtk_message_dialog_new(int /*long*/ parent, int
* @param xalign cast=(gfloat)
* @param yalign cast=(gfloat)
*/
@@ -22451,7 +22478,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_misc_set_alignment(misc, xalign, yalign);
-@@ -8468,8 +8468,8 @@ public static final void gtk_misc_set_alignment(int /*long*/ misc, float xalign,
+@@ -8481,8 +8481,8 @@ public static final void gtk_misc_set_alignment(int /*long*/ misc, float xalign,
}
}
/** @param notebook cast=(GtkNotebook *) */
@@ -22462,7 +22489,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_notebook_get_current_page(notebook);
-@@ -8478,8 +8478,8 @@ public static final int gtk_notebook_get_current_page(int /*long*/ notebook) {
+@@ -8491,8 +8491,8 @@ public static final int gtk_notebook_get_current_page(int /*long*/ notebook) {
}
}
/** @param notebook cast=(GtkNotebook *) */
@@ -22473,7 +22500,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_notebook_get_scrollable(notebook);
-@@ -8493,8 +8493,8 @@ public static final boolean gtk_notebook_get_scrollable(int /*long*/ notebook) {
+@@ -8506,8 +8506,8 @@ public static final boolean gtk_notebook_get_scrollable(int /*long*/ notebook) {
* @param tab_label cast=(GtkWidget *)
* @param position cast=(gint)
*/
@@ -22484,7 +22511,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_notebook_insert_page(notebook, child, tab_label, position);
-@@ -8502,8 +8502,8 @@ public static final void gtk_notebook_insert_page(int /*long*/ notebook, int /*l
+@@ -8515,8 +8515,8 @@ public static final void gtk_notebook_insert_page(int /*long*/ notebook, int /*l
lock.unlock();
}
}
@@ -22495,7 +22522,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_notebook_new();
-@@ -8512,8 +8512,8 @@ public static final int /*long*/ gtk_notebook_new() {
+@@ -8525,8 +8525,8 @@ public static final int /*long*/ gtk_notebook_new() {
}
}
/** @param notebook cast=(GtkNotebook *) */
@@ -22506,7 +22533,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_notebook_next_page(notebook);
-@@ -8522,8 +8522,8 @@ public static final void gtk_notebook_next_page(int /*long*/ notebook) {
+@@ -8535,8 +8535,8 @@ public static final void gtk_notebook_next_page(int /*long*/ notebook) {
}
}
/** @param notebook cast=(GtkNotebook *) */
@@ -22517,7 +22544,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_notebook_prev_page(notebook);
-@@ -8535,8 +8535,8 @@ public static final void gtk_notebook_prev_page(int /*long*/ notebook) {
+@@ -8548,8 +8548,8 @@ public static final void gtk_notebook_prev_page(int /*long*/ notebook) {
* @param notebook cast=(GtkNotebook *)
* @param page_num cast=(gint)
*/
@@ -22528,7 +22555,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_notebook_remove_page(notebook, page_num);
-@@ -8548,8 +8548,8 @@ public static final void gtk_notebook_remove_page(int /*long*/ notebook, int pag
+@@ -8561,8 +8561,8 @@ public static final void gtk_notebook_remove_page(int /*long*/ notebook, int pag
* @param notebook cast=(GtkNotebook *)
* @param page_num cast=(gint)
*/
@@ -22539,7 +22566,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_notebook_set_current_page(notebook, page_num);
-@@ -8561,8 +8561,8 @@ public static final void gtk_notebook_set_current_page(int /*long*/ notebook, in
+@@ -8574,8 +8574,8 @@ public static final void gtk_notebook_set_current_page(int /*long*/ notebook, in
* @param notebook cast=(GtkNotebook *)
* @param scrollable cast=(gboolean)
*/
@@ -22550,7 +22577,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_notebook_set_scrollable(notebook, scrollable);
-@@ -8574,8 +8574,8 @@ public static final void gtk_notebook_set_scrollable(int /*long*/ notebook, bool
+@@ -8587,8 +8587,8 @@ public static final void gtk_notebook_set_scrollable(int /*long*/ notebook, bool
* @param notebook cast=(GtkNotebook *)
* @param show_tabs cast=(gboolean)
*/
@@ -22561,7 +22588,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_notebook_set_show_tabs(notebook, show_tabs);
-@@ -8587,8 +8587,8 @@ public static final void gtk_notebook_set_show_tabs(int /*long*/ notebook, boole
+@@ -8600,8 +8600,8 @@ public static final void gtk_notebook_set_show_tabs(int /*long*/ notebook, boole
* @param notebook cast=(GtkNotebook *)
* @param pos cast=(GtkPositionType)
*/
@@ -22572,7 +22599,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_notebook_set_tab_pos(notebook, pos);
-@@ -8597,8 +8597,8 @@ public static final void gtk_notebook_set_tab_pos(int /*long*/ notebook, int pos
+@@ -8610,8 +8610,8 @@ public static final void gtk_notebook_set_tab_pos(int /*long*/ notebook, int pos
}
}
/** @param object cast=(GtkObject *) */
@@ -22583,7 +22610,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_object_sink(object);
-@@ -8607,8 +8607,8 @@ public static final void gtk_object_sink(int /*long*/ object) {
+@@ -8620,8 +8620,8 @@ public static final void gtk_object_sink(int /*long*/ object) {
}
}
/** @method flags=dynamic */
@@ -22594,7 +22621,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_orientable_set_orientation(orientable, orientation);
-@@ -8617,8 +8617,8 @@ public static final void gtk_orientable_set_orientation(int /*long*/ orientable,
+@@ -8630,8 +8630,8 @@ public static final void gtk_orientable_set_orientation(int /*long*/ orientable,
}
}
/** @method flags=dynamic */
@@ -22605,7 +22632,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_page_setup_new ();
-@@ -8627,8 +8627,8 @@ public static final int /*long*/ gtk_page_setup_new () {
+@@ -8640,8 +8640,8 @@ public static final int /*long*/ gtk_page_setup_new () {
}
}
/** @method flags=dynamic */
@@ -22616,7 +22643,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_page_setup_get_orientation(setup);
-@@ -8637,8 +8637,8 @@ public static final int gtk_page_setup_get_orientation(int /*long*/ setup) {
+@@ -8650,8 +8650,8 @@ public static final int gtk_page_setup_get_orientation(int /*long*/ setup) {
}
}
/** @method flags=dynamic */
@@ -22627,7 +22654,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_page_setup_set_orientation(setup, orientation);
-@@ -8647,8 +8647,8 @@ public static final void gtk_page_setup_set_orientation(int /*long*/ setup, int
+@@ -8660,8 +8660,8 @@ public static final void gtk_page_setup_set_orientation(int /*long*/ setup, int
}
}
/** @method flags=dynamic */
@@ -22638,7 +22665,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_page_setup_get_paper_size(setup);
-@@ -8657,8 +8657,8 @@ public static final int /*long*/ gtk_page_setup_get_paper_size(int /*long*/ setu
+@@ -8670,8 +8670,8 @@ public static final int /*long*/ gtk_page_setup_get_paper_size(int /*long*/ setu
}
}
/** @method flags=dynamic */
@@ -22649,7 +22676,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_page_setup_set_paper_size(setup, size);
-@@ -8667,8 +8667,8 @@ public static final void gtk_page_setup_set_paper_size(int /*long*/ setup, int /
+@@ -8680,8 +8680,8 @@ public static final void gtk_page_setup_set_paper_size(int /*long*/ setup, int /
}
}
/** @method flags=dynamic */
@@ -22660,7 +22687,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_page_setup_get_top_margin(setup, unit);
-@@ -8677,8 +8677,8 @@ public static final double gtk_page_setup_get_top_margin(int /*long*/ setup, int
+@@ -8690,8 +8690,8 @@ public static final double gtk_page_setup_get_top_margin(int /*long*/ setup, int
}
}
/** @method flags=dynamic */
@@ -22671,7 +22698,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_page_setup_set_top_margin(setup, margin, unit);
-@@ -8687,8 +8687,8 @@ public static final void gtk_page_setup_set_top_margin(int /*long*/ setup, doubl
+@@ -8700,8 +8700,8 @@ public static final void gtk_page_setup_set_top_margin(int /*long*/ setup, doubl
}
}
/** @method flags=dynamic */
@@ -22682,7 +22709,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_page_setup_get_bottom_margin(setup, unit);
-@@ -8697,8 +8697,8 @@ public static final double gtk_page_setup_get_bottom_margin(int /*long*/ setup,
+@@ -8710,8 +8710,8 @@ public static final double gtk_page_setup_get_bottom_margin(int /*long*/ setup,
}
}
/** @method flags=dynamic */
@@ -22693,7 +22720,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_page_setup_set_bottom_margin(setup, margin, unit);
-@@ -8707,8 +8707,8 @@ public static final void gtk_page_setup_set_bottom_margin(int /*long*/ setup, do
+@@ -8720,8 +8720,8 @@ public static final void gtk_page_setup_set_bottom_margin(int /*long*/ setup, do
}
}
/** @method flags=dynamic */
@@ -22704,7 +22731,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_page_setup_get_left_margin(setup, unit);
-@@ -8717,8 +8717,8 @@ public static final double gtk_page_setup_get_left_margin(int /*long*/ setup, in
+@@ -8730,8 +8730,8 @@ public static final double gtk_page_setup_get_left_margin(int /*long*/ setup, in
}
}
/** @method flags=dynamic */
@@ -22715,7 +22742,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_page_setup_set_left_margin(setup, margin, unit);
-@@ -8727,8 +8727,8 @@ public static final void gtk_page_setup_set_left_margin(int /*long*/ setup, doub
+@@ -8740,8 +8740,8 @@ public static final void gtk_page_setup_set_left_margin(int /*long*/ setup, doub
}
}
/** @method flags=dynamic */
@@ -22726,7 +22753,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_page_setup_get_right_margin(setup, unit);
-@@ -8737,8 +8737,8 @@ public static final double gtk_page_setup_get_right_margin(int /*long*/ setup, i
+@@ -8750,8 +8750,8 @@ public static final double gtk_page_setup_get_right_margin(int /*long*/ setup, i
}
}
/** @method flags=dynamic */
@@ -22737,7 +22764,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_page_setup_set_right_margin(setup, margin, unit);
-@@ -8747,8 +8747,8 @@ public static final void gtk_page_setup_set_right_margin(int /*long*/ setup, dou
+@@ -8760,8 +8760,8 @@ public static final void gtk_page_setup_set_right_margin(int /*long*/ setup, dou
}
}
/** @method flags=dynamic */
@@ -22748,7 +22775,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_page_setup_get_paper_width(setup, unit);
-@@ -8757,8 +8757,8 @@ public static final double gtk_page_setup_get_paper_width(int /*long*/ setup, in
+@@ -8770,8 +8770,8 @@ public static final double gtk_page_setup_get_paper_width(int /*long*/ setup, in
}
}
/** @method flags=dynamic */
@@ -22759,7 +22786,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_page_setup_get_paper_height(setup, unit);
-@@ -8767,8 +8767,8 @@ public static final double gtk_page_setup_get_paper_height(int /*long*/ setup, i
+@@ -8780,8 +8780,8 @@ public static final double gtk_page_setup_get_paper_height(int /*long*/ setup, i
}
}
/** @method flags=dynamic */
@@ -22770,7 +22797,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_page_setup_get_page_width(setup, unit);
-@@ -8777,8 +8777,8 @@ public static final double gtk_page_setup_get_page_width(int /*long*/ setup, int
+@@ -8790,8 +8790,8 @@ public static final double gtk_page_setup_get_page_width(int /*long*/ setup, int
}
}
/** @method flags=dynamic */
@@ -22781,7 +22808,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_page_setup_get_page_height(setup, unit);
-@@ -8793,8 +8793,8 @@ public static final double gtk_page_setup_get_page_height(int /*long*/ setup, in
+@@ -8806,8 +8806,8 @@ public static final double gtk_page_setup_get_page_height(int /*long*/ setup, in
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22792,7 +22819,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_paint_handle(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
-@@ -8808,8 +8808,8 @@ public static final void gtk_paint_handle(int /*long*/ style, int /*long*/ windo
+@@ -8821,8 +8821,8 @@ public static final void gtk_paint_handle(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22803,7 +22830,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_paint_flat_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8824,8 +8824,8 @@ public static final void gtk_paint_flat_box(int /*long*/ style, int /*long*/ win
+@@ -8837,8 +8837,8 @@ public static final void gtk_paint_flat_box(int /*long*/ style, int /*long*/ win
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22814,7 +22841,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_paint_focus(style, window, state_type, area, widget, detail, x, y, width, height);
-@@ -8839,8 +8839,8 @@ public static final void gtk_paint_focus(int /*long*/ style, int /*long*/ window
+@@ -8852,8 +8852,8 @@ public static final void gtk_paint_focus(int /*long*/ style, int /*long*/ window
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22825,7 +22852,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_paint_option(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8854,8 +8854,8 @@ public static final void gtk_paint_option(int /*long*/ style, int /*long*/ windo
+@@ -8867,8 +8867,8 @@ public static final void gtk_paint_option(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22836,7 +22863,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_paint_slider(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
-@@ -8869,8 +8869,8 @@ public static final void gtk_paint_slider(int /*long*/ style, int /*long*/ windo
+@@ -8882,8 +8882,8 @@ public static final void gtk_paint_slider(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22847,7 +22874,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_paint_tab(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8884,8 +8884,8 @@ public static final void gtk_paint_tab(int /*long*/ style, int /*long*/ window,
+@@ -8897,8 +8897,8 @@ public static final void gtk_paint_tab(int /*long*/ style, int /*long*/ window,
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22858,7 +22885,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_paint_arrow(style, window, state_type, shadow_type, area, widget, detail, arrow_type, fill, x, y, width, height);
-@@ -8900,8 +8900,8 @@ public static final void gtk_paint_arrow(int /*long*/ style, int /*long*/ window
+@@ -8913,8 +8913,8 @@ public static final void gtk_paint_arrow(int /*long*/ style, int /*long*/ window
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22869,7 +22896,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_paint_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8915,8 +8915,8 @@ public static final void gtk_paint_box(int /*long*/ style, int /*long*/ window,
+@@ -8928,8 +8928,8 @@ public static final void gtk_paint_box(int /*long*/ style, int /*long*/ window,
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
@@ -22880,7 +22907,7 @@ index 62bc7a8..eb1efa2 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);
-@@ -8930,8 +8930,8 @@ public static final void gtk_paint_box_gap(int /*long*/ style, int /*long*/ wind
+@@ -8943,8 +8943,8 @@ public static final void gtk_paint_box_gap(int /*long*/ style, int /*long*/ wind
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22891,7 +22918,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_paint_check(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -8945,8 +8945,8 @@ public static final void gtk_paint_check(int /*long*/ style, int /*long*/ window
+@@ -8958,8 +8958,8 @@ public static final void gtk_paint_check(int /*long*/ style, int /*long*/ window
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22902,7 +22929,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_paint_expander(style, window, state_type, area, widget, detail, x, y, expander_style);
-@@ -8960,8 +8960,8 @@ public static final void gtk_paint_expander(int /*long*/ style, int /*long*/ win
+@@ -8973,8 +8973,8 @@ public static final void gtk_paint_expander(int /*long*/ style, int /*long*/ win
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
@@ -22913,7 +22940,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_paint_extension(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side);
-@@ -8975,8 +8975,8 @@ public static final void gtk_paint_extension(int /*long*/ style, int /*long*/ wi
+@@ -8988,8 +8988,8 @@ public static final void gtk_paint_extension(int /*long*/ style, int /*long*/ wi
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22924,7 +22951,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_paint_hline(style, window, state_type, area, widget, detail, x1, x2, y);
-@@ -8991,8 +8991,8 @@ public static final void gtk_paint_hline(int /*long*/ style, int /*long*/ window
+@@ -9004,8 +9004,8 @@ public static final void gtk_paint_hline(int /*long*/ style, int /*long*/ window
* @param detail cast=(const gchar *)
* @param layout cast=(PangoLayout *)
*/
@@ -22935,7 +22962,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_paint_layout(style, window, state_type, use_text, area, widget, detail, x, y, layout);
-@@ -9006,8 +9006,8 @@ public static final void gtk_paint_layout(int /*long*/ style, int /*long*/ windo
+@@ -9019,8 +9019,8 @@ public static final void gtk_paint_layout(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
@@ -22946,7 +22973,7 @@ index 62bc7a8..eb1efa2 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);
-@@ -9021,8 +9021,8 @@ public static final void gtk_paint_shadow_gap(int /*long*/ style, int /*long*/ w
+@@ -9034,8 +9034,8 @@ public static final void gtk_paint_shadow_gap(int /*long*/ style, int /*long*/ w
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
@@ -22957,7 +22984,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_paint_shadow(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -9036,8 +9036,8 @@ public static final void gtk_paint_shadow(int /*long*/ style, int /*long*/ windo
+@@ -9049,8 +9049,8 @@ public static final void gtk_paint_shadow(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -22968,7 +22995,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_paint_vline(style, window, state_type, area, widget, detail, y1, y2, x);
-@@ -9046,8 +9046,8 @@ public static final void gtk_paint_vline(int /*long*/ style, int /*long*/ window
+@@ -9059,8 +9059,8 @@ public static final void gtk_paint_vline(int /*long*/ style, int /*long*/ window
}
}
/** @method flags=dynamic */
@@ -22979,7 +23006,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_paper_size_free(size);
-@@ -9056,8 +9056,8 @@ public static final void gtk_paper_size_free(int /*long*/ size) {
+@@ -9069,8 +9069,8 @@ public static final void gtk_paper_size_free(int /*long*/ size) {
}
}
/** @method flags=dynamic */
@@ -22990,7 +23017,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_paper_size_new(name);
-@@ -9066,8 +9066,8 @@ public static final int /*long*/ gtk_paper_size_new(byte [] name) {
+@@ -9079,8 +9079,8 @@ public static final int /*long*/ gtk_paper_size_new(byte [] name) {
}
}
/** @method flags=dynamic */
@@ -23001,7 +23028,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_paper_size_new_from_ppd(ppd_name, ppd_display_name, width, height);
-@@ -9076,8 +9076,8 @@ public static final int /*long*/ gtk_paper_size_new_from_ppd(byte [] ppd_name, b
+@@ -9089,8 +9089,8 @@ public static final int /*long*/ gtk_paper_size_new_from_ppd(byte [] ppd_name, b
}
}
/** @method flags=dynamic */
@@ -23012,7 +23039,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_paper_size_new_custom(name, display_name, width, height, unit);
-@@ -9086,8 +9086,8 @@ public static final int /*long*/ gtk_paper_size_new_custom(byte [] name, byte []
+@@ -9099,8 +9099,8 @@ public static final int /*long*/ gtk_paper_size_new_custom(byte [] name, byte []
}
}
/** @method flags=dynamic */
@@ -23023,7 +23050,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_paper_size_get_name(size);
-@@ -9096,8 +9096,8 @@ public static final int /*long*/ gtk_paper_size_get_name(int /*long*/ size) {
+@@ -9109,8 +9109,8 @@ public static final int /*long*/ gtk_paper_size_get_name(int /*long*/ size) {
}
}
/** @method flags=dynamic */
@@ -23034,7 +23061,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_paper_size_get_display_name(size);
-@@ -9106,8 +9106,8 @@ public static final int /*long*/ gtk_paper_size_get_display_name(int /*long*/ si
+@@ -9119,8 +9119,8 @@ public static final int /*long*/ gtk_paper_size_get_display_name(int /*long*/ si
}
}
/** @method flags=dynamic */
@@ -23045,7 +23072,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_paper_size_get_ppd_name(size);
-@@ -9116,8 +9116,8 @@ public static final int /*long*/ gtk_paper_size_get_ppd_name(int /*long*/ size)
+@@ -9129,8 +9129,8 @@ public static final int /*long*/ gtk_paper_size_get_ppd_name(int /*long*/ size)
}
}
/** @method flags=dynamic */
@@ -23056,7 +23083,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_paper_size_get_width(size, unit);
-@@ -9126,8 +9126,8 @@ public static final double gtk_paper_size_get_width(int /*long*/ size, int unit)
+@@ -9139,8 +9139,8 @@ public static final double gtk_paper_size_get_width(int /*long*/ size, int unit)
}
}
/** @method flags=dynamic */
@@ -23067,7 +23094,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_paper_size_get_height(size, unit);
-@@ -9136,8 +9136,8 @@ public static final double gtk_paper_size_get_height(int /*long*/ size, int unit
+@@ -9149,8 +9149,8 @@ public static final double gtk_paper_size_get_height(int /*long*/ size, int unit
}
}
/** @method flags=dynamic */
@@ -23078,7 +23105,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_paper_size_is_custom(size);
-@@ -9146,8 +9146,8 @@ public static final boolean gtk_paper_size_is_custom(int /*long*/ size) {
+@@ -9159,8 +9159,8 @@ public static final boolean gtk_paper_size_is_custom(int /*long*/ size) {
}
}
/** @param plug cast=(GtkPlug *) */
@@ -23089,7 +23116,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_plug_get_id(plug);
-@@ -9155,8 +9155,8 @@ public static final int /*long*/ gtk_plug_get_id(int /*long*/ plug) {
+@@ -9168,8 +9168,8 @@ public static final int /*long*/ gtk_plug_get_id(int /*long*/ plug) {
lock.unlock();
}
}
@@ -23100,7 +23127,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_plug_new(socket_id);
-@@ -9165,8 +9165,8 @@ public static final int /*long*/ gtk_plug_new(int /*long*/ socket_id) {
+@@ -9178,8 +9178,8 @@ public static final int /*long*/ gtk_plug_new(int /*long*/ socket_id) {
}
}
/** @method flags=dynamic */
@@ -23111,7 +23138,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_printer_get_backend(printer);
-@@ -9175,8 +9175,8 @@ public static final int /*long*/ gtk_printer_get_backend(int /*long*/ printer) {
+@@ -9188,8 +9188,8 @@ public static final int /*long*/ gtk_printer_get_backend(int /*long*/ printer) {
}
}
/** @method flags=dynamic */
@@ -23122,7 +23149,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_printer_get_name(printer);
-@@ -9185,8 +9185,8 @@ public static final int /*long*/ gtk_printer_get_name(int /*long*/ printer) {
+@@ -9198,8 +9198,8 @@ public static final int /*long*/ gtk_printer_get_name(int /*long*/ printer) {
}
}
/** @method flags=dynamic */
@@ -23133,7 +23160,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_printer_is_default(printer);
-@@ -9200,8 +9200,8 @@ public static final boolean gtk_printer_is_default(int /*long*/ printer) {
+@@ -9213,8 +9213,8 @@ public static final boolean gtk_printer_is_default(int /*long*/ printer) {
* @param destroy cast=(GDestroyNotify)
* @param wait cast=(gboolean)
*/
@@ -23144,7 +23171,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_enumerate_printers(func, data, destroy, wait);
-@@ -9213,8 +9213,8 @@ public static final void gtk_enumerate_printers(int /*long*/ func, int /*long*/d
+@@ -9226,8 +9226,8 @@ public static final void gtk_enumerate_printers(int /*long*/ func, int /*long*/d
* @method flags=dynamic
* @param title cast=(const gchar *)
*/
@@ -23155,7 +23182,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_job_new(title, printer, settings, page_setup);
-@@ -9223,8 +9223,8 @@ public static final int /*long*/ gtk_print_job_new(byte[] title, int /*long*/ pr
+@@ -9236,8 +9236,8 @@ public static final int /*long*/ gtk_print_job_new(byte[] title, int /*long*/ pr
}
}
/** @method flags=dynamic */
@@ -23166,7 +23193,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_job_get_settings(job);
-@@ -9233,8 +9233,8 @@ public static final int /*long*/ gtk_print_job_get_settings(int /*long*/ job) {
+@@ -9246,8 +9246,8 @@ public static final int /*long*/ gtk_print_job_get_settings(int /*long*/ job) {
}
}
/** @method flags=dynamic */
@@ -23177,7 +23204,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_job_get_printer(job);
-@@ -9243,8 +9243,8 @@ public static final int /*long*/ gtk_print_job_get_printer(int /*long*/ job) {
+@@ -9256,8 +9256,8 @@ public static final int /*long*/ gtk_print_job_get_printer(int /*long*/ job) {
}
}
/** @method flags=dynamic */
@@ -23188,7 +23215,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_job_get_title(job);
-@@ -9253,8 +9253,8 @@ public static final int /*long*/ gtk_print_job_get_title(int /*long*/ job) {
+@@ -9266,8 +9266,8 @@ public static final int /*long*/ gtk_print_job_get_title(int /*long*/ job) {
}
}
/** @method flags=dynamic */
@@ -23199,7 +23226,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_job_get_status(job);
-@@ -9267,8 +9267,8 @@ public static final int gtk_print_job_get_status(int /*long*/ job) {
+@@ -9280,8 +9280,8 @@ public static final int gtk_print_job_get_status(int /*long*/ job) {
* @param filename cast=(const gchar *)
* @param error cast=(GError **)
*/
@@ -23210,7 +23237,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_job_set_source_file(job, filename, error);
-@@ -9280,8 +9280,8 @@ public static final boolean gtk_print_job_set_source_file(int /*long*/ job, byte
+@@ -9293,8 +9293,8 @@ public static final boolean gtk_print_job_set_source_file(int /*long*/ job, byte
* @method flags=dynamic
* @param error cast=(GError **)
*/
@@ -23221,7 +23248,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_job_get_surface(job, error);
-@@ -9294,8 +9294,8 @@ public static final int /*long*/ gtk_print_job_get_surface(int /*long*/ job, int
+@@ -9307,8 +9307,8 @@ public static final int /*long*/ gtk_print_job_get_surface(int /*long*/ job, int
* @param user_data cast=(gpointer)
* @param dnotify cast=(GDestroyNotify)
*/
@@ -23232,7 +23259,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_print_job_send(job, callback, user_data, dnotify);
-@@ -9304,8 +9304,8 @@ public static final void gtk_print_job_send(int /*long*/ job, int /*long*/ callb
+@@ -9317,8 +9317,8 @@ public static final void gtk_print_job_send(int /*long*/ job, int /*long*/ callb
}
}
/** @method flags=dynamic */
@@ -23243,7 +23270,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_settings_new();
-@@ -9317,8 +9317,8 @@ public static final int /*long*/ gtk_print_settings_new() {
+@@ -9330,8 +9330,8 @@ public static final int /*long*/ gtk_print_settings_new() {
* @method flags=dynamic
* @param data cast=(gpointer)
*/
@@ -23254,7 +23281,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_print_settings_foreach(settings, func, data);
-@@ -9330,8 +9330,8 @@ public static final void gtk_print_settings_foreach(int /*long*/ settings, int /
+@@ -9343,8 +9343,8 @@ public static final void gtk_print_settings_foreach(int /*long*/ settings, int /
* @method flags=dynamic
* @param key cast=(const gchar *)
*/
@@ -23265,7 +23292,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_settings_get(settings, key);
-@@ -9344,8 +9344,8 @@ public static final int /*long*/ gtk_print_settings_get(int /*long*/ settings, b
+@@ -9357,8 +9357,8 @@ public static final int /*long*/ gtk_print_settings_get(int /*long*/ settings, b
* @param key cast=(const gchar *)
* @param value cast=(const gchar *)
*/
@@ -23276,7 +23303,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_print_settings_set(settings, key, value);
-@@ -9354,8 +9354,8 @@ public static final void gtk_print_settings_set(int /*long*/ settings, byte [] k
+@@ -9367,8 +9367,8 @@ public static final void gtk_print_settings_set(int /*long*/ settings, byte [] k
}
}
/** @method flags=dynamic */
@@ -23287,7 +23314,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_settings_get_printer(settings);
-@@ -9364,8 +9364,8 @@ public static final int /*long*/ gtk_print_settings_get_printer(int /*long*/ set
+@@ -9377,8 +9377,8 @@ public static final int /*long*/ gtk_print_settings_get_printer(int /*long*/ set
}
}
/** @method flags=dynamic */
@@ -23298,7 +23325,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_print_settings_set_printer(settings, printer);
-@@ -9374,8 +9374,8 @@ public static final void gtk_print_settings_set_printer(int /*long*/ settings, b
+@@ -9387,8 +9387,8 @@ public static final void gtk_print_settings_set_printer(int /*long*/ settings, b
}
}
/** @method flags=dynamic */
@@ -23309,7 +23336,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_settings_get_orientation(settings);
-@@ -9384,8 +9384,8 @@ public static final int gtk_print_settings_get_orientation(int /*long*/ settings
+@@ -9397,8 +9397,8 @@ public static final int gtk_print_settings_get_orientation(int /*long*/ settings
}
}
/** @method flags=dynamic */
@@ -23320,7 +23347,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_print_settings_set_orientation(settings, orientation);
-@@ -9394,8 +9394,8 @@ public static final void gtk_print_settings_set_orientation(int /*long*/ setting
+@@ -9407,8 +9407,8 @@ public static final void gtk_print_settings_set_orientation(int /*long*/ setting
}
}
/** @method flags=dynamic */
@@ -23331,7 +23358,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_settings_get_collate(settings);
-@@ -9407,8 +9407,8 @@ public static final boolean gtk_print_settings_get_collate(int /*long*/ settings
+@@ -9420,8 +9420,8 @@ public static final boolean gtk_print_settings_get_collate(int /*long*/ settings
* @method flags=dynamic
* @param collate cast=(gboolean)
*/
@@ -23342,7 +23369,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_print_settings_set_collate(settings, collate);
-@@ -9417,8 +9417,8 @@ public static final void gtk_print_settings_set_collate(int /*long*/ settings, b
+@@ -9430,8 +9430,8 @@ public static final void gtk_print_settings_set_collate(int /*long*/ settings, b
}
}
/** @method flags=dynamic */
@@ -23353,7 +23380,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_settings_get_duplex(settings);
-@@ -9427,8 +9427,8 @@ public static final int gtk_print_settings_get_duplex(int /*long*/ settings) {
+@@ -9440,8 +9440,8 @@ public static final int gtk_print_settings_get_duplex(int /*long*/ settings) {
}
}
/** @method flags=dynamic */
@@ -23364,7 +23391,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_print_settings_set_duplex(settings, duplex);
-@@ -9437,8 +9437,8 @@ public static final void gtk_print_settings_set_duplex(int /*long*/ settings, in
+@@ -9450,8 +9450,8 @@ public static final void gtk_print_settings_set_duplex(int /*long*/ settings, in
}
}
/** @method flags=dynamic */
@@ -23375,7 +23402,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_settings_get_n_copies(settings);
-@@ -9450,8 +9450,8 @@ public static final int gtk_print_settings_get_n_copies(int /*long*/ settings) {
+@@ -9463,8 +9463,8 @@ public static final int gtk_print_settings_get_n_copies(int /*long*/ settings) {
* @method flags=dynamic
* @param num_copies cast=(gint)
*/
@@ -23386,7 +23413,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_print_settings_set_n_copies(settings, num_copies);
-@@ -9460,8 +9460,8 @@ public static final void gtk_print_settings_set_n_copies(int /*long*/ settings,
+@@ -9473,8 +9473,8 @@ public static final void gtk_print_settings_set_n_copies(int /*long*/ settings,
}
}
/** @method flags=dynamic */
@@ -23397,7 +23424,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_settings_get_print_pages(settings);
-@@ -9470,8 +9470,8 @@ public static final int gtk_print_settings_get_print_pages(int /*long*/ settings
+@@ -9483,8 +9483,8 @@ public static final int gtk_print_settings_get_print_pages(int /*long*/ settings
}
}
/** @method flags=dynamic */
@@ -23408,7 +23435,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_print_settings_set_print_pages(settings, pages);
-@@ -9483,8 +9483,8 @@ public static final void gtk_print_settings_set_print_pages(int /*long*/ setting
+@@ -9496,8 +9496,8 @@ public static final void gtk_print_settings_set_print_pages(int /*long*/ setting
* @method flags=dynamic
* @param num_ranges cast=(gint *)
*/
@@ -23419,7 +23446,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_settings_get_page_ranges(settings, num_ranges);
-@@ -9496,8 +9496,8 @@ public static final int /*long*/ gtk_print_settings_get_page_ranges(int /*long*/
+@@ -9509,8 +9509,8 @@ public static final int /*long*/ gtk_print_settings_get_page_ranges(int /*long*/
* @method flags=dynamic
* @param num_ranges cast=(gint)
*/
@@ -23430,7 +23457,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_print_settings_set_page_ranges(settings, page_ranges, num_ranges);
-@@ -9506,8 +9506,8 @@ public static final void gtk_print_settings_set_page_ranges(int /*long*/ setting
+@@ -9519,8 +9519,8 @@ public static final void gtk_print_settings_set_page_ranges(int /*long*/ setting
}
}
/** @method flags=dynamic */
@@ -23441,7 +23468,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_settings_get_paper_width(settings, unit);
-@@ -9516,8 +9516,8 @@ public static final double gtk_print_settings_get_paper_width(int /*long*/ setti
+@@ -9529,8 +9529,8 @@ public static final double gtk_print_settings_get_paper_width(int /*long*/ setti
}
}
/** @method flags=dynamic */
@@ -23452,7 +23479,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_settings_get_paper_height(settings, unit);
-@@ -9526,8 +9526,8 @@ public static final double gtk_print_settings_get_paper_height(int /*long*/ sett
+@@ -9539,8 +9539,8 @@ public static final double gtk_print_settings_get_paper_height(int /*long*/ sett
}
}
/** @method flags=dynamic */
@@ -23463,7 +23490,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_settings_get_resolution(settings);
-@@ -9540,8 +9540,8 @@ public static final int gtk_print_settings_get_resolution(int /*long*/ settings)
+@@ -9553,8 +9553,8 @@ public static final int gtk_print_settings_get_resolution(int /*long*/ settings)
* @param title cast=(const gchar *)
* @param parent cast=(GtkWindow *)
*/
@@ -23474,7 +23501,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_unix_dialog_new(title, parent);
-@@ -9550,8 +9550,8 @@ public static final int /*long*/ gtk_print_unix_dialog_new(byte[] title, int /*l
+@@ -9563,8 +9563,8 @@ public static final int /*long*/ gtk_print_unix_dialog_new(byte[] title, int /*l
}
}
/** @method flags=dynamic */
@@ -23485,7 +23512,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_print_unix_dialog_set_embed_page_setup(dialog, embed);
-@@ -9560,8 +9560,8 @@ public static final void gtk_print_unix_dialog_set_embed_page_setup(int /*long*/
+@@ -9573,8 +9573,8 @@ public static final void gtk_print_unix_dialog_set_embed_page_setup(int /*long*/
}
}
/** @method flags=dynamic */
@@ -23496,7 +23523,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_print_unix_dialog_set_page_setup(dialog, page_setup);
-@@ -9570,8 +9570,8 @@ public static final void gtk_print_unix_dialog_set_page_setup(int /*long*/ dialo
+@@ -9583,8 +9583,8 @@ public static final void gtk_print_unix_dialog_set_page_setup(int /*long*/ dialo
}
}
/** @method flags=dynamic */
@@ -23507,7 +23534,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_unix_dialog_get_page_setup(dialog);
-@@ -9583,8 +9583,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_page_setup(int /*long
+@@ -9596,8 +9596,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_page_setup(int /*long
* @method flags=dynamic
* @param current_page cast=(gint)
*/
@@ -23518,7 +23545,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_print_unix_dialog_set_current_page(dialog, current_page);
-@@ -9593,8 +9593,8 @@ public static final void gtk_print_unix_dialog_set_current_page(int /*long*/ dia
+@@ -9606,8 +9606,8 @@ public static final void gtk_print_unix_dialog_set_current_page(int /*long*/ dia
}
}
/** @method flags=dynamic */
@@ -23529,7 +23556,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_unix_dialog_get_current_page(dialog);
-@@ -9603,8 +9603,8 @@ public static final int gtk_print_unix_dialog_get_current_page(int /*long*/ dial
+@@ -9616,8 +9616,8 @@ public static final int gtk_print_unix_dialog_get_current_page(int /*long*/ dial
}
}
/** @method flags=dynamic */
@@ -23540,7 +23567,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_print_unix_dialog_set_settings(dialog, settings);
-@@ -9613,8 +9613,8 @@ public static final void gtk_print_unix_dialog_set_settings(int /*long*/ dialog,
+@@ -9626,8 +9626,8 @@ public static final void gtk_print_unix_dialog_set_settings(int /*long*/ dialog,
}
}
/** @method flags=dynamic */
@@ -23551,7 +23578,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_unix_dialog_get_settings(dialog);
-@@ -9623,8 +9623,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_settings(int /*long*/
+@@ -9636,8 +9636,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_settings(int /*long*/
}
}
/** @method flags=dynamic */
@@ -23562,7 +23589,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_print_unix_dialog_get_selected_printer(dialog);
-@@ -9633,8 +9633,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_selected_printer(int
+@@ -9646,8 +9646,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_selected_printer(int
}
}
/** @method flags=dynamic */
@@ -23573,7 +23600,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_print_unix_dialog_set_manual_capabilities(dialog, capabilities);
-@@ -9642,8 +9642,8 @@ public static final void gtk_print_unix_dialog_set_manual_capabilities(int /*lon
+@@ -9655,8 +9655,8 @@ public static final void gtk_print_unix_dialog_set_manual_capabilities(int /*lon
lock.unlock();
}
}
@@ -23584,7 +23611,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_progress_bar_new();
-@@ -9652,8 +9652,8 @@ public static final int /*long*/ gtk_progress_bar_new() {
+@@ -9665,8 +9665,8 @@ public static final int /*long*/ gtk_progress_bar_new() {
}
}
/** @param pbar cast=(GtkProgressBar *) */
@@ -23595,7 +23622,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_progress_bar_pulse(pbar);
-@@ -9665,8 +9665,8 @@ public static final void gtk_progress_bar_pulse(int /*long*/ pbar) {
+@@ -9678,8 +9678,8 @@ public static final void gtk_progress_bar_pulse(int /*long*/ pbar) {
* @param pbar cast=(GtkProgressBar *)
* @param fraction cast=(gdouble)
*/
@@ -23606,7 +23633,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_progress_bar_set_fraction(pbar, fraction);
-@@ -9678,8 +9678,8 @@ public static final void gtk_progress_bar_set_fraction(int /*long*/ pbar, double
+@@ -9691,8 +9691,8 @@ public static final void gtk_progress_bar_set_fraction(int /*long*/ pbar, double
* @param pbar cast=(GtkProgressBar *)
* @param orientation cast=(GtkProgressBarOrientation)
*/
@@ -23617,7 +23644,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_progress_bar_set_orientation(pbar, orientation);
-@@ -9688,8 +9688,8 @@ public static final void gtk_progress_bar_set_orientation(int /*long*/ pbar, int
+@@ -9701,8 +9701,8 @@ public static final void gtk_progress_bar_set_orientation(int /*long*/ pbar, int
}
}
/** @param radio_button cast=(GtkRadioButton *) */
@@ -23628,7 +23655,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_radio_button_get_group(radio_button);
-@@ -9698,8 +9698,8 @@ public static final int /*long*/ gtk_radio_button_get_group(int /*long*/ radio_b
+@@ -9711,8 +9711,8 @@ public static final int /*long*/ gtk_radio_button_get_group(int /*long*/ radio_b
}
}
/** @param group cast=(GSList *) */
@@ -23639,7 +23666,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_radio_button_new(group);
-@@ -9708,8 +9708,8 @@ public static final int /*long*/ gtk_radio_button_new(int /*long*/ group) {
+@@ -9721,8 +9721,8 @@ public static final int /*long*/ gtk_radio_button_new(int /*long*/ group) {
}
}
/** @param radio_menu_item cast=(GtkRadioMenuItem *) */
@@ -23650,7 +23677,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_radio_menu_item_get_group(radio_menu_item);
-@@ -9718,8 +9718,8 @@ public static final int /*long*/ gtk_radio_menu_item_get_group(int /*long*/ radi
+@@ -9731,8 +9731,8 @@ public static final int /*long*/ gtk_radio_menu_item_get_group(int /*long*/ radi
}
}
/** @param group cast=(GSList *) */
@@ -23661,7 +23688,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_radio_menu_item_new(group);
-@@ -9731,8 +9731,8 @@ public static final int /*long*/ gtk_radio_menu_item_new(int /*long*/ group) {
+@@ -9744,8 +9744,8 @@ public static final int /*long*/ gtk_radio_menu_item_new(int /*long*/ group) {
* @param group cast=(GSList *)
* @param label cast=(const gchar *)
*/
@@ -23672,7 +23699,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_radio_menu_item_new_with_label(group, label);
-@@ -9741,8 +9741,8 @@ public static final int /*long*/ gtk_radio_menu_item_new_with_label(int /*long*/
+@@ -9754,8 +9754,8 @@ public static final int /*long*/ gtk_radio_menu_item_new_with_label(int /*long*/
}
}
/** @param range cast=(GtkRange *) */
@@ -23683,7 +23710,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_range_get_adjustment(range);
-@@ -9751,8 +9751,8 @@ public static final int /*long*/ gtk_range_get_adjustment(int /*long*/ range) {
+@@ -9764,8 +9764,8 @@ public static final int /*long*/ gtk_range_get_adjustment(int /*long*/ range) {
}
}
/** @param range cast=(GtkRange *) */
@@ -23694,7 +23721,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_range_set_increments(range, step, page);
-@@ -9761,8 +9761,8 @@ public static final void gtk_range_set_increments(int /*long*/ range, double ste
+@@ -9774,8 +9774,8 @@ public static final void gtk_range_set_increments(int /*long*/ range, double ste
}
}
/** @param range cast=(GtkRange *) */
@@ -23705,7 +23732,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_range_set_inverted(range, setting);
-@@ -9771,8 +9771,8 @@ public static final void gtk_range_set_inverted(int /*long*/ range, boolean sett
+@@ -9784,8 +9784,8 @@ public static final void gtk_range_set_inverted(int /*long*/ range, boolean sett
}
}
/** @param range cast=(GtkRange *) */
@@ -23716,7 +23743,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_range_set_range(range, min, max);
-@@ -9781,8 +9781,8 @@ public static final void gtk_range_set_range(int /*long*/ range, double min, dou
+@@ -9794,8 +9794,8 @@ public static final void gtk_range_set_range(int /*long*/ range, double min, dou
}
}
/** @param range cast=(GtkRange *) */
@@ -23727,7 +23754,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_range_set_value(range, value);
-@@ -9801,8 +9801,8 @@ public static final void gtk_rc_parse_string(byte[] rc_string) {
+@@ -9814,8 +9814,8 @@ public static final void gtk_rc_parse_string(byte[] rc_string) {
}
}
/** @param style cast=(GtkRcStyle *) */
@@ -23738,7 +23765,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_rc_style_get_bg_pixmap_name(style, index);
-@@ -9811,8 +9811,8 @@ public static final int /*long*/ gtk_rc_style_get_bg_pixmap_name(int /*long*/ st
+@@ -9824,8 +9824,8 @@ public static final int /*long*/ gtk_rc_style_get_bg_pixmap_name(int /*long*/ st
}
}
/** @param style cast=(GtkRcStyle *) */
@@ -23749,7 +23776,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_rc_style_get_color_flags(style, index);
-@@ -9824,8 +9824,8 @@ public static final int gtk_rc_style_get_color_flags(int /*long*/ style, int ind
+@@ -9837,8 +9837,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
*/
@@ -23760,7 +23787,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_rc_style_set_bg(style, index, color);
-@@ -9837,8 +9837,8 @@ public static final void gtk_rc_style_set_bg(int /*long*/ style, int index, GdkC
+@@ -9850,8 +9850,8 @@ public static final void gtk_rc_style_set_bg(int /*long*/ style, int index, GdkC
* @param style cast=(GtkRcStyle *)
* @param name cast=(char *)
*/
@@ -23771,7 +23798,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_rc_style_set_bg_pixmap_name(style, index, name);
-@@ -9847,8 +9847,8 @@ public static final void gtk_rc_style_set_bg_pixmap_name(int /*long*/ style, int
+@@ -9860,8 +9860,8 @@ public static final void gtk_rc_style_set_bg_pixmap_name(int /*long*/ style, int
}
}
/** @param style cast=(GtkRcStyle *) */
@@ -23782,7 +23809,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_rc_style_set_color_flags(style, index, flag);
-@@ -9860,8 +9860,8 @@ public static final void gtk_rc_style_set_color_flags(int /*long*/ style, int in
+@@ -9873,8 +9873,8 @@ public static final void gtk_rc_style_set_color_flags(int /*long*/ style, int in
* @param scale cast=(GtkScale *)
* @param digits cast=(gint)
*/
@@ -23793,7 +23820,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_scale_set_digits(scale, digits);
-@@ -9873,8 +9873,8 @@ public static final void gtk_scale_set_digits(int /*long*/ scale, int digits) {
+@@ -9886,8 +9886,8 @@ public static final void gtk_scale_set_digits(int /*long*/ scale, int digits) {
* @param scale cast=(GtkScale *)
* @param draw_value cast=(gboolean)
*/
@@ -23804,7 +23831,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_scale_set_draw_value(scale, draw_value);
-@@ -9886,8 +9886,8 @@ public static final void gtk_scale_set_draw_value(int /*long*/ scale, boolean dr
+@@ -9899,8 +9899,8 @@ public static final void gtk_scale_set_draw_value(int /*long*/ scale, boolean dr
* @param style cast=(GtkRcStyle *)
* @param color flags=no_out
*/
@@ -23815,7 +23842,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_rc_style_set_fg(style, index, color);
-@@ -9899,8 +9899,8 @@ public static final void gtk_rc_style_set_fg(int /*long*/ style, int index, GdkC
+@@ -9912,8 +9912,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
*/
@@ -23826,7 +23853,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_rc_style_set_text(style, index, color);
-@@ -9912,8 +9912,8 @@ public static final void gtk_rc_style_set_text(int /*long*/ style, int index, Gd
+@@ -9925,8 +9925,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 *)
*/
@@ -23837,7 +23864,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_scrolled_window_add_with_viewport(scrolled_window, child);
-@@ -9922,8 +9922,8 @@ public static final void gtk_scrolled_window_add_with_viewport(int /*long*/ scro
+@@ -9935,8 +9935,8 @@ public static final void gtk_scrolled_window_add_with_viewport(int /*long*/ scro
}
}
/** @param scrolled_window cast=(GtkScrolledWindow *) */
@@ -23848,7 +23875,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_scrolled_window_get_hadjustment(scrolled_window);
-@@ -9936,8 +9936,8 @@ public static final int /*long*/ gtk_scrolled_window_get_hadjustment(int /*long*
+@@ -9949,8 +9949,8 @@ public static final int /*long*/ gtk_scrolled_window_get_hadjustment(int /*long*
* @param hscrollbar_policy cast=(GtkPolicyType *)
* @param vscrollbar_policy cast=(GtkPolicyType *)
*/
@@ -23859,7 +23886,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_scrolled_window_get_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy);
-@@ -9946,8 +9946,8 @@ public static final void gtk_scrolled_window_get_policy(int /*long*/ scrolled_wi
+@@ -9959,8 +9959,8 @@ public static final void gtk_scrolled_window_get_policy(int /*long*/ scrolled_wi
}
}
/** @param scrolled_window cast=(GtkScrolledWindow *) */
@@ -23870,7 +23897,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_scrolled_window_get_shadow_type(scrolled_window);
-@@ -9956,8 +9956,8 @@ public static final int gtk_scrolled_window_get_shadow_type(int /*long*/ scrolle
+@@ -9969,8 +9969,8 @@ public static final int gtk_scrolled_window_get_shadow_type(int /*long*/ scrolle
}
}
/** @param scrolled_window cast=(GtkScrolledWindow *) */
@@ -23881,7 +23908,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_scrolled_window_get_vadjustment(scrolled_window);
-@@ -9969,8 +9969,8 @@ public static final int /*long*/ gtk_scrolled_window_get_vadjustment(int /*long*
+@@ -9982,8 +9982,8 @@ public static final int /*long*/ gtk_scrolled_window_get_vadjustment(int /*long*
* @param hadjustment cast=(GtkAdjustment *)
* @param vadjustment cast=(GtkAdjustment *)
*/
@@ -23892,7 +23919,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_scrolled_window_new(hadjustment, vadjustment);
-@@ -9982,8 +9982,8 @@ public static final int /*long*/ gtk_scrolled_window_new(int /*long*/ hadjustmen
+@@ -9995,8 +9995,8 @@ public static final int /*long*/ gtk_scrolled_window_new(int /*long*/ hadjustmen
* @param scrolled_window cast=(GtkScrolledWindow *)
* @param placement cast=(GtkCornerType)
*/
@@ -23903,7 +23930,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_scrolled_window_set_placement(scrolled_window, placement);
-@@ -9996,8 +9996,8 @@ public static final void gtk_scrolled_window_set_placement(int /*long*/ scrolled
+@@ -10009,8 +10009,8 @@ public static final void gtk_scrolled_window_set_placement(int /*long*/ scrolled
* @param hscrollbar_policy cast=(GtkPolicyType)
* @param vscrollbar_policy cast=(GtkPolicyType)
*/
@@ -23914,7 +23941,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_scrolled_window_set_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy);
-@@ -10009,8 +10009,8 @@ public static final void gtk_scrolled_window_set_policy(int /*long*/ scrolled_wi
+@@ -10022,8 +10022,8 @@ public static final void gtk_scrolled_window_set_policy(int /*long*/ scrolled_wi
* @param scrolled_window cast=(GtkScrolledWindow *)
* @param type cast=(GtkShadowType)
*/
@@ -23925,7 +23952,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_scrolled_window_set_shadow_type(scrolled_window, type);
-@@ -10018,8 +10018,8 @@ public static final void gtk_scrolled_window_set_shadow_type(int /*long*/ scroll
+@@ -10031,8 +10031,8 @@ public static final void gtk_scrolled_window_set_shadow_type(int /*long*/ scroll
lock.unlock();
}
}
@@ -23936,7 +23963,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_settings_get_default();
-@@ -10033,8 +10033,8 @@ public static final int /*long*/ gtk_settings_get_default() {
+@@ -10046,8 +10046,8 @@ public static final int /*long*/ gtk_settings_get_default() {
* @param v_string cast=(const gchar *)
* @param origin cast=(const gchar *)
*/
@@ -23947,7 +23974,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_settings_set_string_property(settings, name, v_string, origin);
-@@ -10043,8 +10043,8 @@ public static final void gtk_settings_set_string_property(int /*long*/ settings,
+@@ -10056,8 +10056,8 @@ public static final void gtk_settings_set_string_property(int /*long*/ settings,
}
}
/** @param selection_data cast=(GtkSelectionData *) */
@@ -23958,7 +23985,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_selection_data_free(selection_data);
-@@ -10059,8 +10059,8 @@ public static final void gtk_selection_data_free(int /*long*/ selection_data) {
+@@ -10072,8 +10072,8 @@ public static final void gtk_selection_data_free(int /*long*/ selection_data) {
* @param data cast=(const guchar *)
* @param length cast=(gint)
*/
@@ -23969,7 +23996,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_selection_data_set(selection_data, type, format, data, length);
-@@ -10068,8 +10068,8 @@ public static final void gtk_selection_data_set(int /*long*/ selection_data, int
+@@ -10081,8 +10081,8 @@ public static final void gtk_selection_data_set(int /*long*/ selection_data, int
lock.unlock();
}
}
@@ -23980,7 +24007,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_separator_menu_item_new();
-@@ -10077,8 +10077,8 @@ public static final int /*long*/ gtk_separator_menu_item_new() {
+@@ -10090,8 +10090,8 @@ public static final int /*long*/ gtk_separator_menu_item_new() {
lock.unlock();
}
}
@@ -23991,7 +24018,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_separator_tool_item_new();
-@@ -10090,8 +10090,8 @@ public static final int /*long*/ gtk_separator_tool_item_new() {
+@@ -10103,8 +10103,8 @@ public static final int /*long*/ gtk_separator_tool_item_new() {
* @param item cast=(GtkSeparatorToolItem *)
* @param draw cast=(gboolean)
*/
@@ -24002,7 +24029,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_separator_tool_item_set_draw(item, draw);
-@@ -10100,8 +10100,8 @@ public static final void gtk_separator_tool_item_set_draw(int /*long*/ item, boo
+@@ -10113,8 +10113,8 @@ public static final void gtk_separator_tool_item_set_draw(int /*long*/ item, boo
}
}
/** @method flags=dynamic */
@@ -24013,7 +24040,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_set_locale();
-@@ -10110,8 +10110,8 @@ public static final int /*long*/ gtk_set_locale() {
+@@ -10123,8 +10123,8 @@ public static final int /*long*/ gtk_set_locale() {
}
}
/** @param socket cast=(GtkSocket *) */
@@ -24024,7 +24051,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_socket_get_id(socket);
-@@ -10119,8 +10119,8 @@ public static final int /*long*/ gtk_socket_get_id(int /*long*/ socket) {
+@@ -10132,8 +10132,8 @@ public static final int /*long*/ gtk_socket_get_id(int /*long*/ socket) {
lock.unlock();
}
}
@@ -24035,7 +24062,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_socket_new();
-@@ -10129,8 +10129,8 @@ public static final int /*long*/ gtk_socket_new() {
+@@ -10142,8 +10142,8 @@ public static final int /*long*/ gtk_socket_new() {
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -24046,7 +24073,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_spin_button_new(adjustment, climb_rate, digits);
-@@ -10142,8 +10142,8 @@ public static final int /*long*/ gtk_spin_button_new(int /*long*/ adjustment, do
+@@ -10155,8 +10155,8 @@ public static final int /*long*/ gtk_spin_button_new(int /*long*/ adjustment, do
* @param spin_button cast=(GtkSpinButton*)
* @param adjustment cast=(GtkAdjustment *)
**/
@@ -24057,7 +24084,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_spin_button_configure(spin_button, adjustment, climb_rate, digits);
-@@ -10152,8 +10152,8 @@ public static final void gtk_spin_button_configure(int /*long*/ spin_button, int
+@@ -10165,8 +10165,8 @@ public static final void gtk_spin_button_configure(int /*long*/ spin_button, int
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -24068,7 +24095,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_spin_button_get_adjustment(spin_button);
-@@ -10163,8 +10163,8 @@ public static final int /*long*/ gtk_spin_button_get_adjustment(int /*long*/ spi
+@@ -10176,8 +10176,8 @@ public static final int /*long*/ gtk_spin_button_get_adjustment(int /*long*/ spi
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -24079,7 +24106,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_spin_button_get_digits(spin_button);
-@@ -10173,8 +10173,8 @@ public static final int gtk_spin_button_get_digits(int /*long*/ spin_button) {
+@@ -10186,8 +10186,8 @@ public static final int gtk_spin_button_get_digits(int /*long*/ spin_button) {
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -24090,7 +24117,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_spin_button_set_digits(spin_button, digits);
-@@ -10183,8 +10183,8 @@ public static final void gtk_spin_button_set_digits(int /*long*/ spin_button, in
+@@ -10196,8 +10196,8 @@ public static final void gtk_spin_button_set_digits(int /*long*/ spin_button, in
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -24101,7 +24128,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_spin_button_set_increments(spin_button, step, page);
-@@ -10193,8 +10193,8 @@ public static final void gtk_spin_button_set_increments(int /*long*/ spin_button
+@@ -10206,8 +10206,8 @@ public static final void gtk_spin_button_set_increments(int /*long*/ spin_button
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -24112,7 +24139,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_spin_button_set_range(spin_button, max, min);
-@@ -10203,8 +10203,8 @@ public static final void gtk_spin_button_set_range(int /*long*/ spin_button, dou
+@@ -10216,8 +10216,8 @@ public static final void gtk_spin_button_set_range(int /*long*/ spin_button, dou
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -24123,7 +24150,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_spin_button_set_value(spin_button, value);
-@@ -10213,8 +10213,8 @@ public static final void gtk_spin_button_set_value(int /*long*/ spin_button, dou
+@@ -10226,8 +10226,8 @@ public static final void gtk_spin_button_set_value(int /*long*/ spin_button, dou
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -24134,7 +24161,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_spin_button_set_wrap(spin_button, wrap);
-@@ -10223,8 +10223,8 @@ public static final void gtk_spin_button_set_wrap(int /*long*/ spin_button, bool
+@@ -10236,8 +10236,8 @@ public static final void gtk_spin_button_set_wrap(int /*long*/ spin_button, bool
}
}
/** @param spin_button cast=(GtkSpinButton*) */
@@ -24145,7 +24172,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_spin_button_update(spin_button);
-@@ -10235,8 +10235,8 @@ public static final void gtk_spin_button_update(int /*long*/ spin_button) {
+@@ -10248,8 +10248,8 @@ public static final void gtk_spin_button_update(int /*long*/ spin_button) {
/**
* @method flags=dynamic
*/
@@ -24156,7 +24183,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_status_icon_get_geometry(handle, screen, area, orientation);
-@@ -10247,8 +10247,8 @@ public static final boolean gtk_status_icon_get_geometry(int /*long*/ handle, in
+@@ -10260,8 +10260,8 @@ public static final boolean gtk_status_icon_get_geometry(int /*long*/ handle, in
/**
* @method flags=dynamic
*/
@@ -24167,7 +24194,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_status_icon_get_visible(handle);
-@@ -10257,8 +10257,8 @@ public static final boolean gtk_status_icon_get_visible(int /*long*/ handle) {
+@@ -10270,8 +10270,8 @@ public static final boolean gtk_status_icon_get_visible(int /*long*/ handle) {
}
}
/** @method flags=dynamic */
@@ -24178,7 +24205,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_status_icon_new();
-@@ -10269,8 +10269,8 @@ public static final int /*long*/ gtk_status_icon_new() {
+@@ -10282,8 +10282,8 @@ public static final int /*long*/ gtk_status_icon_new() {
/**
* @method flags=dynamic
*/
@@ -24189,7 +24216,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_status_icon_set_from_pixbuf(handle, pixbuf);
-@@ -10281,8 +10281,8 @@ public static final void gtk_status_icon_set_from_pixbuf(int /*long*/ handle, in
+@@ -10294,8 +10294,8 @@ public static final void gtk_status_icon_set_from_pixbuf(int /*long*/ handle, in
/**
* @method flags=dynamic
*/
@@ -24200,7 +24227,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_status_icon_set_visible(handle, visible);
-@@ -10293,8 +10293,8 @@ public static final void gtk_status_icon_set_visible(int /*long*/ handle, boolea
+@@ -10306,8 +10306,8 @@ public static final void gtk_status_icon_set_visible(int /*long*/ handle, boolea
/**
* @method flags=dynamic
*/
@@ -24211,7 +24238,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_status_icon_set_tooltip(handle, tip_text);
-@@ -10306,8 +10306,8 @@ public static final void gtk_status_icon_set_tooltip(int /*long*/ handle, byte[]
+@@ -10319,8 +10319,8 @@ public static final void gtk_status_icon_set_tooltip(int /*long*/ handle, byte[]
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -24222,7 +24249,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_style_get_base(style, index, color);
-@@ -10319,8 +10319,8 @@ public static final void gtk_style_get_base(int /*long*/ style, int index, GdkCo
+@@ -10332,8 +10332,8 @@ public static final void gtk_style_get_base(int /*long*/ style, int index, GdkCo
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -24233,7 +24260,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_style_get_black(style, color);
-@@ -10332,8 +10332,8 @@ public static final void gtk_style_get_black(int /*long*/ style, GdkColor color)
+@@ -10345,8 +10345,8 @@ public static final void gtk_style_get_black(int /*long*/ style, GdkColor color)
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -24244,7 +24271,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_style_get_bg(style, index, color);
-@@ -10345,8 +10345,8 @@ public static final void gtk_style_get_bg(int /*long*/ style, int index, GdkColo
+@@ -10358,8 +10358,8 @@ public static final void gtk_style_get_bg(int /*long*/ style, int index, GdkColo
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -24255,7 +24282,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_style_get_dark(style, index, color);
-@@ -10358,8 +10358,8 @@ public static final void gtk_style_get_dark(int /*long*/ style, int index, GdkCo
+@@ -10371,8 +10371,8 @@ public static final void gtk_style_get_dark(int /*long*/ style, int index, GdkCo
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -24266,7 +24293,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_style_get_fg(style, index, color);
-@@ -10371,8 +10371,8 @@ public static final void gtk_style_get_fg(int /*long*/ style, int index, GdkColo
+@@ -10384,8 +10384,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
*/
@@ -24277,7 +24304,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_style_get_fg_gc(style, index, gc);
-@@ -10384,8 +10384,8 @@ public static final void gtk_style_get_fg_gc(int /*long*/ style, int index, int
+@@ -10397,8 +10397,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
*/
@@ -24288,7 +24315,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_style_get_bg_gc(style, index, gc);
-@@ -10397,8 +10397,8 @@ public static final void gtk_style_get_bg_gc(int /*long*/ style, int index, int
+@@ -10410,8 +10410,8 @@ public static final void gtk_style_get_bg_gc(int /*long*/ style, int index, int
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -24299,7 +24326,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_style_get_light_gc(style, index, gc);
-@@ -10410,8 +10410,8 @@ public static final void gtk_style_get_light_gc(int /*long*/ style, int index, i
+@@ -10423,8 +10423,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
*/
@@ -24310,7 +24337,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_style_get_dark_gc(style, index, gc);
-@@ -10423,8 +10423,8 @@ public static final void gtk_style_get_dark_gc(int /*long*/ style, int index, in
+@@ -10436,8 +10436,8 @@ public static final void gtk_style_get_dark_gc(int /*long*/ style, int index, in
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -24321,7 +24348,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_style_get_mid_gc(style, index, gc);
-@@ -10436,8 +10436,8 @@ public static final void gtk_style_get_mid_gc(int /*long*/ style, int index, int
+@@ -10449,8 +10449,8 @@ public static final void gtk_style_get_mid_gc(int /*long*/ style, int index, int
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -24332,7 +24359,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_style_get_text_gc(style, index, gc);
-@@ -10449,8 +10449,8 @@ public static final void gtk_style_get_text_gc(int /*long*/ style, int index, in
+@@ -10462,8 +10462,8 @@ public static final void gtk_style_get_text_gc(int /*long*/ style, int index, in
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -24343,7 +24370,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_style_get_text_aa_gc(style, index, gc);
-@@ -10462,8 +10462,8 @@ public static final void gtk_style_get_text_aa_gc(int /*long*/ style, int index,
+@@ -10475,8 +10475,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
*/
@@ -24354,7 +24381,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_style_get_black_gc(style, gc);
-@@ -10475,8 +10475,8 @@ public static final void gtk_style_get_black_gc(int /*long*/ style, int /*long*/
+@@ -10488,8 +10488,8 @@ public static final void gtk_style_get_black_gc(int /*long*/ style, int /*long*/
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
@@ -24365,7 +24392,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_style_get_white_gc(style, gc);
-@@ -10485,8 +10485,8 @@ public static final void gtk_style_get_white_gc(int /*long*/ style, int /*long*/
+@@ -10498,8 +10498,8 @@ public static final void gtk_style_get_white_gc(int /*long*/ style, int /*long*/
}
}
/** @param style cast=(GtkStyle *) */
@@ -24376,7 +24403,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_style_get_font_desc(style);
-@@ -10498,8 +10498,8 @@ public static final int /*long*/ gtk_style_get_font_desc(int /*long*/ style) {
+@@ -10511,8 +10511,8 @@ public static final int /*long*/ gtk_style_get_font_desc(int /*long*/ style) {
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -24387,7 +24414,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_style_get_light(style, index, color);
-@@ -10511,8 +10511,8 @@ public static final void gtk_style_get_light(int /*long*/ style, int index, GdkC
+@@ -10524,8 +10524,8 @@ public static final void gtk_style_get_light(int /*long*/ style, int index, GdkC
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
@@ -24398,7 +24425,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_style_get_text(style, index, color);
-@@ -10521,8 +10521,8 @@ public static final void gtk_style_get_text(int /*long*/ style, int index, GdkCo
+@@ -10534,8 +10534,8 @@ public static final void gtk_style_get_text(int /*long*/ style, int index, GdkCo
}
}
/** @param style cast=(GtkStyle *) */
@@ -24409,7 +24436,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_style_get_xthickness(style);
-@@ -10531,8 +10531,8 @@ public static final int gtk_style_get_xthickness(int /*long*/ style) {
+@@ -10544,8 +10544,8 @@ public static final int gtk_style_get_xthickness(int /*long*/ style) {
}
}
/** @param style cast=(GtkStyle *) */
@@ -24420,7 +24447,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_style_get_ythickness(style);
-@@ -10546,8 +10546,8 @@ public static final int gtk_style_get_ythickness(int /*long*/ style) {
+@@ -10559,8 +10559,8 @@ public static final int gtk_style_get_ythickness(int /*long*/ style) {
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
@@ -24431,7 +24458,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_style_render_icon(style, source, direction, state, size, widget, detail);
-@@ -10559,8 +10559,8 @@ public static final int /*long*/ gtk_style_render_icon(int /*long*/ style, int /
+@@ -10572,8 +10572,8 @@ public static final int /*long*/ gtk_style_render_icon(int /*long*/ style, int /
* @param targets cast=(const GtkTargetEntry *)
* @param ntargets cast=(guint)
*/
@@ -24442,7 +24469,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_target_list_new(targets, ntargets);
-@@ -10569,8 +10569,8 @@ public static final int /*long*/ gtk_target_list_new(int /*long*/ targets, int n
+@@ -10582,8 +10582,8 @@ public static final int /*long*/ gtk_target_list_new(int /*long*/ targets, int n
}
}
/** @param list cast=(GtkTargetList *) */
@@ -24453,7 +24480,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_target_list_unref(list);
-@@ -10582,8 +10582,8 @@ public static final void gtk_target_list_unref(int /*long*/ list) {
+@@ -10595,8 +10595,8 @@ public static final void gtk_target_list_unref(int /*long*/ list) {
* @param buffer cast=(GtkTextBuffer *)
* @param clipboard cast=(GtkClipboard *)
*/
@@ -24464,7 +24491,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_buffer_copy_clipboard(buffer, clipboard);
-@@ -10596,8 +10596,8 @@ public static final void gtk_text_buffer_copy_clipboard(int /*long*/ buffer, int
+@@ -10609,8 +10609,8 @@ public static final void gtk_text_buffer_copy_clipboard(int /*long*/ buffer, int
* @param clipboard cast=(GtkClipboard *)
* @param default_editable cast=(gboolean)
*/
@@ -24475,7 +24502,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_buffer_cut_clipboard(buffer, clipboard, default_editable);
-@@ -10610,8 +10610,8 @@ public static final void gtk_text_buffer_cut_clipboard(int /*long*/ buffer, int
+@@ -10623,8 +10623,8 @@ public static final void gtk_text_buffer_cut_clipboard(int /*long*/ buffer, int
* @param start cast=(GtkTextIter *)
* @param end cast=(GtkTextIter *)
*/
@@ -24486,7 +24513,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_buffer_delete(buffer, start, end);
-@@ -10624,8 +10624,8 @@ public static final void gtk_text_buffer_delete(int /*long*/ buffer, byte[] star
+@@ -10637,8 +10637,8 @@ public static final void gtk_text_buffer_delete(int /*long*/ buffer, byte[] star
* @param start cast=(GtkTextIter *)
* @param end cast=(GtkTextIter *)
*/
@@ -24497,7 +24524,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_buffer_get_bounds(buffer, start, end);
-@@ -10634,8 +10634,8 @@ public static final void gtk_text_buffer_get_bounds(int /*long*/ buffer, byte[]
+@@ -10647,8 +10647,8 @@ public static final void gtk_text_buffer_get_bounds(int /*long*/ buffer, byte[]
}
}
/** @param buffer cast=(GtkTextBuffer *) */
@@ -24508,7 +24535,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_text_buffer_get_char_count(buffer);
-@@ -10647,8 +10647,8 @@ public static final int gtk_text_buffer_get_char_count(int /*long*/ buffer) {
+@@ -10660,8 +10660,8 @@ public static final int gtk_text_buffer_get_char_count(int /*long*/ buffer) {
* @param buffer cast=(GtkTextBuffer *)
* @param iter cast=(GtkTextIter *)
*/
@@ -24519,7 +24546,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_buffer_get_end_iter(buffer, iter);
-@@ -10657,8 +10657,8 @@ public static final void gtk_text_buffer_get_end_iter(int /*long*/ buffer, byte[
+@@ -10670,8 +10670,8 @@ public static final void gtk_text_buffer_get_end_iter(int /*long*/ buffer, byte[
}
}
/** @param buffer cast=(GtkTextBuffer *) */
@@ -24530,7 +24557,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_text_buffer_get_insert(buffer);
-@@ -10671,8 +10671,8 @@ public static final int /*long*/ gtk_text_buffer_get_insert(int /*long*/ buffer)
+@@ -10684,8 +10684,8 @@ public static final int /*long*/ gtk_text_buffer_get_insert(int /*long*/ buffer)
* @param iter cast=(GtkTextIter *)
* @param line_number cast=(gint)
*/
@@ -24541,7 +24568,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_buffer_get_iter_at_line(buffer, iter, line_number);
-@@ -10685,8 +10685,8 @@ public static final void gtk_text_buffer_get_iter_at_line(int /*long*/ buffer, b
+@@ -10698,8 +10698,8 @@ public static final void gtk_text_buffer_get_iter_at_line(int /*long*/ buffer, b
* @param iter cast=(GtkTextIter *)
* @param mark cast=(GtkTextMark *)
*/
@@ -24552,7 +24579,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
-@@ -10699,8 +10699,8 @@ public static final void gtk_text_buffer_get_iter_at_mark(int /*long*/ buffer, b
+@@ -10712,8 +10712,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)
*/
@@ -24563,7 +24590,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_buffer_get_iter_at_offset(buffer, iter, char_offset);
-@@ -10709,8 +10709,8 @@ public static final void gtk_text_buffer_get_iter_at_offset(int /*long*/ buffer,
+@@ -10722,8 +10722,8 @@ public static final void gtk_text_buffer_get_iter_at_offset(int /*long*/ buffer,
}
}
/** @param buffer cast=(GtkTextBuffer *) */
@@ -24574,7 +24601,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_text_buffer_get_line_count(buffer);
-@@ -10719,8 +10719,8 @@ public static final int gtk_text_buffer_get_line_count(int /*long*/ buffer) {
+@@ -10732,8 +10732,8 @@ public static final int gtk_text_buffer_get_line_count(int /*long*/ buffer) {
}
}
/** @param buffer cast=(GtkTextBuffer *) */
@@ -24585,7 +24612,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_text_buffer_get_selection_bound(buffer);
-@@ -10733,8 +10733,8 @@ public static final int /*long*/ gtk_text_buffer_get_selection_bound(int /*long*
+@@ -10746,8 +10746,8 @@ public static final int /*long*/ gtk_text_buffer_get_selection_bound(int /*long*
* @param start cast=(GtkTextIter *)
* @param end cast=(GtkTextIter *)
*/
@@ -24596,7 +24623,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_text_buffer_get_selection_bounds(buffer, start, end);
-@@ -10748,8 +10748,8 @@ public static final boolean gtk_text_buffer_get_selection_bounds(int /*long*/ bu
+@@ -10761,8 +10761,8 @@ public static final boolean gtk_text_buffer_get_selection_bounds(int /*long*/ bu
* @param end cast=(GtkTextIter *)
* @param include_hidden_chars cast=(gboolean)
*/
@@ -24607,7 +24634,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_text_buffer_get_text(buffer, start, end, include_hidden_chars);
-@@ -10763,8 +10763,8 @@ public static final int /*long*/ gtk_text_buffer_get_text(int /*long*/ buffer, b
+@@ -10776,8 +10776,8 @@ public static final int /*long*/ gtk_text_buffer_get_text(int /*long*/ buffer, b
* @param text cast=(const gchar *)
* @param len cast=(gint)
*/
@@ -24618,7 +24645,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_buffer_insert(buffer, iter, text, len);
-@@ -10778,8 +10778,8 @@ public static final void gtk_text_buffer_insert(int /*long*/ buffer, byte[] iter
+@@ -10791,8 +10791,8 @@ public static final void gtk_text_buffer_insert(int /*long*/ buffer, byte[] iter
* @param text cast=(const gchar *)
* @param len cast=(gint)
*/
@@ -24629,7 +24656,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_buffer_insert(buffer, iter, text, len);
-@@ -10792,8 +10792,8 @@ public static final void gtk_text_buffer_insert(int /*long*/ buffer, int /*long*
+@@ -10805,8 +10805,8 @@ public static final void gtk_text_buffer_insert(int /*long*/ buffer, int /*long*
* @param mark cast=(GtkTextMark *)
* @param where cast=(const GtkTextIter *)
*/
@@ -24640,7 +24667,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_buffer_move_mark(buffer, mark, where);
-@@ -10807,8 +10807,8 @@ public static final void gtk_text_buffer_move_mark(int /*long*/ buffer, int /*lo
+@@ -10820,8 +10820,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)
*/
@@ -24651,7 +24678,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_buffer_paste_clipboard(buffer, clipboard, override_location, default_editable);
-@@ -10820,8 +10820,8 @@ public static final void gtk_text_buffer_paste_clipboard(int /*long*/ buffer, in
+@@ -10833,8 +10833,8 @@ public static final void gtk_text_buffer_paste_clipboard(int /*long*/ buffer, in
* @param buffer cast=(GtkTextBuffer *)
* @param where cast=(const GtkTextIter *)
*/
@@ -24662,7 +24689,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_buffer_place_cursor(buffer, where);
-@@ -10834,8 +10834,8 @@ public static final void gtk_text_buffer_place_cursor(int /*long*/ buffer, byte[
+@@ -10847,8 +10847,8 @@ public static final void gtk_text_buffer_place_cursor(int /*long*/ buffer, byte[
* @param text cast=(const gchar *)
* @param len cast=(gint)
*/
@@ -24673,7 +24700,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_buffer_set_text(buffer, text, len);
-@@ -10871,8 +10871,8 @@ public static final int gtk_text_iter_get_offset(byte[] iter) {
+@@ -10884,8 +10884,8 @@ public static final int gtk_text_iter_get_offset(byte[] iter) {
* @param window_x cast=(gint *)
* @param window_y cast=(gint *)
*/
@@ -24684,7 +24711,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_view_buffer_to_window_coords(text_view, win, buffer_x, buffer_y, window_x, window_y);
-@@ -10881,8 +10881,8 @@ public static final void gtk_text_view_buffer_to_window_coords(int /*long*/ text
+@@ -10894,8 +10894,8 @@ public static final void gtk_text_view_buffer_to_window_coords(int /*long*/ text
}
}
/** @param text_view cast=(GtkTextView *) */
@@ -24695,7 +24722,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_text_view_get_buffer(text_view);
-@@ -10891,8 +10891,8 @@ public static final int /*long*/ gtk_text_view_get_buffer(int /*long*/ text_view
+@@ -10904,8 +10904,8 @@ public static final int /*long*/ gtk_text_view_get_buffer(int /*long*/ text_view
}
}
/** @param text_view cast=(GtkTextView *) */
@@ -24706,7 +24733,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_text_view_get_editable(text_view);
-@@ -10906,8 +10906,8 @@ public static final boolean gtk_text_view_get_editable(int /*long*/ text_view) {
+@@ -10919,8 +10919,8 @@ public static final boolean gtk_text_view_get_editable(int /*long*/ text_view) {
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -24717,7 +24744,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_view_get_iter_at_location(text_view, iter, x, y);
-@@ -10920,8 +10920,8 @@ public static final void gtk_text_view_get_iter_at_location(int /*long*/ text_vi
+@@ -10933,8 +10933,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
*/
@@ -24728,7 +24755,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_view_get_iter_location(text_view, iter, location);
-@@ -10935,8 +10935,8 @@ public static final void gtk_text_view_get_iter_location(int /*long*/ text_view,
+@@ -10948,8 +10948,8 @@ public static final void gtk_text_view_get_iter_location(int /*long*/ text_view,
* @param y cast=(gint)
* @param line_top cast=(gint *)
*/
@@ -24739,7 +24766,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_view_get_line_at_y(text_view, target_iter, y, line_top);
-@@ -10948,8 +10948,8 @@ public static final void gtk_text_view_get_line_at_y(int /*long*/ text_view, byt
+@@ -10961,8 +10961,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
*/
@@ -24750,7 +24777,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_view_get_visible_rect(text_view, visible_rect);
-@@ -10961,8 +10961,8 @@ public static final void gtk_text_view_get_visible_rect(int /*long*/ text_view,
+@@ -10974,8 +10974,8 @@ public static final void gtk_text_view_get_visible_rect(int /*long*/ text_view,
* @param text_view cast=(GtkTextView *)
* @param win cast=(GtkTextWindowType)
*/
@@ -24761,7 +24788,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_text_view_get_window(text_view, win);
-@@ -10970,8 +10970,8 @@ public static final int /*long*/ gtk_text_view_get_window(int /*long*/ text_view
+@@ -10983,8 +10983,8 @@ public static final int /*long*/ gtk_text_view_get_window(int /*long*/ text_view
lock.unlock();
}
}
@@ -24772,7 +24799,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_text_view_new();
-@@ -10983,8 +10983,8 @@ public static final int /*long*/ gtk_text_view_new() {
+@@ -10996,8 +10996,8 @@ public static final int /*long*/ gtk_text_view_new() {
* @param text_view cast=(GtkTextView *)
* @param mark cast=(GtkTextMark *)
*/
@@ -24783,7 +24810,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_view_scroll_mark_onscreen(text_view, mark);
-@@ -11000,8 +11000,8 @@ public static final void gtk_text_view_scroll_mark_onscreen(int /*long*/ text_vi
+@@ -11013,8 +11013,8 @@ public static final void gtk_text_view_scroll_mark_onscreen(int /*long*/ text_vi
* @param xalign cast=(gdouble)
* @param yalign cast=(gdouble)
*/
@@ -24794,7 +24821,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_text_view_scroll_to_iter(text_view, iter, within_margin, use_align, xalign, yalign);
-@@ -11013,8 +11013,8 @@ public static final boolean gtk_text_view_scroll_to_iter(int /*long*/ text_view,
+@@ -11026,8 +11026,8 @@ public static final boolean gtk_text_view_scroll_to_iter(int /*long*/ text_view,
* @param text_view cast=(GtkTextView *)
* @param setting cast=(gboolean)
*/
@@ -24805,7 +24832,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_view_set_editable(text_view, setting);
-@@ -11023,8 +11023,8 @@ public static final void gtk_text_view_set_editable(int /*long*/ text_view, bool
+@@ -11036,8 +11036,8 @@ public static final void gtk_text_view_set_editable(int /*long*/ text_view, bool
}
}
/** @param text_view cast=(GtkTextView *) */
@@ -24816,7 +24843,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_view_set_justification(text_view, justification);
-@@ -11036,8 +11036,8 @@ public static final void gtk_text_view_set_justification(int /*long*/ text_view,
+@@ -11049,8 +11049,8 @@ public static final void gtk_text_view_set_justification(int /*long*/ text_view,
* @param text_view cast=(GtkTextView *)
* @param tabs cast=(PangoTabArray *)
*/
@@ -24827,7 +24854,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_view_set_tabs(text_view, tabs);
-@@ -11046,8 +11046,8 @@ public static final void gtk_text_view_set_tabs(int /*long*/ text_view, int /*lo
+@@ -11059,8 +11059,8 @@ public static final void gtk_text_view_set_tabs(int /*long*/ text_view, int /*lo
}
}
/** @param text_view cast=(GtkTextView *) */
@@ -24838,7 +24865,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_view_set_wrap_mode(text_view, wrap_mode);
-@@ -11063,8 +11063,8 @@ public static final void gtk_text_view_set_wrap_mode(int /*long*/ text_view, int
+@@ -11076,8 +11076,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 *)
*/
@@ -24849,7 +24876,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_text_view_window_to_buffer_coords(text_view, win, window_x, window_y, buffer_x, buffer_y);
-@@ -11077,8 +11077,8 @@ public static final void gtk_text_view_window_to_buffer_coords(int /*long*/ text
+@@ -11090,8 +11090,8 @@ public static final void gtk_text_view_window_to_buffer_coords(int /*long*/ text
* @param function cast=(GSourceFunc)
* @param data cast=(gpointer)
*/
@@ -24860,7 +24887,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _g_timeout_add(interval, function, data);
-@@ -11087,8 +11087,8 @@ public static final int g_timeout_add(int interval, int /*long*/ function, int /
+@@ -11100,8 +11100,8 @@ public static final int g_timeout_add(int interval, int /*long*/ function, int /
}
}
/** @param toggle_button cast=(GtkToggleButton *) */
@@ -24871,7 +24898,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_toggle_button_get_active(toggle_button);
-@@ -11096,8 +11096,8 @@ public static final boolean gtk_toggle_button_get_active(int /*long*/ toggle_but
+@@ -11109,8 +11109,8 @@ public static final boolean gtk_toggle_button_get_active(int /*long*/ toggle_but
lock.unlock();
}
}
@@ -24882,7 +24909,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_toggle_button_new();
-@@ -11106,8 +11106,8 @@ public static final int /*long*/ gtk_toggle_button_new() {
+@@ -11119,8 +11119,8 @@ public static final int /*long*/ gtk_toggle_button_new() {
}
}
/** @param toggle_button cast=(GtkToggleButton *) */
@@ -24893,7 +24920,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_toggle_button_get_inconsistent(toggle_button);
-@@ -11119,8 +11119,8 @@ public static final boolean gtk_toggle_button_get_inconsistent(int /*long*/ togg
+@@ -11132,8 +11132,8 @@ public static final boolean gtk_toggle_button_get_inconsistent(int /*long*/ togg
* @param toggle_button cast=(GtkToggleButton *)
* @param is_active cast=(gboolean)
*/
@@ -24904,7 +24931,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_toggle_button_set_active(toggle_button, is_active);
-@@ -11132,8 +11132,8 @@ public static final void gtk_toggle_button_set_active(int /*long*/ toggle_button
+@@ -11145,8 +11145,8 @@ public static final void gtk_toggle_button_set_active(int /*long*/ toggle_button
* @param toggle_button cast=(GtkToggleButton *)
* @param setting cast=(gboolean)
*/
@@ -24915,7 +24942,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_toggle_button_set_inconsistent(toggle_button, setting);
-@@ -11145,8 +11145,8 @@ public static final void gtk_toggle_button_set_inconsistent(int /*long*/ toggle_
+@@ -11158,8 +11158,8 @@ public static final void gtk_toggle_button_set_inconsistent(int /*long*/ toggle_
* @param toggle_button cast=(GtkToggleButton *)
* @param draw_indicator cast=(gboolean)
*/
@@ -24926,7 +24953,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_toggle_button_set_mode(toggle_button, draw_indicator);
-@@ -11155,8 +11155,8 @@ public static final void gtk_toggle_button_set_mode(int /*long*/ toggle_button,
+@@ -11168,8 +11168,8 @@ public static final void gtk_toggle_button_set_mode(int /*long*/ toggle_button,
}
}
/** @param button cast=(GtkToggleToolButton *) */
@@ -24937,7 +24964,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_toggle_tool_button_get_active(button);
-@@ -11164,8 +11164,8 @@ public static final boolean gtk_toggle_tool_button_get_active(int /*long*/ butto
+@@ -11177,8 +11177,8 @@ public static final boolean gtk_toggle_tool_button_get_active(int /*long*/ butto
lock.unlock();
}
}
@@ -24948,7 +24975,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_toggle_tool_button_new();
-@@ -11177,8 +11177,8 @@ public static final int /*long*/ gtk_toggle_tool_button_new() {
+@@ -11190,8 +11190,8 @@ public static final int /*long*/ gtk_toggle_tool_button_new() {
* @param item cast=(GtkToggleToolButton *)
* @param selected cast=(gboolean)
*/
@@ -24959,7 +24986,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_toggle_tool_button_set_active(item, selected);
-@@ -11190,8 +11190,8 @@ public static final void gtk_toggle_tool_button_set_active(int /*long*/ item, bo
+@@ -11203,8 +11203,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 *)
*/
@@ -24970,7 +24997,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tool_button_new(icon_widget, label);
-@@ -11203,8 +11203,8 @@ public static final int /*long*/ gtk_tool_button_new(int /*long*/ icon_widget, b
+@@ -11216,8 +11216,8 @@ public static final int /*long*/ gtk_tool_button_new(int /*long*/ icon_widget, b
* @param button cast=(GtkToolButton *)
* @param widget cast=(GtkWidget *)
*/
@@ -24981,7 +25008,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tool_button_set_icon_widget(button, widget);
-@@ -11216,8 +11216,8 @@ public static final void gtk_tool_button_set_icon_widget(int /*long*/ button, in
+@@ -11229,8 +11229,8 @@ public static final void gtk_tool_button_set_icon_widget(int /*long*/ button, in
* @param button cast=(GtkToolButton *)
* @param label cast=(const gchar *)
*/
@@ -24992,7 +25019,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tool_button_set_label(button, label);
-@@ -11229,8 +11229,8 @@ public static final void gtk_tool_button_set_label(int /*long*/ button, byte[]
+@@ -11242,8 +11242,8 @@ public static final void gtk_tool_button_set_label(int /*long*/ button, byte[]
* @param button cast=(GtkToolButton *)
* @param widget cast=(GtkWidget *)
*/
@@ -25003,7 +25030,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tool_button_set_label_widget(button, widget);
-@@ -11242,8 +11242,8 @@ public static final void gtk_tool_button_set_label_widget(int /*long*/ button,
+@@ -11255,8 +11255,8 @@ public static final void gtk_tool_button_set_label_widget(int /*long*/ button,
* @param item cast=(GtkToolButton *)
* @param underline cast=(gboolean)
*/
@@ -25014,7 +25041,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tool_button_set_use_underline(item, underline);
-@@ -11255,8 +11255,8 @@ public static final void gtk_tool_button_set_use_underline(int /*long*/ item, bo
+@@ -11268,8 +11268,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 *)
*/
@@ -25025,7 +25052,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tool_item_get_proxy_menu_item(item, menu_id);
-@@ -11265,8 +11265,8 @@ public static final int /*long*/ gtk_tool_item_get_proxy_menu_item(int /*long*/
+@@ -11278,8 +11278,8 @@ public static final int /*long*/ gtk_tool_item_get_proxy_menu_item(int /*long*/
}
}
/** @param item cast=(GtkToolItem *) */
@@ -25036,7 +25063,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tool_item_retrieve_proxy_menu_item(item);
-@@ -11278,8 +11278,8 @@ public static final int /*long*/ gtk_tool_item_retrieve_proxy_menu_item(int /*lo
+@@ -11291,8 +11291,8 @@ public static final int /*long*/ gtk_tool_item_retrieve_proxy_menu_item(int /*lo
* @param item cast=(GtkToolItem *)
* @param important cast=(gboolean)
*/
@@ -25047,7 +25074,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tool_item_set_is_important(item, important);
-@@ -11292,8 +11292,8 @@ public static final void gtk_tool_item_set_is_important(int /*long*/ item, boole
+@@ -11305,8 +11305,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 *)
*/
@@ -25058,7 +25085,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tool_item_set_proxy_menu_item(item, menu_id, widget);
-@@ -11305,8 +11305,8 @@ public static final void gtk_tool_item_set_proxy_menu_item(int /*long*/ item, by
+@@ -11318,8 +11318,8 @@ public static final void gtk_tool_item_set_proxy_menu_item(int /*long*/ item, by
* @param toolbar cast=(GtkToolbar *)
* @param item cast=(GtkToolItem *)
*/
@@ -25069,7 +25096,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_toolbar_insert(toolbar, item, pos);
-@@ -11321,8 +11321,8 @@ public static final void gtk_toolbar_insert(int /*long*/ toolbar, int /*long*/ i
+@@ -11334,8 +11334,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)
*/
@@ -25080,7 +25107,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_toolbar_insert_widget(toolbar, widget, tooltip_text, tooltip_private_text, position);
-@@ -11330,8 +11330,8 @@ public static final void gtk_toolbar_insert_widget(int /*long*/ toolbar, int /*l
+@@ -11343,8 +11343,8 @@ public static final void gtk_toolbar_insert_widget(int /*long*/ toolbar, int /*l
lock.unlock();
}
}
@@ -25091,7 +25118,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_toolbar_new();
-@@ -11344,8 +11344,8 @@ public static final int /*long*/ gtk_toolbar_new() {
+@@ -11357,8 +11357,8 @@ public static final int /*long*/ gtk_toolbar_new() {
* @param toolbar cast=(GtkToolbar *)
* @param orientation cast=(GtkOrientation)
*/
@@ -25102,7 +25129,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_toolbar_set_orientation(toolbar, orientation);
-@@ -11357,8 +11357,8 @@ public static final void gtk_toolbar_set_orientation(int /*long*/ toolbar, int o
+@@ -11370,8 +11370,8 @@ public static final void gtk_toolbar_set_orientation(int /*long*/ toolbar, int o
* @param toolbar cast=(GtkToolbar *)
* @param show_arrow cast=(gboolean)
*/
@@ -25113,7 +25140,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_toolbar_set_show_arrow(toolbar, show_arrow);
-@@ -11369,8 +11369,8 @@ public static final void gtk_toolbar_set_show_arrow(int /*long*/ toolbar, boolea
+@@ -11382,8 +11382,8 @@ public static final void gtk_toolbar_set_show_arrow(int /*long*/ toolbar, boolea
/** @param toolbar cast=(GtkToolbar *)
* @param style cast=(GtkToolbarStyle)
*/
@@ -25124,7 +25151,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_toolbar_set_style(toolbar, style);
-@@ -11379,8 +11379,8 @@ public static final void gtk_toolbar_set_style(int /*long*/ toolbar, int style)
+@@ -11392,8 +11392,8 @@ public static final void gtk_toolbar_set_style(int /*long*/ toolbar, int style)
}
}
/** @method flags=dynamic */
@@ -25135,7 +25162,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tooltips_data_get(widget);
-@@ -11389,8 +11389,8 @@ public static final int /*long*/ gtk_tooltips_data_get(int /*long*/ widget) {
+@@ -11402,8 +11402,8 @@ public static final int /*long*/ gtk_tooltips_data_get(int /*long*/ widget) {
}
}
/** @method flags=dynamic */
@@ -25146,7 +25173,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tooltips_disable(tooltips);
-@@ -11399,8 +11399,8 @@ public static final void gtk_tooltips_disable(int /*long*/ tooltips) {
+@@ -11412,8 +11412,8 @@ public static final void gtk_tooltips_disable(int /*long*/ tooltips) {
}
}
/** @method flags=dynamic */
@@ -25157,7 +25184,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tooltips_enable(tooltips);
-@@ -11408,8 +11408,8 @@ public static final void gtk_tooltips_enable(int /*long*/ tooltips) {
+@@ -11421,8 +11421,8 @@ public static final void gtk_tooltips_enable(int /*long*/ tooltips) {
lock.unlock();
}
}
@@ -25168,7 +25195,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tooltips_new();
-@@ -11418,8 +11418,8 @@ public static final int /*long*/ gtk_tooltips_new() {
+@@ -11431,8 +11431,8 @@ public static final int /*long*/ gtk_tooltips_new() {
}
}
/** @method flags=dynamic */
@@ -25179,7 +25206,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tooltips_force_window(tooltips);
-@@ -11430,8 +11430,8 @@ public static final void gtk_tooltips_force_window(int /*long*/ tooltips) {
+@@ -11443,8 +11443,8 @@ public static final void gtk_tooltips_force_window(int /*long*/ tooltips) {
/**
* @method flags=dynamic
*/
@@ -25190,7 +25217,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tooltips_set_tip(tooltips, widget, tip_text, tip_private);
-@@ -11443,8 +11443,8 @@ public static final void gtk_tooltips_set_tip(int /*long*/ tooltips, int /*long*
+@@ -11456,8 +11456,8 @@ public static final void gtk_tooltips_set_tip(int /*long*/ tooltips, int /*long*
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25201,7 +25228,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_model_get(tree_model, iter, column, value, terminator);
-@@ -11456,8 +11456,8 @@ public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*
+@@ -11469,8 +11469,8 @@ public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25212,7 +25239,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_model_get(tree_model, iter, column, value, terminator);
-@@ -11470,8 +11470,8 @@ public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*
+@@ -11483,8 +11483,8 @@ public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*
* @param iter cast=(GtkTreeIter *)
* @param path cast=(GtkTreePath *)
*/
@@ -25223,7 +25250,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_model_get_iter(tree_model, iter, path);
-@@ -11483,8 +11483,8 @@ public static final boolean gtk_tree_model_get_iter(int /*long*/ tree_model, int
+@@ -11496,8 +11496,8 @@ public static final boolean gtk_tree_model_get_iter(int /*long*/ tree_model, int
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25234,7 +25261,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_model_get_iter_first(tree_model, iter);
-@@ -11493,8 +11493,8 @@ public static final boolean gtk_tree_model_get_iter_first(int /*long*/ tree_mode
+@@ -11506,8 +11506,8 @@ public static final boolean gtk_tree_model_get_iter_first(int /*long*/ tree_mode
}
}
/** @param tree_model cast=(GtkTreeModel *) */
@@ -25245,7 +25272,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_model_get_n_columns(tree_model);
-@@ -11506,8 +11506,8 @@ public static final int gtk_tree_model_get_n_columns(int /*long*/ tree_model) {
+@@ -11519,8 +11519,8 @@ public static final int gtk_tree_model_get_n_columns(int /*long*/ tree_model) {
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25256,7 +25283,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_model_get_path(tree_model, iter);
-@@ -11515,8 +11515,8 @@ public static final int /*long*/ gtk_tree_model_get_path(int /*long*/ tree_model
+@@ -11528,8 +11528,8 @@ public static final int /*long*/ gtk_tree_model_get_path(int /*long*/ tree_model
lock.unlock();
}
}
@@ -25267,7 +25294,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_model_get_type();
-@@ -11529,8 +11529,8 @@ public static final int /*long*/ gtk_tree_model_get_type() {
+@@ -11542,8 +11542,8 @@ public static final int /*long*/ gtk_tree_model_get_type() {
* @param iter cast=(GtkTreeIter *)
* @param parent cast=(GtkTreeIter *)
*/
@@ -25278,7 +25305,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_model_iter_children(model, iter, parent);
-@@ -11542,8 +11542,8 @@ public static final boolean gtk_tree_model_iter_children(int /*long*/ model, int
+@@ -11555,8 +11555,8 @@ public static final boolean gtk_tree_model_iter_children(int /*long*/ model, int
* @param model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25289,7 +25316,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_model_iter_n_children(model, iter);
-@@ -11555,8 +11555,8 @@ public static final int gtk_tree_model_iter_n_children(int /*long*/ model, int /
+@@ -11568,8 +11568,8 @@ public static final int gtk_tree_model_iter_n_children(int /*long*/ model, int /
* @param model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25300,7 +25327,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_model_iter_next(model, iter);
-@@ -11569,8 +11569,8 @@ public static final boolean gtk_tree_model_iter_next(int /*long*/ model, int /*l
+@@ -11582,8 +11582,8 @@ public static final boolean gtk_tree_model_iter_next(int /*long*/ model, int /*l
* @param iter cast=(GtkTreeIter *)
* @param parent cast=(GtkTreeIter *)
*/
@@ -25311,7 +25338,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_model_iter_nth_child(tree_model, iter, parent, n);
-@@ -11579,8 +11579,8 @@ public static final boolean gtk_tree_model_iter_nth_child(int /*long*/ tree_mode
+@@ -11592,8 +11592,8 @@ public static final boolean gtk_tree_model_iter_nth_child(int /*long*/ tree_mode
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25322,7 +25349,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_path_append_index(path, index);
-@@ -11592,8 +11592,8 @@ public static final void gtk_tree_path_append_index(int /*long*/ path, int index
+@@ -11605,8 +11605,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 *)
*/
@@ -25333,7 +25360,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_path_compare(a, b);
-@@ -11602,8 +11602,8 @@ public static final int /*long*/ gtk_tree_path_compare(int /*long*/ a, int /*lon
+@@ -11615,8 +11615,8 @@ public static final int /*long*/ gtk_tree_path_compare(int /*long*/ a, int /*lon
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25344,7 +25371,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_path_down(path);
-@@ -11612,8 +11612,8 @@ public static final void gtk_tree_path_down(int /*long*/ path) {
+@@ -11625,8 +11625,8 @@ public static final void gtk_tree_path_down(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25355,7 +25382,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_path_free(path);
-@@ -11622,8 +11622,8 @@ public static final void gtk_tree_path_free(int /*long*/ path) {
+@@ -11635,8 +11635,8 @@ public static final void gtk_tree_path_free(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25366,7 +25393,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_path_get_depth(path);
-@@ -11632,8 +11632,8 @@ public static final int gtk_tree_path_get_depth(int /*long*/ path) {
+@@ -11645,8 +11645,8 @@ public static final int gtk_tree_path_get_depth(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25377,7 +25404,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_path_get_indices(path);
-@@ -11641,8 +11641,8 @@ public static final int /*long*/ gtk_tree_path_get_indices(int /*long*/ path) {
+@@ -11654,8 +11654,8 @@ public static final int /*long*/ gtk_tree_path_get_indices(int /*long*/ path) {
lock.unlock();
}
}
@@ -25388,7 +25415,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_path_new();
-@@ -11650,8 +11650,8 @@ public static final int /*long*/ gtk_tree_path_new() {
+@@ -11663,8 +11663,8 @@ public static final int /*long*/ gtk_tree_path_new() {
lock.unlock();
}
}
@@ -25399,7 +25426,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_path_new_first();
-@@ -11660,8 +11660,8 @@ public static final int /*long*/ gtk_tree_path_new_first() {
+@@ -11673,8 +11673,8 @@ public static final int /*long*/ gtk_tree_path_new_first() {
}
}
/** @param path cast=(const gchar *) */
@@ -25410,7 +25437,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_path_new_from_string(path);
-@@ -11670,8 +11670,8 @@ public static final int /*long*/ gtk_tree_path_new_from_string(byte[] path) {
+@@ -11683,8 +11683,8 @@ public static final int /*long*/ gtk_tree_path_new_from_string(byte[] path) {
}
}
/** @param path cast=(const gchar *) */
@@ -25421,7 +25448,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_path_new_from_string(path);
-@@ -11680,8 +11680,8 @@ public static final int /*long*/ gtk_tree_path_new_from_string(int /*long*/ path
+@@ -11693,8 +11693,8 @@ public static final int /*long*/ gtk_tree_path_new_from_string(int /*long*/ path
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25432,7 +25459,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_path_next(path);
-@@ -11690,8 +11690,8 @@ public static final void gtk_tree_path_next(int /*long*/ path) {
+@@ -11703,8 +11703,8 @@ public static final void gtk_tree_path_next(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25443,7 +25470,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_path_prev(path);
-@@ -11700,8 +11700,8 @@ public static final boolean gtk_tree_path_prev(int /*long*/ path) {
+@@ -11713,8 +11713,8 @@ public static final boolean gtk_tree_path_prev(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
@@ -25454,7 +25481,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_path_up(path);
-@@ -11713,8 +11713,8 @@ public static final boolean gtk_tree_path_up(int /*long*/ path) {
+@@ -11726,8 +11726,8 @@ public static final boolean gtk_tree_path_up(int /*long*/ path) {
* @method flags=dynamic
* @param selection cast=(GtkTreeSelection *)
*/
@@ -25465,7 +25492,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_selection_count_selected_rows(selection);
-@@ -11727,8 +11727,8 @@ public static final int gtk_tree_selection_count_selected_rows(int /*long*/ sele
+@@ -11740,8 +11740,8 @@ public static final int gtk_tree_selection_count_selected_rows(int /*long*/ sele
* @param model cast=(GtkTreeModel **)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25476,7 +25503,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_selection_get_selected(selection, model, iter);
-@@ -11741,8 +11741,8 @@ public static final boolean gtk_tree_selection_get_selected(int /*long*/ selecti
+@@ -11754,8 +11754,8 @@ public static final boolean gtk_tree_selection_get_selected(int /*long*/ selecti
* @param selection cast=(GtkTreeSelection *)
* @param model cast=(GtkTreeModel **)
*/
@@ -25487,7 +25514,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_selection_get_selected_rows(selection, model);
-@@ -11754,8 +11754,8 @@ public static final int /*long*/ gtk_tree_selection_get_selected_rows(int /*long
+@@ -11767,8 +11767,8 @@ public static final int /*long*/ gtk_tree_selection_get_selected_rows(int /*long
* @param selection cast=(GtkTreeSelection *)
* @param path cast=(GtkTreePath *)
*/
@@ -25498,7 +25525,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_selection_path_is_selected(selection, path);
-@@ -11764,8 +11764,8 @@ public static final boolean gtk_tree_selection_path_is_selected(int /*long*/ sel
+@@ -11777,8 +11777,8 @@ public static final boolean gtk_tree_selection_path_is_selected(int /*long*/ sel
}
}
/** @param selection cast=(GtkTreeSelection *) */
@@ -25509,7 +25536,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_selection_select_all(selection);
-@@ -11777,8 +11777,8 @@ public static final void gtk_tree_selection_select_all(int /*long*/ selection) {
+@@ -11790,8 +11790,8 @@ public static final void gtk_tree_selection_select_all(int /*long*/ selection) {
* @param selection cast=(GtkTreeSelection *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25520,7 +25547,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_selection_select_iter(selection, iter);
-@@ -11791,8 +11791,8 @@ public static final void gtk_tree_selection_select_iter(int /*long*/ selection,
+@@ -11804,8 +11804,8 @@ public static final void gtk_tree_selection_select_iter(int /*long*/ selection,
* @param func cast=(GtkTreeSelectionForeachFunc)
* @param data cast=(gpointer)
*/
@@ -25531,7 +25558,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_selection_selected_foreach(selection, func, data);
-@@ -11804,8 +11804,8 @@ public static final void gtk_tree_selection_selected_foreach(int /*long*/ select
+@@ -11817,8 +11817,8 @@ public static final void gtk_tree_selection_selected_foreach(int /*long*/ select
* @param selection cast=(GtkTreeSelection *)
* @param mode cast=(GtkSelectionMode)
*/
@@ -25542,7 +25569,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_selection_set_mode(selection, mode);
-@@ -11814,8 +11814,8 @@ public static final void gtk_tree_selection_set_mode(int /*long*/ selection, int
+@@ -11827,8 +11827,8 @@ public static final void gtk_tree_selection_set_mode(int /*long*/ selection, int
}
}
/** @param selection cast=(GtkTreeSelection *) */
@@ -25553,7 +25580,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_selection_unselect_all(selection);
-@@ -11827,8 +11827,8 @@ public static final void gtk_tree_selection_unselect_all(int /*long*/ selection)
+@@ -11840,8 +11840,8 @@ public static final void gtk_tree_selection_unselect_all(int /*long*/ selection)
* @param selection cast=(GtkTreeSelection *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25564,7 +25591,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_selection_unselect_iter(selection, iter);
-@@ -11841,8 +11841,8 @@ public static final void gtk_tree_selection_unselect_iter(int /*long*/ selection
+@@ -11854,8 +11854,8 @@ public static final void gtk_tree_selection_unselect_iter(int /*long*/ selection
* @param iter cast=(GtkTreeIter *)
* @param parent cast=(GtkTreeIter *)
*/
@@ -25575,7 +25602,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_store_append(store, iter, parent);
-@@ -11851,8 +11851,8 @@ public static final void gtk_tree_store_append(int /*long*/ store, int /*long*/
+@@ -11864,8 +11864,8 @@ public static final void gtk_tree_store_append(int /*long*/ store, int /*long*/
}
}
/** @param store cast=(GtkTreeStore *) */
@@ -25586,7 +25613,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_store_clear(store);
-@@ -11866,8 +11866,8 @@ public static final void gtk_tree_store_clear(int /*long*/ store) {
+@@ -11879,8 +11879,8 @@ public static final void gtk_tree_store_clear(int /*long*/ store) {
* @param parent cast=(GtkTreeIter *)
* @param position cast=(gint)
*/
@@ -25597,7 +25624,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_store_insert(store, iter, parent, position);
-@@ -11876,8 +11876,8 @@ public static final void gtk_tree_store_insert(int /*long*/ store, int /*long*/
+@@ -11889,8 +11889,8 @@ public static final void gtk_tree_store_insert(int /*long*/ store, int /*long*/
}
}
/** @param types cast=(GType *) */
@@ -25608,7 +25635,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_store_newv(numColumns, types);
-@@ -11889,8 +11889,8 @@ public static final int /*long*/ gtk_tree_store_newv(int numColumns, int /*long*
+@@ -11902,8 +11902,8 @@ public static final int /*long*/ gtk_tree_store_newv(int numColumns, int /*long*
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25619,7 +25646,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_store_remove(store, iter);
-@@ -11902,8 +11902,8 @@ public static final void gtk_tree_store_remove(int /*long*/ store, int /*long*/
+@@ -11915,8 +11915,8 @@ public static final void gtk_tree_store_remove(int /*long*/ store, int /*long*/
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25630,7 +25657,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -11915,8 +11915,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
+@@ -11928,8 +11928,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25641,7 +25668,7 @@ index 62bc7a8..eb1efa2 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
+@@ -11941,8 +11941,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25652,7 +25679,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -11942,8 +11942,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
+@@ -11955,8 +11955,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param iter cast=(GtkTreeIter *)
* @param value flags=no_out
*/
@@ -25663,7 +25690,7 @@ index 62bc7a8..eb1efa2 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
+@@ -11968,8 +11968,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
@@ -25674,7 +25701,7 @@ index 62bc7a8..eb1efa2 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
+@@ -11981,8 +11981,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
@@ -25685,7 +25712,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_create_row_drag_icon(view, path);
-@@ -11981,8 +11981,8 @@ public static final int /*long*/ gtk_tree_view_create_row_drag_icon(int /*long*/
+@@ -11994,8 +11994,8 @@ public static final int /*long*/ gtk_tree_view_create_row_drag_icon(int /*long*/
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
@@ -25696,7 +25723,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_collapse_row(view, path);
-@@ -11996,8 +11996,8 @@ public static final boolean gtk_tree_view_collapse_row(int /*long*/ view, int /*
+@@ -12009,8 +12009,8 @@ public static final boolean gtk_tree_view_collapse_row(int /*long*/ view, int /*
* @param attribute cast=(const gchar *)
* @param column cast=(gint)
*/
@@ -25707,7 +25734,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_column_add_attribute(treeColumn, cellRenderer, attribute, column);
-@@ -12012,8 +12012,8 @@ public static final void gtk_tree_view_column_add_attribute(int /*long*/ treeCol
+@@ -12025,8 +12025,8 @@ public static final void gtk_tree_view_column_add_attribute(int /*long*/ treeCol
* @param start_pos cast=(gint *)
* @param width cast=(gint *)
*/
@@ -25718,7 +25745,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_column_cell_get_position(tree_column, cell_renderer, start_pos, width);
-@@ -12029,8 +12029,8 @@ public static final boolean gtk_tree_view_column_cell_get_position(int /*long*/
+@@ -12042,8 +12042,8 @@ public static final boolean gtk_tree_view_column_cell_get_position(int /*long*/
* @param width cast=(gint *)
* @param height cast=(gint *)
*/
@@ -25729,7 +25756,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_column_cell_get_size(tree_column, cell_area, x_offset, y_offset, width, height);
-@@ -12043,8 +12043,8 @@ public static final void gtk_tree_view_column_cell_get_size(int /*long*/ tree_co
+@@ -12056,8 +12056,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 *)
*/
@@ -25740,7 +25767,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_column_cell_set_cell_data(tree_column, tree_model, iter, is_expander, is_expanded);
-@@ -12053,8 +12053,8 @@ public static final void gtk_tree_view_column_cell_set_cell_data(int /*long*/ tr
+@@ -12066,8 +12066,8 @@ public static final void gtk_tree_view_column_cell_set_cell_data(int /*long*/ tr
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -25751,7 +25778,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_column_clear(tree_column);
-@@ -12066,8 +12066,8 @@ public static final void gtk_tree_view_column_clear(int /*long*/ tree_column) {
+@@ -12079,8 +12079,8 @@ public static final void gtk_tree_view_column_clear(int /*long*/ tree_column) {
* @method flags=dynamic
* @param tree_column cast=(GtkTreeViewColumn *)
*/
@@ -25762,7 +25789,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_column_get_cell_renderers(tree_column);
-@@ -12076,8 +12076,8 @@ public static final int /*long*/ gtk_tree_view_column_get_cell_renderers(int /*l
+@@ -12089,8 +12089,8 @@ public static final int /*long*/ gtk_tree_view_column_get_cell_renderers(int /*l
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -25773,7 +25800,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_column_get_fixed_width(column);
-@@ -12086,8 +12086,8 @@ public static final int gtk_tree_view_column_get_fixed_width(int /*long*/ column
+@@ -12099,8 +12099,8 @@ public static final int gtk_tree_view_column_get_fixed_width(int /*long*/ column
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -25784,7 +25811,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_column_get_reorderable(column);
-@@ -12096,8 +12096,8 @@ public static final boolean gtk_tree_view_column_get_reorderable(int /*long*/ co
+@@ -12109,8 +12109,8 @@ public static final boolean gtk_tree_view_column_get_reorderable(int /*long*/ co
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -25795,7 +25822,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_column_get_resizable(column);
-@@ -12106,8 +12106,8 @@ public static final boolean gtk_tree_view_column_get_resizable(int /*long*/ colu
+@@ -12119,8 +12119,8 @@ public static final boolean gtk_tree_view_column_get_resizable(int /*long*/ colu
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -25806,7 +25833,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_column_get_sizing(tree_column);
-@@ -12116,8 +12116,8 @@ public static final int gtk_tree_view_column_get_sizing(int /*long*/ tree_column
+@@ -12129,8 +12129,8 @@ public static final int gtk_tree_view_column_get_sizing(int /*long*/ tree_column
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -25817,7 +25844,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_column_get_spacing(tree_column);
-@@ -12126,8 +12126,8 @@ public static final int gtk_tree_view_column_get_spacing(int /*long*/ tree_colum
+@@ -12139,8 +12139,8 @@ public static final int gtk_tree_view_column_get_spacing(int /*long*/ tree_colum
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -25828,7 +25855,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_column_get_visible(column);
-@@ -12136,8 +12136,8 @@ public static final boolean gtk_tree_view_column_get_visible(int /*long*/ column
+@@ -12149,8 +12149,8 @@ public static final boolean gtk_tree_view_column_get_visible(int /*long*/ column
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -25839,7 +25866,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_column_get_sort_indicator(tree_column);
-@@ -12146,8 +12146,8 @@ public static final boolean gtk_tree_view_column_get_sort_indicator(int /*long*/
+@@ -12159,8 +12159,8 @@ public static final boolean gtk_tree_view_column_get_sort_indicator(int /*long*/
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -25850,7 +25877,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_column_get_sort_order(tree_column);
-@@ -12156,8 +12156,8 @@ public static final int gtk_tree_view_column_get_sort_order(int /*long*/ tree_co
+@@ -12169,8 +12169,8 @@ public static final int gtk_tree_view_column_get_sort_order(int /*long*/ tree_co
}
}
/** @param column cast=(GtkTreeViewColumn *) */
@@ -25861,7 +25888,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_column_get_width(column);
-@@ -12165,8 +12165,8 @@ public static final int gtk_tree_view_column_get_width(int /*long*/ column) {
+@@ -12178,8 +12178,8 @@ public static final int gtk_tree_view_column_get_width(int /*long*/ column) {
lock.unlock();
}
}
@@ -25872,7 +25899,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_column_new();
-@@ -12179,8 +12179,8 @@ public static final int /*long*/ gtk_tree_view_column_new() {
+@@ -12192,8 +12192,8 @@ public static final int /*long*/ gtk_tree_view_column_new() {
* @param cell_renderer cast=(GtkCellRenderer *)
* @param expand cast=(gboolean)
*/
@@ -25883,7 +25910,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_column_pack_start(tree_column, cell_renderer, expand);
-@@ -12193,8 +12193,8 @@ public static final void gtk_tree_view_column_pack_start(int /*long*/ tree_colum
+@@ -12206,8 +12206,8 @@ public static final void gtk_tree_view_column_pack_start(int /*long*/ tree_colum
* @param cell_renderer cast=(GtkCellRenderer *)
* @param expand cast=(gboolean)
*/
@@ -25894,7 +25921,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_column_pack_end(tree_column, cell_renderer, expand);
-@@ -12203,8 +12203,8 @@ public static final void gtk_tree_view_column_pack_end(int /*long*/ tree_column,
+@@ -12216,8 +12216,8 @@ public static final void gtk_tree_view_column_pack_end(int /*long*/ tree_column,
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -25905,7 +25932,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_column_set_alignment(tree_column, xalign);
-@@ -12219,8 +12219,8 @@ public static final void gtk_tree_view_column_set_alignment(int /*long*/ tree_co
+@@ -12232,8 +12232,8 @@ public static final void gtk_tree_view_column_set_alignment(int /*long*/ tree_co
* @param func_data cast=(gpointer)
* @param destroy cast=(GDestroyNotify)
*/
@@ -25916,7 +25943,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_column_set_cell_data_func(tree_column, cell_renderer, func, func_data, destroy);
-@@ -12232,8 +12232,8 @@ public static final void gtk_tree_view_column_set_cell_data_func(int /*long*/ tr
+@@ -12245,8 +12245,8 @@ public static final void gtk_tree_view_column_set_cell_data_func(int /*long*/ tr
* @param column cast=(GtkTreeViewColumn *)
* @param clickable cast=(gboolean)
*/
@@ -25927,7 +25954,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_column_set_clickable(column, clickable);
-@@ -12245,8 +12245,8 @@ public static final void gtk_tree_view_column_set_clickable(int /*long*/ column,
+@@ -12258,8 +12258,8 @@ public static final void gtk_tree_view_column_set_clickable(int /*long*/ column,
* @param column cast=(GtkTreeViewColumn *)
* @param fixed_width cast=(gint)
*/
@@ -25938,7 +25965,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_column_set_fixed_width(column, fixed_width);
-@@ -12258,8 +12258,8 @@ public static final void gtk_tree_view_column_set_fixed_width(int /*long*/ colum
+@@ -12271,8 +12271,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)
*/
@@ -25949,7 +25976,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_column_set_min_width(tree_column, min_width);
-@@ -12271,8 +12271,8 @@ public static final void gtk_tree_view_column_set_min_width(int /*long*/ tree_co
+@@ -12284,8 +12284,8 @@ public static final void gtk_tree_view_column_set_min_width(int /*long*/ tree_co
* @param column cast=(GtkTreeViewColumn *)
* @param reorderable cast=(gboolean)
*/
@@ -25960,7 +25987,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_column_set_reorderable(column, reorderable);
-@@ -12284,8 +12284,8 @@ public static final void gtk_tree_view_column_set_reorderable(int /*long*/ colum
+@@ -12297,8 +12297,8 @@ public static final void gtk_tree_view_column_set_reorderable(int /*long*/ colum
* @param column cast=(GtkTreeViewColumn *)
* @param resizable cast=(gboolean)
*/
@@ -25971,7 +25998,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_column_set_resizable(column, resizable);
-@@ -12297,8 +12297,8 @@ public static final void gtk_tree_view_column_set_resizable(int /*long*/ column,
+@@ -12310,8 +12310,8 @@ public static final void gtk_tree_view_column_set_resizable(int /*long*/ column,
* @param column cast=(GtkTreeViewColumn *)
* @param type cast=(GtkTreeViewColumnSizing)
*/
@@ -25982,7 +26009,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_column_set_sizing(column, type);
-@@ -12310,8 +12310,8 @@ public static final void gtk_tree_view_column_set_sizing(int /*long*/ column, in
+@@ -12323,8 +12323,8 @@ public static final void gtk_tree_view_column_set_sizing(int /*long*/ column, in
* @param tree_column cast=(GtkTreeViewColumn *)
* @param setting cast=(gboolean)
*/
@@ -25993,7 +26020,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_column_set_sort_indicator(tree_column, setting);
-@@ -12323,8 +12323,8 @@ public static final void gtk_tree_view_column_set_sort_indicator(int /*long*/ tr
+@@ -12336,8 +12336,8 @@ public static final void gtk_tree_view_column_set_sort_indicator(int /*long*/ tr
* @param tree_column cast=(GtkTreeViewColumn *)
* @param order cast=(GtkSortType)
*/
@@ -26004,7 +26031,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_column_set_sort_order(tree_column, order);
-@@ -12336,8 +12336,8 @@ public static final void gtk_tree_view_column_set_sort_order(int /*long*/ tree_c
+@@ -12349,8 +12349,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 *)
*/
@@ -26015,7 +26042,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_column_set_title(tree_column, title);
-@@ -12346,8 +12346,8 @@ public static final void gtk_tree_view_column_set_title(int /*long*/ tree_column
+@@ -12359,8 +12359,8 @@ public static final void gtk_tree_view_column_set_title(int /*long*/ tree_column
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
@@ -26026,7 +26053,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_column_set_visible(tree_column, visible);
-@@ -12359,8 +12359,8 @@ public static final void gtk_tree_view_column_set_visible (int /*long*/ tree_col
+@@ -12372,8 +12372,8 @@ public static final void gtk_tree_view_column_set_visible (int /*long*/ tree_col
* @param tree_column cast=(GtkTreeViewColumn *)
* @param widget cast=(GtkWidget *)
*/
@@ -26037,7 +26064,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_column_set_widget(tree_column, widget);
-@@ -12372,8 +12372,8 @@ public static final void gtk_tree_view_column_set_widget(int /*long*/ tree_colum
+@@ -12385,8 +12385,8 @@ public static final void gtk_tree_view_column_set_widget(int /*long*/ tree_colum
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
@@ -26048,7 +26075,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_set_drag_dest_row(view, path, pos);
-@@ -12382,8 +12382,8 @@ public static final void gtk_tree_view_set_drag_dest_row(int /*long*/ view, int
+@@ -12395,8 +12395,8 @@ public static final void gtk_tree_view_set_drag_dest_row(int /*long*/ view, int
}
}
/** @param view cast=(GtkTreeView *) */
@@ -26059,7 +26086,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_set_enable_search(view, enable_search);
-@@ -12396,8 +12396,8 @@ public static final void gtk_tree_view_set_enable_search (int /*long*/ view, boo
+@@ -12409,8 +12409,8 @@ public static final void gtk_tree_view_set_enable_search (int /*long*/ view, boo
* @param path cast=(GtkTreePath *)
* @param open_all cast=(gboolean)
*/
@@ -26070,7 +26097,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_expand_row(view, path, open_all);
-@@ -12411,8 +12411,8 @@ public static final boolean gtk_tree_view_expand_row(int /*long*/ view, int /*lo
+@@ -12424,8 +12424,8 @@ public static final boolean gtk_tree_view_expand_row(int /*long*/ view, int /*lo
* @param column cast=(GtkTreeViewColumn *)
* @param rect cast=(GdkRectangle *)
*/
@@ -26081,7 +26108,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_get_background_area(tree_view, path, column, rect);
-@@ -12421,8 +12421,8 @@ public static final void gtk_tree_view_get_background_area(int /*long*/ tree_vie
+@@ -12434,8 +12434,8 @@ public static final void gtk_tree_view_get_background_area(int /*long*/ tree_vie
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -26092,7 +26119,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_get_bin_window(tree_view);
-@@ -12436,8 +12436,8 @@ public static final int /*long*/ gtk_tree_view_get_bin_window(int /*long*/ tree_
+@@ -12449,8 +12449,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
*/
@@ -26103,7 +26130,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_get_cell_area(tree_view, path, column, rect);
-@@ -12446,8 +12446,8 @@ public static final void gtk_tree_view_get_cell_area(int /*long*/ tree_view, int
+@@ -12459,8 +12459,8 @@ public static final void gtk_tree_view_get_cell_area(int /*long*/ tree_view, int
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -26114,7 +26141,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_get_expander_column(tree_view);
-@@ -12459,8 +12459,8 @@ public static final int /*long*/gtk_tree_view_get_expander_column(int /*long*/ t
+@@ -12472,8 +12472,8 @@ public static final int /*long*/gtk_tree_view_get_expander_column(int /*long*/ t
* @param tree_view cast=(GtkTreeView *)
* @param n cast=(gint)
*/
@@ -26125,7 +26152,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_get_column(tree_view, n);
-@@ -12469,8 +12469,8 @@ public static final int /*long*/ gtk_tree_view_get_column(int /*long*/ tree_view
+@@ -12482,8 +12482,8 @@ public static final int /*long*/ gtk_tree_view_get_column(int /*long*/ tree_view
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -26136,7 +26163,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_get_columns(tree_view);
-@@ -12483,8 +12483,8 @@ public static final int /*long*/ gtk_tree_view_get_columns(int /*long*/ tree_vie
+@@ -12496,8 +12496,8 @@ public static final int /*long*/ gtk_tree_view_get_columns(int /*long*/ tree_vie
* @param path cast=(GtkTreePath **)
* @param focus_column cast=(GtkTreeViewColumn **)
*/
@@ -26147,7 +26174,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_get_cursor(tree_view, path, focus_column);
-@@ -12493,8 +12493,8 @@ public static final void gtk_tree_view_get_cursor(int /*long*/ tree_view, int /*
+@@ -12506,8 +12506,8 @@ public static final void gtk_tree_view_get_cursor(int /*long*/ tree_view, int /*
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -26158,7 +26185,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_get_headers_visible(tree_view);
-@@ -12511,8 +12511,8 @@ public static final boolean gtk_tree_view_get_headers_visible(int /*long*/ tree_
+@@ -12524,8 +12524,8 @@ public static final boolean gtk_tree_view_get_headers_visible(int /*long*/ tree_
* @param cell_x cast=(gint *)
* @param cell_y cast=(gint *)
*/
@@ -26169,7 +26196,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_get_path_at_pos(tree_view, x, y, path, column, cell_x, cell_y);
-@@ -12521,8 +12521,8 @@ public static final boolean gtk_tree_view_get_path_at_pos(int /*long*/ tree_view
+@@ -12534,8 +12534,8 @@ public static final boolean gtk_tree_view_get_path_at_pos(int /*long*/ tree_view
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -26180,7 +26207,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_get_rules_hint(tree_view);
-@@ -12531,8 +12531,8 @@ public static final boolean gtk_tree_view_get_rules_hint(int /*long*/ tree_view)
+@@ -12544,8 +12544,8 @@ public static final boolean gtk_tree_view_get_rules_hint(int /*long*/ tree_view)
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -26191,7 +26218,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_get_selection(tree_view);
-@@ -12544,8 +12544,8 @@ public static final int /*long*/ gtk_tree_view_get_selection(int /*long*/ tree_v
+@@ -12557,8 +12557,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
*/
@@ -26202,7 +26229,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_get_visible_rect(tree_view, visible_rect);
-@@ -12558,8 +12558,8 @@ public static final void gtk_tree_view_get_visible_rect(int /*long*/ tree_view,
+@@ -12571,8 +12571,8 @@ public static final void gtk_tree_view_get_visible_rect(int /*long*/ tree_view,
* @param column cast=(GtkTreeViewColumn *)
* @param position cast=(gint)
*/
@@ -26213,7 +26240,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_insert_column(tree_view, column, position);
-@@ -12572,8 +12572,8 @@ public static final int gtk_tree_view_insert_column(int /*long*/ tree_view, int
+@@ -12585,8 +12585,8 @@ public static final int gtk_tree_view_insert_column(int /*long*/ tree_view, int
* @param column cast=(GtkTreeViewColumn *)
* @param base_column cast=(GtkTreeViewColumn *)
*/
@@ -26224,7 +26251,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_move_column_after(tree_view, column, base_column);
-@@ -12582,8 +12582,8 @@ public static final void gtk_tree_view_move_column_after(int /*long*/ tree_view,
+@@ -12595,8 +12595,8 @@ public static final void gtk_tree_view_move_column_after(int /*long*/ tree_view,
}
}
/** @param model cast=(GtkTreeModel *) */
@@ -26235,7 +26262,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_new_with_model(model);
-@@ -12595,8 +12595,8 @@ public static final int /*long*/ gtk_tree_view_new_with_model(int /*long*/ model
+@@ -12608,8 +12608,8 @@ public static final int /*long*/ gtk_tree_view_new_with_model(int /*long*/ model
* @param tree_view cast=(GtkTreeView *)
* @param column cast=(GtkTreeViewColumn *)
*/
@@ -26246,7 +26273,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_remove_column(tree_view, column);
-@@ -12608,8 +12608,8 @@ public static final void gtk_tree_view_remove_column(int /*long*/ tree_view, int
+@@ -12621,8 +12621,8 @@ public static final void gtk_tree_view_remove_column(int /*long*/ tree_view, int
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
@@ -26257,7 +26284,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_tree_view_row_expanded(view, path);
-@@ -12625,8 +12625,8 @@ public static final boolean gtk_tree_view_row_expanded(int /*long*/ view, int /*
+@@ -12638,8 +12638,8 @@ public static final boolean gtk_tree_view_row_expanded(int /*long*/ view, int /*
* @param row_aligh cast=(gfloat)
* @param column_align cast=(gfloat)
*/
@@ -26268,7 +26295,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_scroll_to_cell(tree_view, path, column, use_align, row_aligh, column_align);
-@@ -12639,8 +12639,8 @@ public static final void gtk_tree_view_scroll_to_cell(int /*long*/ tree_view, in
+@@ -12652,8 +12652,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)
*/
@@ -26279,7 +26306,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_scroll_to_point(tree_view, tree_x, tree_y);
-@@ -12653,8 +12653,8 @@ public static final void gtk_tree_view_scroll_to_point (int /*long*/ tree_view,
+@@ -12666,8 +12666,8 @@ public static final void gtk_tree_view_scroll_to_point (int /*long*/ tree_view,
* @param path cast=(GtkTreePath *)
* @param focus_column cast=(GtkTreeViewColumn *)
*/
@@ -26290,7 +26317,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_set_cursor(tree_view, path, focus_column, start_editing);
-@@ -12666,8 +12666,8 @@ public static final void gtk_tree_view_set_cursor(int /*long*/ tree_view, int /*
+@@ -12679,8 +12679,8 @@ public static final void gtk_tree_view_set_cursor(int /*long*/ tree_view, int /*
* @method flags=dynamic
* @param tree_view cast=(GtkTreeView*)
*/
@@ -26301,7 +26328,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_set_grid_lines(tree_view, grid_lines);
-@@ -12679,8 +12679,8 @@ public static final void gtk_tree_view_set_grid_lines(int /*long*/ tree_view, in
+@@ -12692,8 +12692,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)
*/
@@ -26312,7 +26339,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_set_headers_visible(tree_view, visible);
-@@ -12692,8 +12692,8 @@ public static final void gtk_tree_view_set_headers_visible(int /*long*/ tree_vie
+@@ -12705,8 +12705,8 @@ public static final void gtk_tree_view_set_headers_visible(int /*long*/ tree_vie
* @param tree_view cast=(GtkTreeView *)
* @param model cast=(GtkTreeModel *)
*/
@@ -26323,7 +26350,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_set_model(tree_view, model);
-@@ -12702,8 +12702,8 @@ public static final void gtk_tree_view_set_model(int /*long*/ tree_view, int /*l
+@@ -12715,8 +12715,8 @@ public static final void gtk_tree_view_set_model(int /*long*/ tree_view, int /*l
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -26334,7 +26361,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_set_rules_hint(tree_view, setting);
-@@ -12715,8 +12715,8 @@ public static final void gtk_tree_view_set_rules_hint(int /*long*/ tree_view, bo
+@@ -12728,8 +12728,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)
*/
@@ -26345,7 +26372,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_set_search_column(tree_view, column);
-@@ -12725,8 +12725,8 @@ public static final void gtk_tree_view_set_search_column(int /*long*/ tree_view,
+@@ -12738,8 +12738,8 @@ public static final void gtk_tree_view_set_search_column(int /*long*/ tree_view,
}
}
/** @param tree_view cast=(GtkTreeView *) */
@@ -26356,7 +26383,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_unset_rows_drag_dest(tree_view);
-@@ -12738,8 +12738,8 @@ public static final void gtk_tree_view_unset_rows_drag_dest(int /*long*/ tree_vi
+@@ -12751,8 +12751,8 @@ public static final void gtk_tree_view_unset_rows_drag_dest(int /*long*/ tree_vi
* @method flags=dynamic
* @param tree_view cast=(GtkTreeView *)
*/
@@ -26367,7 +26394,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_widget_to_tree_coords(tree_view, wx, wy, tx, ty);
-@@ -12751,8 +12751,8 @@ public static final void gtk_tree_view_widget_to_tree_coords(int /*long*/ tree_v
+@@ -12764,8 +12764,8 @@ public static final void gtk_tree_view_widget_to_tree_coords(int /*long*/ tree_v
* @method flags=dynamic
* @param tree_view cast=(GtkTreeView *)
*/
@@ -26378,7 +26405,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_tree_view_convert_widget_to_bin_window_coords(tree_view, wx, wy, tx, ty);
-@@ -12764,8 +12764,8 @@ public static final void gtk_tree_view_convert_widget_to_bin_window_coords(int /
+@@ -12777,8 +12777,8 @@ public static final void gtk_tree_view_convert_widget_to_bin_window_coords(int /
* @param homogeneous cast=(gboolean)
* @param spacing cast=(gint)
*/
@@ -26389,7 +26416,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_vbox_new(homogeneous, spacing);
-@@ -12774,8 +12774,8 @@ public static final int /*long*/ gtk_vbox_new(boolean homogeneous, int spacing)
+@@ -12787,8 +12787,8 @@ public static final int /*long*/ gtk_vbox_new(boolean homogeneous, int spacing)
}
}
/** @param viewport cast=(GtkViewport *) */
@@ -26400,7 +26427,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_viewport_get_shadow_type(viewport);
-@@ -12787,8 +12787,8 @@ public static final int gtk_viewport_get_shadow_type(int /*long*/ viewport) {
+@@ -12800,8 +12800,8 @@ public static final int gtk_viewport_get_shadow_type(int /*long*/ viewport) {
* @param viewport cast=(GtkViewport *)
* @param type cast=(GtkShadowType)
*/
@@ -26411,7 +26438,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_viewport_set_shadow_type(viewport, type);
-@@ -12797,8 +12797,8 @@ public static final void gtk_viewport_set_shadow_type(int /*long*/ viewport, int
+@@ -12810,8 +12810,8 @@ public static final void gtk_viewport_set_shadow_type(int /*long*/ viewport, int
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -26422,7 +26449,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_vscale_new(adjustment);
-@@ -12807,8 +12807,8 @@ public static final int /*long*/ gtk_vscale_new(int /*long*/ adjustment) {
+@@ -12820,8 +12820,8 @@ public static final int /*long*/ gtk_vscale_new(int /*long*/ adjustment) {
}
}
/** @param adjustment cast=(GtkAdjustment *) */
@@ -26433,7 +26460,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_vscrollbar_new(adjustment);
-@@ -12816,8 +12816,8 @@ public static final int /*long*/ gtk_vscrollbar_new(int /*long*/ adjustment) {
+@@ -12829,8 +12829,8 @@ public static final int /*long*/ gtk_vscrollbar_new(int /*long*/ adjustment) {
lock.unlock();
}
}
@@ -26444,7 +26471,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_vseparator_new();
-@@ -12832,8 +12832,8 @@ public static final int /*long*/ gtk_vseparator_new() {
+@@ -12845,8 +12845,8 @@ public static final int /*long*/ gtk_vseparator_new() {
* @param accel_key cast=(guint)
* @param accel_mods cast=(GdkModifierType)
*/
@@ -26455,7 +26482,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_add_accelerator(widget, accel_signal, accel_group, accel_key, accel_mods, accel_flags);
-@@ -12845,8 +12845,8 @@ public static final void gtk_widget_add_accelerator(int /*long*/ widget, byte[]
+@@ -12858,8 +12858,8 @@ public static final void gtk_widget_add_accelerator(int /*long*/ widget, byte[]
* @param widget cast=(GtkWidget *)
* @param events cast=(gint)
*/
@@ -26466,7 +26493,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_add_events(widget, events);
-@@ -12855,8 +12855,8 @@ public static final void gtk_widget_add_events(int /*long*/ widget, int events)
+@@ -12868,8 +12868,8 @@ public static final void gtk_widget_add_events(int /*long*/ widget, int events)
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26477,7 +26504,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_widget_child_focus(widget, direction);
-@@ -12868,8 +12868,8 @@ public static final boolean gtk_widget_child_focus(int /*long*/ widget, int dire
+@@ -12881,8 +12881,8 @@ public static final boolean gtk_widget_child_focus(int /*long*/ widget, int dire
* @param widget cast=(GtkWidget *)
* @param text cast=(const gchar *)
*/
@@ -26488,7 +26515,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_widget_create_pango_layout(widget, text);
-@@ -12881,8 +12881,8 @@ public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ wid
+@@ -12894,8 +12894,8 @@ public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ wid
* @param widget cast=(GtkWidget *)
* @param text cast=(const gchar *)
*/
@@ -26499,7 +26526,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_widget_create_pango_layout(widget, text);
-@@ -12891,8 +12891,8 @@ public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ wid
+@@ -12904,8 +12904,8 @@ public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ wid
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26510,7 +26537,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_destroy(widget);
-@@ -12904,8 +12904,8 @@ public static final void gtk_widget_destroy(int /*long*/ widget) {
+@@ -12917,8 +12917,8 @@ public static final void gtk_widget_destroy(int /*long*/ widget) {
* @param widget cast=(GtkWidget *)
* @param event cast=(GdkEvent *)
*/
@@ -26521,7 +26548,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_widget_event(widget, event);
-@@ -12914,8 +12914,8 @@ public static final boolean gtk_widget_event(int /*long*/ widget, int /*long*/ e
+@@ -12927,8 +12927,8 @@ public static final boolean gtk_widget_event(int /*long*/ widget, int /*long*/ e
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26532,7 +26559,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_widget_get_accessible(widget);
-@@ -12924,8 +12924,8 @@ public static final int /*long*/ gtk_widget_get_accessible (int /*long*/ widget)
+@@ -12937,8 +12937,8 @@ public static final int /*long*/ gtk_widget_get_accessible (int /*long*/ widget)
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26543,7 +26570,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_widget_get_child_visible(widget);
-@@ -12942,8 +12942,8 @@ public static final int gtk_widget_get_default_direction() {
+@@ -12955,8 +12955,8 @@ public static final int gtk_widget_get_default_direction() {
lock.unlock();
}
}
@@ -26554,7 +26581,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_widget_get_default_style();
-@@ -12952,8 +12952,8 @@ public static final int /*long*/ gtk_widget_get_default_style() {
+@@ -12965,8 +12965,8 @@ public static final int /*long*/ gtk_widget_get_default_style() {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26565,7 +26592,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_widget_get_direction(widget);
-@@ -12962,8 +12962,8 @@ public static final int gtk_widget_get_direction(int /*long*/ widget) {
+@@ -12975,8 +12975,8 @@ public static final int gtk_widget_get_direction(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26576,7 +26603,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_widget_get_events(widget);
-@@ -12972,8 +12972,8 @@ public static final int gtk_widget_get_events(int /*long*/ widget) {
+@@ -12985,8 +12985,8 @@ public static final int gtk_widget_get_events(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26587,7 +26614,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_widget_get_modifier_style(widget);
-@@ -12982,8 +12982,8 @@ public static final int /*long*/ gtk_widget_get_modifier_style(int /*long*/ widg
+@@ -12995,8 +12995,8 @@ public static final int /*long*/ gtk_widget_get_modifier_style(int /*long*/ widg
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26598,7 +26625,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_widget_get_pango_context(widget);
-@@ -12992,8 +12992,8 @@ public static final int /*long*/ gtk_widget_get_pango_context(int /*long*/ widge
+@@ -13005,8 +13005,8 @@ public static final int /*long*/ gtk_widget_get_pango_context(int /*long*/ widge
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26609,7 +26636,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_widget_get_parent(widget);
-@@ -13002,8 +13002,8 @@ public static final int /*long*/ gtk_widget_get_parent(int /*long*/ widget) {
+@@ -13015,8 +13015,8 @@ public static final int /*long*/ gtk_widget_get_parent(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26620,7 +26647,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_widget_get_parent_window(widget);
-@@ -13012,8 +13012,8 @@ public static final int /*long*/ gtk_widget_get_parent_window(int /*long*/ widge
+@@ -13025,8 +13025,8 @@ public static final int /*long*/ gtk_widget_get_parent_window(int /*long*/ widge
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26631,7 +26658,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_widget_get_style(widget);
-@@ -13026,8 +13026,8 @@ public static final int /*long*/ gtk_widget_get_style(int /*long*/ widget) {
+@@ -13039,8 +13039,8 @@ public static final int /*long*/ gtk_widget_get_style(int /*long*/ widget) {
* @param width cast=(gint *)
* @param height cast=(gint *)
*/
@@ -26642,7 +26669,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_get_size_request(widget, width, height);
-@@ -13036,8 +13036,8 @@ public static final void gtk_widget_get_size_request(int /*long*/ widget, int []
+@@ -13049,8 +13049,8 @@ public static final void gtk_widget_get_size_request(int /*long*/ widget, int []
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26653,7 +26680,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_widget_get_toplevel(widget);
-@@ -13046,8 +13046,8 @@ public static final int /*long*/ gtk_widget_get_toplevel (int /*long*/ widget) {
+@@ -13059,8 +13059,8 @@ public static final int /*long*/ gtk_widget_get_toplevel (int /*long*/ widget) {
}
}
/** @method flags=dynamic */
@@ -26664,7 +26691,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_widget_get_tooltip_text(widget);
-@@ -13056,8 +13056,8 @@ public static final int /*long*/ gtk_widget_get_tooltip_text (int /*long*/ widge
+@@ -13069,8 +13069,8 @@ public static final int /*long*/ gtk_widget_get_tooltip_text (int /*long*/ widge
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26675,7 +26702,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_grab_focus(widget);
-@@ -13066,8 +13066,8 @@ public static final void gtk_widget_grab_focus(int /*long*/ widget) {
+@@ -13079,8 +13079,8 @@ public static final void gtk_widget_grab_focus(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26686,7 +26713,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_hide(widget);
-@@ -13079,8 +13079,8 @@ public static final void gtk_widget_hide(int /*long*/ widget) {
+@@ -13092,8 +13092,8 @@ public static final void gtk_widget_hide(int /*long*/ widget) {
* @method flags=dynamic
* @param widget cast=(GtkWidget *)
*/
@@ -26697,7 +26724,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_widget_is_composited(widget);
-@@ -13089,8 +13089,8 @@ public static final boolean gtk_widget_is_composited(int /*long*/ widget) {
+@@ -13102,8 +13102,8 @@ public static final boolean gtk_widget_is_composited(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26708,7 +26735,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_widget_is_focus(widget);
-@@ -13099,8 +13099,8 @@ public static final boolean gtk_widget_is_focus(int /*long*/ widget) {
+@@ -13112,8 +13112,8 @@ public static final boolean gtk_widget_is_focus(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26719,7 +26746,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_map(widget);
-@@ -13112,8 +13112,8 @@ public static final void gtk_widget_map(int /*long*/ widget) {
+@@ -13125,8 +13125,8 @@ public static final void gtk_widget_map(int /*long*/ widget) {
* @param widget cast=(GtkWidget *)
* @param group_cycling cast=(gboolean)
*/
@@ -26730,7 +26757,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_widget_mnemonic_activate(widget, group_cycling);
-@@ -13126,8 +13126,8 @@ public static final boolean gtk_widget_mnemonic_activate(int /*long*/ widget, bo
+@@ -13139,8 +13139,8 @@ public static final boolean gtk_widget_mnemonic_activate(int /*long*/ widget, bo
* @param state cast=(GtkStateType)
* @param color cast=(GdkColor *),flags=no_out
*/
@@ -26741,7 +26768,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_modify_base(widget, state, color);
-@@ -13140,8 +13140,8 @@ public static final void gtk_widget_modify_base(int /*long*/ widget, int state,
+@@ -13153,8 +13153,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
*/
@@ -26752,7 +26779,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_modify_bg(widget, state, color);
-@@ -13154,8 +13154,8 @@ public static final void gtk_widget_modify_bg(int /*long*/ widget, int state, Gd
+@@ -13167,8 +13167,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
*/
@@ -26763,7 +26790,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_modify_fg(widget, state, color);
-@@ -13167,8 +13167,8 @@ public static final void gtk_widget_modify_fg(int /*long*/ widget, int state, Gd
+@@ -13180,8 +13180,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 *)
*/
@@ -26774,7 +26801,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_modify_font(widget, pango_font_descr);
-@@ -13180,8 +13180,8 @@ public static final void gtk_widget_modify_font(int /*long*/ widget, int /*long*
+@@ -13193,8 +13193,8 @@ public static final void gtk_widget_modify_font(int /*long*/ widget, int /*long*
* @param widget cast=(GtkWidget *)
* @param style cast=(GtkRcStyle *)
*/
@@ -26785,7 +26812,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_modify_style(widget, style);
-@@ -13194,8 +13194,8 @@ public static final void gtk_widget_modify_style(int /*long*/ widget, int /*long
+@@ -13207,8 +13207,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
*/
@@ -26796,7 +26823,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_modify_text(widget, state, color);
-@@ -13204,8 +13204,8 @@ public static final void gtk_widget_modify_text(int /*long*/ widget, int state,
+@@ -13217,8 +13217,8 @@ public static final void gtk_widget_modify_text(int /*long*/ widget, int state,
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26807,7 +26834,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_queue_resize(widget);
-@@ -13214,8 +13214,8 @@ public static final void gtk_widget_queue_resize(int /*long*/ widget) {
+@@ -13227,8 +13227,8 @@ public static final void gtk_widget_queue_resize(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26818,7 +26845,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_realize(widget);
-@@ -13229,8 +13229,8 @@ public static final void gtk_widget_realize(int /*long*/ widget) {
+@@ -13242,8 +13242,8 @@ public static final void gtk_widget_realize(int /*long*/ widget) {
* @param accel_key cast=(guint)
* @param accel_mods cast=(GdkModifierType)
*/
@@ -26829,7 +26856,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_remove_accelerator(widget, accel_group, accel_key, accel_mods);
-@@ -13242,8 +13242,8 @@ public static final void gtk_widget_remove_accelerator(int /*long*/ widget, int
+@@ -13255,8 +13255,8 @@ public static final void gtk_widget_remove_accelerator(int /*long*/ widget, int
* @param widget cast=(GtkWidget *)
* @param new_parent cast=(GtkWidget *)
*/
@@ -26840,7 +26867,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_reparent(widget, new_parent);
-@@ -13255,8 +13255,8 @@ public static final void gtk_widget_reparent(int /*long*/ widget, int /*long*/ n
+@@ -13268,8 +13268,8 @@ public static final void gtk_widget_reparent(int /*long*/ widget, int /*long*/ n
* @param widget cast=(GtkWidget *)
* @param event cast=(GdkEvent *)
*/
@@ -26851,7 +26878,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_widget_send_expose(widget, event);
-@@ -13265,8 +13265,8 @@ public static final int gtk_widget_send_expose(int /*long*/ widget, int /*long*/
+@@ -13278,8 +13278,8 @@ public static final int gtk_widget_send_expose(int /*long*/ widget, int /*long*/
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26862,7 +26889,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_set_app_paintable(widget, app_paintable);
-@@ -13288,8 +13288,8 @@ public static final void gtk_widget_set_default_direction(int dir) {
+@@ -13301,8 +13301,8 @@ public static final void gtk_widget_set_default_direction(int dir) {
* @param widget cast=(GtkWidget *)
* @param dir cast=(GtkTextDirection)
*/
@@ -26873,7 +26900,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_set_direction(widget, dir);
-@@ -13301,8 +13301,8 @@ public static final void gtk_widget_set_direction(int /*long*/ widget, int dir)
+@@ -13314,8 +13314,8 @@ public static final void gtk_widget_set_direction(int /*long*/ widget, int dir)
* @param widget cast=(GtkWidget *)
* @param double_buffered cast=(gboolean)
*/
@@ -26884,7 +26911,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_set_double_buffered(widget, double_buffered);
-@@ -13314,8 +13314,8 @@ public static final void gtk_widget_set_double_buffered(int /*long*/ widget, boo
+@@ -13327,8 +13327,8 @@ public static final void gtk_widget_set_double_buffered(int /*long*/ widget, boo
* @param widget cast=(GtkWidget *)
* @param name cast=(const char *)
*/
@@ -26895,7 +26922,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_set_name(widget, name);
-@@ -13327,8 +13327,8 @@ public static final void gtk_widget_set_name(int /*long*/ widget, byte[] name) {
+@@ -13340,8 +13340,8 @@ public static final void gtk_widget_set_name(int /*long*/ widget, byte[] name) {
* @param widget cast=(GtkWidget *)
* @param redraw cast=(gboolean)
*/
@@ -26906,7 +26933,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_set_redraw_on_allocate(widget, redraw);
-@@ -13340,8 +13340,8 @@ public static final void gtk_widget_set_redraw_on_allocate(int /*long*/ widget,
+@@ -13353,8 +13353,8 @@ public static final void gtk_widget_set_redraw_on_allocate(int /*long*/ widget,
* @param widget cast=(GtkWidget *)
* @param sensitive cast=(gboolean)
*/
@@ -26917,7 +26944,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_set_sensitive(widget, sensitive);
-@@ -13354,8 +13354,8 @@ public static final void gtk_widget_set_sensitive(int /*long*/ widget, boolean s
+@@ -13367,8 +13367,8 @@ public static final void gtk_widget_set_sensitive(int /*long*/ widget, boolean s
* @param width cast=(gint)
* @param height cast=(gint)
*/
@@ -26928,7 +26955,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_set_size_request(widget, width, height);
-@@ -13367,8 +13367,8 @@ public static final void gtk_widget_set_size_request(int /*long*/ widget, int wi
+@@ -13380,8 +13380,8 @@ public static final void gtk_widget_set_size_request(int /*long*/ widget, int wi
* @param widget cast=(GtkWidget *)
* @param state cast=(GtkStateType)
*/
@@ -26939,7 +26966,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_set_state(widget, state);
-@@ -13380,8 +13380,8 @@ public static final void gtk_widget_set_state(int /*long*/ widget, int state) {
+@@ -13393,8 +13393,8 @@ public static final void gtk_widget_set_state(int /*long*/ widget, int state) {
* @param widget cast=(GtkWidget *)
* @param style cast=(GtkStyle *)
*/
@@ -26950,7 +26977,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_set_style(widget, style);
-@@ -13395,8 +13395,8 @@ public static final void gtk_widget_set_style(int /*long*/ widget, int /*long*/
+@@ -13408,8 +13408,8 @@ public static final void gtk_widget_set_style(int /*long*/ widget, int /*long*/
* @param offset_x cast=(gint)
* @param offset_y cast=(gint)
*/
@@ -26961,7 +26988,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_shape_combine_mask(widget, shape_mask, offset_x, offset_y);
-@@ -13405,8 +13405,8 @@ public static final void gtk_widget_shape_combine_mask(int /*long*/ widget, int
+@@ -13418,8 +13418,8 @@ public static final void gtk_widget_shape_combine_mask(int /*long*/ widget, int
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26972,7 +26999,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_show(widget);
-@@ -13415,8 +13415,8 @@ public static final void gtk_widget_show(int /*long*/ widget) {
+@@ -13428,8 +13428,8 @@ public static final void gtk_widget_show(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
@@ -26983,7 +27010,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_show_now(widget);
-@@ -13428,8 +13428,8 @@ public static final void gtk_widget_show_now(int /*long*/ widget) {
+@@ -13441,8 +13441,8 @@ public static final void gtk_widget_show_now(int /*long*/ widget) {
* @param widget cast=(GtkWidget *)
* @param allocation cast=(GtkAllocation *),flags=no_out
*/
@@ -26994,7 +27021,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_size_allocate(widget, allocation);
-@@ -13441,8 +13441,8 @@ public static final void gtk_widget_size_allocate(int /*long*/ widget, GtkAlloca
+@@ -13454,8 +13454,8 @@ public static final void gtk_widget_size_allocate(int /*long*/ widget, GtkAlloca
* @param widget cast=(GtkWidget *)
* @param requisition cast=(GtkRequisition *),flags=no_in
*/
@@ -27005,7 +27032,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_size_request(widget, requisition);
-@@ -13455,8 +13455,8 @@ public static final void gtk_widget_size_request(int /*long*/ widget, GtkRequisi
+@@ -13468,8 +13468,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
*/
@@ -27016,7 +27043,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_style_get(widget, property_name, value, terminator);
-@@ -13469,8 +13469,8 @@ public static final void gtk_widget_style_get(int /*long*/ widget, byte[] proper
+@@ -13482,8 +13482,8 @@ public static final void gtk_widget_style_get(int /*long*/ widget, byte[] proper
* @param property_name cast=(const gchar *)
* @param terminator cast=(const gchar *),flags=sentinel
*/
@@ -27027,7 +27054,7 @@ index 62bc7a8..eb1efa2 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
+@@ -13495,8 +13495,8 @@ public static final void gtk_widget_style_get(int /*long*/ widget, byte[] proper
* @param src_widget cast=(GtkWidget *)
* @param dest_widget cast=(GtkWidget *)
*/
@@ -27038,7 +27065,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_widget_translate_coordinates(src_widget, dest_widget, src_x, src_y, dest_x, dest_y);
-@@ -13492,8 +13492,8 @@ public static final boolean gtk_widget_translate_coordinates(int /*long*/ src_wi
+@@ -13505,8 +13505,8 @@ public static final boolean gtk_widget_translate_coordinates(int /*long*/ src_wi
}
}
/** @param widget cast=(GtkWidget *) */
@@ -27049,7 +27076,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_unrealize(widget);
-@@ -13502,8 +13502,8 @@ public static final void gtk_widget_unrealize(int /*long*/ widget) {
+@@ -13515,8 +13515,8 @@ public static final void gtk_widget_unrealize(int /*long*/ widget) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -27060,7 +27087,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_window_activate_default(window);
-@@ -13515,8 +13515,8 @@ public static final boolean gtk_window_activate_default(int /*long*/ window) {
+@@ -13528,8 +13528,8 @@ public static final boolean gtk_window_activate_default(int /*long*/ window) {
* @param window cast=(GtkWindow *)
* @param accel_group cast=(GtkAccelGroup *)
*/
@@ -27071,7 +27098,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_add_accel_group(window, accel_group);
-@@ -13525,8 +13525,8 @@ public static final void gtk_window_add_accel_group(int /*long*/ window, int /*l
+@@ -13538,8 +13538,8 @@ public static final void gtk_window_add_accel_group(int /*long*/ window, int /*l
}
}
/** @param handle cast=(GtkWindow *) */
@@ -27082,7 +27109,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_deiconify(handle);
-@@ -13535,8 +13535,8 @@ public static final void gtk_window_deiconify(int /*long*/ handle) {
+@@ -13548,8 +13548,8 @@ public static final void gtk_window_deiconify(int /*long*/ handle) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -27093,7 +27120,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_window_get_focus(window);
-@@ -13548,8 +13548,8 @@ public static final int /*long*/ gtk_window_get_focus(int /*long*/ window) {
+@@ -13561,8 +13561,8 @@ public static final int /*long*/ gtk_window_get_focus(int /*long*/ window) {
* @method flags=dynamic
* @param window cast=(GtkWindow *)
*/
@@ -27104,7 +27131,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_window_get_group(window);
-@@ -13558,8 +13558,8 @@ public static final int /*long*/ gtk_window_get_group(int /*long*/ window) {
+@@ -13571,8 +13571,8 @@ public static final int /*long*/ gtk_window_get_group(int /*long*/ window) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -27115,7 +27142,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_window_get_icon_list(window);
-@@ -13568,8 +13568,8 @@ public static final int /*long*/ gtk_window_get_icon_list(int /*long*/ window) {
+@@ -13581,8 +13581,8 @@ public static final int /*long*/ gtk_window_get_icon_list(int /*long*/ window) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -27126,7 +27153,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_window_get_modal(window);
-@@ -13578,8 +13578,8 @@ public static final boolean gtk_window_get_modal(int /*long*/ window) {
+@@ -13591,8 +13591,8 @@ public static final boolean gtk_window_get_modal(int /*long*/ window) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -27137,7 +27164,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_window_get_mnemonic_modifier(window);
-@@ -13591,8 +13591,8 @@ public static final int gtk_window_get_mnemonic_modifier(int /*long*/ window) {
+@@ -13604,8 +13604,8 @@ public static final int gtk_window_get_mnemonic_modifier(int /*long*/ window) {
* @method flags=dynamic
* @param window cast=(GtkWindow *)
*/
@@ -27148,7 +27175,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_window_get_opacity (window);
-@@ -13605,8 +13605,8 @@ public static final double gtk_window_get_opacity (int /*long*/ window) {
+@@ -13618,8 +13618,8 @@ public static final double gtk_window_get_opacity (int /*long*/ window) {
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
@@ -27159,7 +27186,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_get_position(handle, x, y);
-@@ -13619,8 +13619,8 @@ public static final void gtk_window_get_position(int /*long*/ handle, int[] x, i
+@@ -13632,8 +13632,8 @@ public static final void gtk_window_get_position(int /*long*/ handle, int[] x, i
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
@@ -27170,7 +27197,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_get_size(handle, x, y);
-@@ -13632,8 +13632,8 @@ public static final void gtk_window_get_size(int /*long*/ handle, int[] x, int[]
+@@ -13645,8 +13645,8 @@ public static final void gtk_window_get_size(int /*long*/ handle, int[] x, int[]
* @param group cast=(GtkWindowGroup*)
* @param window cast=(GtkWindow*)
*/
@@ -27181,7 +27208,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_group_add_window(group, window);
-@@ -13645,8 +13645,8 @@ public static final void gtk_window_group_add_window(int /*long*/ group, int /*l
+@@ -13658,8 +13658,8 @@ public static final void gtk_window_group_add_window(int /*long*/ group, int /*l
* @param group cast=(GtkWindowGroup*)
* @param window cast=(GtkWindow*)
*/
@@ -27192,7 +27219,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_group_remove_window(group, window);
-@@ -13654,8 +13654,8 @@ public static final void gtk_window_group_remove_window(int /*long*/ group, int
+@@ -13667,8 +13667,8 @@ public static final void gtk_window_group_remove_window(int /*long*/ group, int
lock.unlock();
}
}
@@ -27203,7 +27230,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_window_group_new();
-@@ -13664,8 +13664,8 @@ public static final int /*long*/ gtk_window_group_new() {
+@@ -13677,8 +13677,8 @@ public static final int /*long*/ gtk_window_group_new() {
}
}
/** @param handle cast=(GtkWindow *) */
@@ -27214,7 +27241,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_window_is_active(handle);
-@@ -13674,8 +13674,8 @@ public static final boolean gtk_window_is_active(int /*long*/ handle) {
+@@ -13687,8 +13687,8 @@ public static final boolean gtk_window_is_active(int /*long*/ handle) {
}
}
/** @param handle cast=(GtkWindow *) */
@@ -27225,7 +27252,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_iconify(handle);
-@@ -13683,8 +13683,8 @@ public static final void gtk_window_iconify(int /*long*/ handle) {
+@@ -13696,8 +13696,8 @@ public static final void gtk_window_iconify(int /*long*/ handle) {
lock.unlock();
}
}
@@ -27236,7 +27263,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_window_list_toplevels ();
-@@ -13693,8 +13693,8 @@ public static final int /*long*/ gtk_window_list_toplevels () {
+@@ -13706,8 +13706,8 @@ public static final int /*long*/ gtk_window_list_toplevels () {
}
}
/** @param handle cast=(GtkWindow *) */
@@ -27247,7 +27274,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_maximize(handle);
-@@ -13703,8 +13703,8 @@ public static final void gtk_window_maximize(int /*long*/ handle) {
+@@ -13716,8 +13716,8 @@ public static final void gtk_window_maximize(int /*long*/ handle) {
}
}
/** @param handle cast=(GtkWindow *) */
@@ -27258,7 +27285,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_fullscreen(handle);
-@@ -13713,8 +13713,8 @@ public static final void gtk_window_fullscreen(int /*long*/ handle) {
+@@ -13726,8 +13726,8 @@ public static final void gtk_window_fullscreen(int /*long*/ handle) {
}
}
/** @param handle cast=(GtkWindow *) */
@@ -27269,7 +27296,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_unfullscreen(handle);
-@@ -13727,8 +13727,8 @@ public static final void gtk_window_unfullscreen(int /*long*/ handle) {
+@@ -13740,8 +13740,8 @@ public static final void gtk_window_unfullscreen(int /*long*/ handle) {
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -27280,7 +27307,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_move(handle, x, y);
-@@ -13737,8 +13737,8 @@ public static final void gtk_window_move(int /*long*/ handle, int x, int y) {
+@@ -13750,8 +13750,8 @@ public static final void gtk_window_move(int /*long*/ handle, int x, int y) {
}
}
/** @param type cast=(GtkWindowType) */
@@ -27291,7 +27318,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _gtk_window_new(type);
-@@ -13747,8 +13747,8 @@ public static final int /*long*/ gtk_window_new(int type) {
+@@ -13760,8 +13760,8 @@ public static final int /*long*/ gtk_window_new(int type) {
}
}
/** @param window cast=(GtkWindow *) */
@@ -27302,7 +27329,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_present(window);
-@@ -13760,8 +13760,8 @@ public static final void gtk_window_present(int /*long*/ window) {
+@@ -13773,8 +13773,8 @@ public static final void gtk_window_present(int /*long*/ window) {
* @param window cast=(GtkWindow *)
* @param accel_group cast=(GtkAccelGroup *)
*/
@@ -27313,7 +27340,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_remove_accel_group(window, accel_group);
-@@ -13774,8 +13774,8 @@ public static final void gtk_window_remove_accel_group(int /*long*/ window, int
+@@ -13787,8 +13787,8 @@ public static final void gtk_window_remove_accel_group(int /*long*/ window, int
* @param x cast=(gint)
* @param y cast=(gint)
*/
@@ -27324,7 +27351,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_resize(handle, x, y);
-@@ -13787,8 +13787,8 @@ public static final void gtk_window_resize(int /*long*/ handle, int x, int y) {
+@@ -13800,8 +13800,8 @@ public static final void gtk_window_resize(int /*long*/ handle, int x, int y) {
* @param window cast=(GtkWindow *)
* @param widget cast=(GtkWidget *)
*/
@@ -27335,7 +27362,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_set_default(window, widget);
-@@ -13800,8 +13800,8 @@ public static final void gtk_window_set_default(int /*long*/ window, int /*long*
+@@ -13813,8 +13813,8 @@ public static final void gtk_window_set_default(int /*long*/ window, int /*long*
* @param window cast=(GtkWindow *)
* @param setting cast=(gboolean)
*/
@@ -27346,7 +27373,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_set_destroy_with_parent(window, setting);
-@@ -13814,8 +13814,8 @@ public static final void gtk_window_set_destroy_with_parent(int /*long*/ window,
+@@ -13827,8 +13827,8 @@ public static final void gtk_window_set_destroy_with_parent(int /*long*/ window,
* @param window cast=(GtkWindow *)
* @param setting cast=(gboolean)
*/
@@ -27357,7 +27384,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_set_keep_below(window, setting);
-@@ -13828,8 +13828,8 @@ public static final void gtk_window_set_keep_below(int /*long*/ window, boolean
+@@ -13841,8 +13841,8 @@ public static final void gtk_window_set_keep_below(int /*long*/ window, boolean
* @param geometry_widget cast=(GtkWidget *)
* @param geometry flags=no_out
*/
@@ -27368,7 +27395,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_set_geometry_hints(window, geometry_widget, geometry, geom_mask);
-@@ -13841,8 +13841,8 @@ public static final void gtk_window_set_geometry_hints(int /*long*/ window, int
+@@ -13854,8 +13854,8 @@ public static final void gtk_window_set_geometry_hints(int /*long*/ window, int
* @param window cast=(GtkWindow *)
* @param list cast=(GList *)
*/
@@ -27379,7 +27406,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_set_icon_list(window, list);
-@@ -13854,8 +13854,8 @@ public static final void gtk_window_set_icon_list(int /*long*/ window, int /*lon
+@@ -13867,8 +13867,8 @@ public static final void gtk_window_set_icon_list(int /*long*/ window, int /*lon
* @param window cast=(GtkWindow *)
* @param modal cast=(gboolean)
*/
@@ -27390,7 +27417,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_set_modal(window, modal);
-@@ -13867,8 +13867,8 @@ public static final void gtk_window_set_modal(int /*long*/ window, boolean modal
+@@ -13880,8 +13880,8 @@ public static final void gtk_window_set_modal(int /*long*/ window, boolean modal
* @method flags=dynamic
* @param window cast=(GtkWindow *)
*/
@@ -27401,7 +27428,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_set_opacity(window, opacity);
-@@ -13881,8 +13881,8 @@ public static final void gtk_window_set_opacity(int /*long*/ window, double opac
+@@ -13894,8 +13894,8 @@ public static final void gtk_window_set_opacity(int /*long*/ window, double opac
* @param widget cast=(GtkWidget *)
* @param tip_text cast=(const gchar *)
*/
@@ -27412,7 +27439,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_set_tooltip_text(widget, tip_text);
-@@ -13894,8 +13894,8 @@ public static final void gtk_widget_set_tooltip_text(int /*long*/ widget, byte[]
+@@ -13907,8 +13907,8 @@ public static final void gtk_widget_set_tooltip_text(int /*long*/ widget, byte[]
* @param widget cast=(GtkWidget *)
* @param parent_window cast=(GdkWindow *)
*/
@@ -27423,7 +27450,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_widget_set_parent_window(widget, parent_window);
-@@ -13907,8 +13907,8 @@ public static final void gtk_widget_set_parent_window(int /*long*/ widget, int /
+@@ -13920,8 +13920,8 @@ public static final void gtk_widget_set_parent_window(int /*long*/ widget, int /
* @param window cast=(GtkWindow *)
* @param resizable cast=(gboolean)
*/
@@ -27434,7 +27461,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_set_resizable(window, resizable);
-@@ -13920,8 +13920,8 @@ public static final void gtk_window_set_resizable(int /*long*/ window, boolean r
+@@ -13933,8 +13933,8 @@ public static final void gtk_window_set_resizable(int /*long*/ window, boolean r
* @param window cast=(GtkWindow *)
* @param title cast=(const gchar *)
*/
@@ -27445,7 +27472,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_set_title(window, title);
-@@ -13934,8 +13934,8 @@ public static final void gtk_window_set_title(int /*long*/ window, byte[] title)
+@@ -13947,8 +13947,8 @@ public static final void gtk_window_set_title(int /*long*/ window, byte[] title)
* @param window cast=(GtkWindow *)
* @param skips_taskbar cast=(gboolean)
*/
@@ -27456,7 +27483,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_set_skip_taskbar_hint(window, skips_taskbar);
-@@ -13944,8 +13944,8 @@ public static final void gtk_window_set_skip_taskbar_hint(int /*long*/ window, b
+@@ -13957,8 +13957,8 @@ public static final void gtk_window_set_skip_taskbar_hint(int /*long*/ window, b
}
}
/** @param window cast=(GtkWindow *) */
@@ -27467,7 +27494,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_set_type_hint(window, hint);
-@@ -13957,8 +13957,8 @@ public static final void gtk_window_set_type_hint(int /*long*/ window, int hint)
+@@ -13970,8 +13970,8 @@ public static final void gtk_window_set_type_hint(int /*long*/ window, int hint)
* @param window cast=(GtkWindow *)
* @param parent cast=(GtkWindow *)
*/
@@ -27478,7 +27505,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_set_transient_for(window, parent);
-@@ -13967,8 +13967,8 @@ public static final void gtk_window_set_transient_for(int /*long*/ window, int /
+@@ -13980,8 +13980,8 @@ public static final void gtk_window_set_transient_for(int /*long*/ window, int /
}
}
/** @param handle cast=(GtkWindow *) */
@@ -27489,7 +27516,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_gtk_window_unmaximize(handle);
-@@ -13981,258 +13981,258 @@ public static final void gtk_window_unmaximize(int /*long*/ handle) {
+@@ -13994,258 +13994,258 @@ public static final void gtk_window_unmaximize(int /*long*/ handle) {
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
@@ -27797,7 +27824,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_attribute_copy(attribute);
-@@ -14240,8 +14240,8 @@ public static final int /*long*/ pango_attribute_copy (int /*long*/ attribute) {
+@@ -14253,8 +14253,8 @@ public static final int /*long*/ pango_attribute_copy (int /*long*/ attribute) {
lock.unlock();
}
}
@@ -27808,7 +27835,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_attr_background_new(red, green, blue);
-@@ -14250,8 +14250,8 @@ public static final int /*long*/ pango_attr_background_new (short red, short gre
+@@ -14263,8 +14263,8 @@ public static final int /*long*/ pango_attr_background_new (short red, short gre
}
}
/** @param desc cast=(const PangoFontDescription *) */
@@ -27819,7 +27846,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_attr_font_desc_new(desc);
-@@ -14259,8 +14259,8 @@ public static final int /*long*/ pango_attr_font_desc_new(int /*long*/ desc) {
+@@ -14272,8 +14272,8 @@ public static final int /*long*/ pango_attr_font_desc_new(int /*long*/ desc) {
lock.unlock();
}
}
@@ -27830,7 +27857,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_attr_foreground_new(red, green, blue);
-@@ -14268,8 +14268,8 @@ public static final int /*long*/ pango_attr_foreground_new (short red, short gre
+@@ -14281,8 +14281,8 @@ public static final int /*long*/ pango_attr_foreground_new (short red, short gre
lock.unlock();
}
}
@@ -27841,7 +27868,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_attr_rise_new(rise);
-@@ -14281,8 +14281,8 @@ public static final int /*long*/ pango_attr_rise_new(int rise) {
+@@ -14294,8 +14294,8 @@ public static final int /*long*/ pango_attr_rise_new(int rise) {
* @param ink_rect flags=no_out
* @param logical_rect flags=no_out
*/
@@ -27852,7 +27879,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_attr_shape_new(ink_rect, logical_rect);
-@@ -14294,8 +14294,8 @@ public static final int /*long*/ pango_attr_shape_new(PangoRectangle ink_rect, P
+@@ -14307,8 +14307,8 @@ public static final int /*long*/ pango_attr_shape_new(PangoRectangle ink_rect, P
* @param list cast=(PangoAttrList *)
* @param attr cast=(PangoAttribute *)
*/
@@ -27863,7 +27890,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_attr_list_insert(list, attr);
-@@ -14307,8 +14307,8 @@ public static final void pango_attr_list_insert(int /*long*/ list, int /*long*/
+@@ -14320,8 +14320,8 @@ public static final void pango_attr_list_insert(int /*long*/ list, int /*long*/
* @param list cast=(PangoAttrList *)
* @param attr cast=(PangoAttribute *)
*/
@@ -27874,7 +27901,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_attr_list_change(list, attr);
-@@ -14317,8 +14317,8 @@ public static final void pango_attr_list_change(int /*long*/ list, int /*long*/
+@@ -14330,8 +14330,8 @@ public static final void pango_attr_list_change(int /*long*/ list, int /*long*/
}
}
/** @param list cast=(PangoAttrList *) */
@@ -27885,7 +27912,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_attr_list_get_iterator(list);
-@@ -14327,8 +14327,8 @@ public static final int /*long*/ pango_attr_list_get_iterator(int /*long*/ list)
+@@ -14340,8 +14340,8 @@ public static final int /*long*/ pango_attr_list_get_iterator(int /*long*/ list)
}
}
/** @param iterator cast=(PangoAttrIterator *) */
@@ -27896,7 +27923,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_attr_iterator_next(iterator);
-@@ -14337,8 +14337,8 @@ public static final boolean pango_attr_iterator_next(int /*long*/ iterator) {
+@@ -14350,8 +14350,8 @@ public static final boolean pango_attr_iterator_next(int /*long*/ iterator) {
}
}
/** @param iterator cast=(PangoAttrIterator *) */
@@ -27907,7 +27934,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_attr_iterator_range(iterator, start, end);
-@@ -14350,8 +14350,8 @@ public static final void pango_attr_iterator_range(int /*long*/ iterator, int[]
+@@ -14363,8 +14363,8 @@ public static final void pango_attr_iterator_range(int /*long*/ iterator, int[]
* @param iterator cast=(PangoAttrIterator *)
* @param type cast=(PangoAttrType)
*/
@@ -27918,7 +27945,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_attr_iterator_get(iterator, type);
-@@ -14360,8 +14360,8 @@ public static final int /*long*/ pango_attr_iterator_get(int /*long*/ iterator,
+@@ -14373,8 +14373,8 @@ public static final int /*long*/ pango_attr_iterator_get(int /*long*/ iterator,
}
}
/** @param iterator cast=(PangoAttrIterator *) */
@@ -27929,7 +27956,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_attr_iterator_get_attrs(iterator);
-@@ -14371,8 +14371,8 @@ public static final int /*long*/ pango_attr_iterator_get_attrs(int /*long*/ iter
+@@ -14384,8 +14384,8 @@ public static final int /*long*/ pango_attr_iterator_get_attrs(int /*long*/ iter
}
/** @param iterator cast=(PangoAttrIterator *) */
@@ -27940,7 +27967,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_attr_iterator_destroy(iterator);
-@@ -14380,8 +14380,8 @@ public static final void pango_attr_iterator_destroy(int /*long*/ iterator) {
+@@ -14393,8 +14393,8 @@ public static final void pango_attr_iterator_destroy(int /*long*/ iterator) {
lock.unlock();
}
}
@@ -27951,7 +27978,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_attr_list_new();
-@@ -14390,8 +14390,8 @@ public static final int /*long*/ pango_attr_list_new() {
+@@ -14403,8 +14403,8 @@ public static final int /*long*/ pango_attr_list_new() {
}
}
/** @param list cast=(PangoAttrList *) */
@@ -27962,7 +27989,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_attr_list_unref(list);
-@@ -14400,8 +14400,8 @@ public static final void pango_attr_list_unref(int /*long*/ list) {
+@@ -14413,8 +14413,8 @@ public static final void pango_attr_list_unref(int /*long*/ list) {
}
}
/** @method flags=dynamic */
@@ -27973,7 +28000,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_attr_strikethrough_color_new(red, green, blue);
-@@ -14409,8 +14409,8 @@ public static final int /*long*/ pango_attr_strikethrough_color_new(short red, s
+@@ -14422,8 +14422,8 @@ public static final int /*long*/ pango_attr_strikethrough_color_new(short red, s
lock.unlock();
}
}
@@ -27984,7 +28011,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_attr_strikethrough_new(strikethrough);
-@@ -14419,8 +14419,8 @@ public static final int /*long*/ pango_attr_strikethrough_new(boolean strikethro
+@@ -14432,8 +14432,8 @@ public static final int /*long*/ pango_attr_strikethrough_new(boolean strikethro
}
}
/** @method flags=dynamic */
@@ -27995,7 +28022,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_attr_underline_color_new(red, green, blue);
-@@ -14428,8 +14428,8 @@ public static final int /*long*/ pango_attr_underline_color_new(short red, short
+@@ -14441,8 +14441,8 @@ public static final int /*long*/ pango_attr_underline_color_new(short red, short
lock.unlock();
}
}
@@ -28006,7 +28033,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_attr_underline_new(underline);
-@@ -14437,8 +14437,8 @@ public static final int /*long*/ pango_attr_underline_new(int underline) {
+@@ -14450,8 +14450,8 @@ public static final int /*long*/ pango_attr_underline_new(int underline) {
lock.unlock();
}
}
@@ -28017,7 +28044,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_attr_weight_new(weight);
-@@ -14447,8 +14447,8 @@ public static final int /*long*/ pango_attr_weight_new(int weight) {
+@@ -14460,8 +14460,8 @@ public static final int /*long*/ pango_attr_weight_new(int weight) {
}
}
/** @method flags=dynamic */
@@ -28028,7 +28055,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_cairo_font_map_get_default();
-@@ -14457,8 +14457,8 @@ public static final int /*long*/ pango_cairo_font_map_get_default() {
+@@ -14470,8 +14470,8 @@ public static final int /*long*/ pango_cairo_font_map_get_default() {
}
}
/** @method flags=dynamic */
@@ -28039,7 +28066,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_cairo_font_map_new();
-@@ -14467,8 +14467,8 @@ public static final int /*long*/ pango_cairo_font_map_new() {
+@@ -14480,8 +14480,8 @@ public static final int /*long*/ pango_cairo_font_map_new() {
}
}
/** @method flags=dynamic */
@@ -28050,7 +28077,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_cairo_font_map_create_context(fontmap);
-@@ -14477,8 +14477,8 @@ public static final int /*long*/ pango_cairo_font_map_create_context(int /*long*
+@@ -14490,8 +14490,8 @@ public static final int /*long*/ pango_cairo_font_map_create_context(int /*long*
}
}
/** @method flags=dynamic */
@@ -28061,7 +28088,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_cairo_create_layout(cairo);
-@@ -14490,8 +14490,8 @@ public static final int /*long*/ pango_cairo_create_layout(int /*long*/ cairo) {
+@@ -14503,8 +14503,8 @@ public static final int /*long*/ pango_cairo_create_layout(int /*long*/ cairo) {
* @method flags=dynamic
* @param context cast=(PangoContext *)
*/
@@ -28072,7 +28099,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_cairo_context_get_font_options(context);
-@@ -14503,8 +14503,8 @@ public static final int /*long*/ pango_cairo_context_get_font_options(int /*long
+@@ -14516,8 +14516,8 @@ public static final int /*long*/ pango_cairo_context_get_font_options(int /*long
* @method flags=dynamic
* @param context cast=(PangoContext *)
*/
@@ -28083,7 +28110,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_cairo_context_set_font_options(context, options);
-@@ -14513,8 +14513,8 @@ public static final void pango_cairo_context_set_font_options(int /*long*/ conte
+@@ -14526,8 +14526,8 @@ public static final void pango_cairo_context_set_font_options(int /*long*/ conte
}
}
/** @method flags=dynamic */
@@ -28094,7 +28121,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_cairo_font_map_set_resolution(fontmap, dpi);
-@@ -14523,8 +14523,8 @@ public static final void pango_cairo_font_map_set_resolution(int /*long*/ fontma
+@@ -14536,8 +14536,8 @@ public static final void pango_cairo_font_map_set_resolution(int /*long*/ fontma
}
}
/** @method flags=dynamic */
@@ -28105,7 +28132,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_cairo_layout_path(cairo, layout);
-@@ -14533,8 +14533,8 @@ public static final void pango_cairo_layout_path(int /*long*/ cairo, int /*long*
+@@ -14546,8 +14546,8 @@ public static final void pango_cairo_layout_path(int /*long*/ cairo, int /*long*
}
}
/** @method flags=dynamic */
@@ -28116,7 +28143,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_cairo_show_layout(cairo, layout);
-@@ -14543,8 +14543,8 @@ public static final void pango_cairo_show_layout(int /*long*/ cairo, int /*long*
+@@ -14556,8 +14556,8 @@ public static final void pango_cairo_show_layout(int /*long*/ cairo, int /*long*
}
}
/** @param context cast=(PangoContext *) */
@@ -28127,7 +28154,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_context_get_base_dir(context);
-@@ -14553,8 +14553,8 @@ public static final int pango_context_get_base_dir(int /*long*/ context) {
+@@ -14566,8 +14566,8 @@ public static final int pango_context_get_base_dir(int /*long*/ context) {
}
}
/** @param context cast=(PangoContext *) */
@@ -28138,7 +28165,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_context_get_language(context);
-@@ -14567,8 +14567,8 @@ public static final int /*long*/ pango_context_get_language(int /*long*/ context
+@@ -14580,8 +14580,8 @@ public static final int /*long*/ pango_context_get_language(int /*long*/ context
* @param desc cast=(const PangoFontDescription *)
* @param language cast=(PangoLanguage *)
*/
@@ -28149,7 +28176,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_context_get_metrics(context, desc, language);
-@@ -14581,8 +14581,8 @@ public static final int /*long*/ pango_context_get_metrics(int /*long*/ context,
+@@ -14594,8 +14594,8 @@ public static final int /*long*/ pango_context_get_metrics(int /*long*/ context,
* @param families cast=(PangoFontFamily ***)
* @param n_families cast=(int *)
*/
@@ -28160,7 +28187,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_context_list_families(context, families, n_families);
-@@ -14591,8 +14591,8 @@ public static final void pango_context_list_families(int /*long*/ context, int /
+@@ -14604,8 +14604,8 @@ public static final void pango_context_list_families(int /*long*/ context, int /
}
}
/** @param context cast=(PangoContext *) */
@@ -28171,7 +28198,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_context_set_base_dir(context, direction);
-@@ -14604,8 +14604,8 @@ public static final void pango_context_set_base_dir(int /*long*/ context, int di
+@@ -14617,8 +14617,8 @@ public static final void pango_context_set_base_dir(int /*long*/ context, int di
* @param context cast=(PangoContext *)
* @param language cast=(PangoLanguage *)
*/
@@ -28182,7 +28209,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_context_set_language(context, language);
-@@ -14614,8 +14614,8 @@ public static final void pango_context_set_language(int /*long*/ context, int /*
+@@ -14627,8 +14627,8 @@ public static final void pango_context_set_language(int /*long*/ context, int /*
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -28193,7 +28220,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_font_description_copy(desc);
-@@ -14624,8 +14624,8 @@ public static final int /*long*/ pango_font_description_copy(int /*long*/ desc)
+@@ -14637,8 +14637,8 @@ public static final int /*long*/ pango_font_description_copy(int /*long*/ desc)
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -28204,7 +28231,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_font_description_free(desc);
-@@ -14634,8 +14634,8 @@ public static final void pango_font_description_free(int /*long*/ desc) {
+@@ -14647,8 +14647,8 @@ public static final void pango_font_description_free(int /*long*/ desc) {
}
}
/** @param str cast=(const char *),flags=no_out critical */
@@ -28215,7 +28242,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_font_description_from_string(str);
-@@ -14644,8 +14644,8 @@ public static final int /*long*/ pango_font_description_from_string(byte[] str)
+@@ -14657,8 +14657,8 @@ public static final int /*long*/ pango_font_description_from_string(byte[] str)
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -28226,7 +28253,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_font_description_get_family(desc);
-@@ -14654,8 +14654,8 @@ public static final int /*long*/ pango_font_description_get_family(int /*long*/
+@@ -14667,8 +14667,8 @@ public static final int /*long*/ pango_font_description_get_family(int /*long*/
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -28237,7 +28264,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_font_description_get_size(desc);
-@@ -14664,8 +14664,8 @@ public static final int pango_font_description_get_size(int /*long*/ desc) {
+@@ -14677,8 +14677,8 @@ public static final int pango_font_description_get_size(int /*long*/ desc) {
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -28248,7 +28275,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_font_description_get_stretch(desc);
-@@ -14674,8 +14674,8 @@ public static final int pango_font_description_get_stretch(int /*long*/ desc) {
+@@ -14687,8 +14687,8 @@ public static final int pango_font_description_get_stretch(int /*long*/ desc) {
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -28259,7 +28286,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_font_description_get_variant(desc);
-@@ -14684,8 +14684,8 @@ public static final int pango_font_description_get_variant(int /*long*/ desc) {
+@@ -14697,8 +14697,8 @@ public static final int pango_font_description_get_variant(int /*long*/ desc) {
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -28270,7 +28297,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_font_description_get_style(desc);
-@@ -14694,8 +14694,8 @@ public static final int pango_font_description_get_style(int /*long*/ desc) {
+@@ -14707,8 +14707,8 @@ public static final int pango_font_description_get_style(int /*long*/ desc) {
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -28281,7 +28308,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_font_description_get_weight(desc);
-@@ -14703,8 +14703,8 @@ public static final int pango_font_description_get_weight(int /*long*/ desc) {
+@@ -14716,8 +14716,8 @@ public static final int pango_font_description_get_weight(int /*long*/ desc) {
lock.unlock();
}
}
@@ -28292,7 +28319,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_font_description_new();
-@@ -14716,8 +14716,8 @@ public static final int /*long*/ pango_font_description_new() {
+@@ -14729,8 +14729,8 @@ public static final int /*long*/ pango_font_description_new() {
* @param desc cast=(PangoFontDescription *)
* @param family cast=(const char *),flags=no_out critical
*/
@@ -28303,7 +28330,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_font_description_set_family(desc, family);
-@@ -14729,8 +14729,8 @@ public static final void pango_font_description_set_family(int /*long*/ desc, by
+@@ -14742,8 +14742,8 @@ public static final void pango_font_description_set_family(int /*long*/ desc, by
* @param desc cast=(PangoFontDescription *)
* @param size cast=(gint)
*/
@@ -28314,7 +28341,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_font_description_set_size(desc, size);
-@@ -14742,8 +14742,8 @@ public static final void pango_font_description_set_size(int /*long*/ desc, int
+@@ -14755,8 +14755,8 @@ public static final void pango_font_description_set_size(int /*long*/ desc, int
* @param desc cast=(PangoFontDescription *)
* @param stretch cast=(PangoStretch)
*/
@@ -28325,7 +28352,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_font_description_set_stretch(desc, stretch);
-@@ -14755,8 +14755,8 @@ public static final void pango_font_description_set_stretch(int /*long*/ desc, i
+@@ -14768,8 +14768,8 @@ public static final void pango_font_description_set_stretch(int /*long*/ desc, i
* @param desc cast=(PangoFontDescription *)
* @param weight cast=(PangoStyle)
*/
@@ -28336,7 +28363,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_font_description_set_style(desc, weight);
-@@ -14768,8 +14768,8 @@ public static final void pango_font_description_set_style(int /*long*/ desc, int
+@@ -14781,8 +14781,8 @@ public static final void pango_font_description_set_style(int /*long*/ desc, int
* @param desc cast=(PangoFontDescription *)
* @param weight cast=(PangoWeight)
*/
@@ -28347,7 +28374,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_font_description_set_weight(desc, weight);
-@@ -14781,8 +14781,8 @@ public static final void pango_font_description_set_weight(int /*long*/ desc, in
+@@ -14794,8 +14794,8 @@ public static final void pango_font_description_set_weight(int /*long*/ desc, in
* @param desc cast=(PangoFontDescription *)
* @param variant cast=(PangoVariant)
*/
@@ -28358,7 +28385,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_font_description_set_variant(desc, variant);
-@@ -14791,8 +14791,8 @@ public static final void pango_font_description_set_variant(int /*long*/ desc, i
+@@ -14804,8 +14804,8 @@ public static final void pango_font_description_set_variant(int /*long*/ desc, i
}
}
/** @param desc cast=(PangoFontDescription *) */
@@ -28369,7 +28396,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_font_description_to_string(desc);
-@@ -14801,8 +14801,8 @@ public static final int /*long*/ pango_font_description_to_string(int /*long*/ d
+@@ -14814,8 +14814,8 @@ public static final int /*long*/ pango_font_description_to_string(int /*long*/ d
}
}
/** @param face cast=(PangoFontFace *) */
@@ -28380,7 +28407,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_font_face_describe(face);
-@@ -14811,8 +14811,8 @@ public static final int /*long*/ pango_font_face_describe(int /*long*/ face) {
+@@ -14824,8 +14824,8 @@ public static final int /*long*/ pango_font_face_describe(int /*long*/ face) {
}
}
/** @param family cast=(PangoFontFamily *) */
@@ -28391,7 +28418,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_font_family_get_name(family);
-@@ -14825,8 +14825,8 @@ public static final int /*long*/ pango_font_family_get_name(int /*long*/ family)
+@@ -14838,8 +14838,8 @@ public static final int /*long*/ pango_font_family_get_name(int /*long*/ family)
* @param faces cast=(PangoFontFace ***)
* @param n_faces cast=(int *)
*/
@@ -28402,7 +28429,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_font_family_list_faces(family, faces, n_faces);
-@@ -14838,8 +14838,8 @@ public static final void pango_font_family_list_faces(int /*long*/ family, int /
+@@ -14851,8 +14851,8 @@ public static final void pango_font_family_list_faces(int /*long*/ family, int /
* @param font cast=(PangoFont *)
* @param language cast=(PangoLanguage *)
*/
@@ -28413,7 +28440,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_font_get_metrics(font, language);
-@@ -14848,8 +14848,8 @@ public static final int /*long*/ pango_font_get_metrics(int /*long*/ font, int /
+@@ -14861,8 +14861,8 @@ public static final int /*long*/ pango_font_get_metrics(int /*long*/ font, int /
}
}
/** @param metrics cast=(PangoFontMetrics *) */
@@ -28424,7 +28451,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_font_metrics_get_approximate_char_width(metrics);
-@@ -14858,8 +14858,8 @@ public static final int pango_font_metrics_get_approximate_char_width(int /*long
+@@ -14871,8 +14871,8 @@ public static final int pango_font_metrics_get_approximate_char_width(int /*long
}
}
/** @param metrics cast=(PangoFontMetrics *) */
@@ -28435,7 +28462,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_font_metrics_get_ascent(metrics);
-@@ -14868,8 +14868,8 @@ public static final int pango_font_metrics_get_ascent(int /*long*/ metrics) {
+@@ -14881,8 +14881,8 @@ public static final int pango_font_metrics_get_ascent(int /*long*/ metrics) {
}
}
/** @param metrics cast=(PangoFontMetrics *) */
@@ -28446,7 +28473,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_font_metrics_get_descent(metrics);
-@@ -14878,8 +14878,8 @@ public static final int pango_font_metrics_get_descent(int /*long*/ metrics) {
+@@ -14891,8 +14891,8 @@ public static final int pango_font_metrics_get_descent(int /*long*/ metrics) {
}
}
/** @method flags=dynamic */
@@ -28457,7 +28484,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_font_metrics_get_underline_thickness(metrics);
-@@ -14888,8 +14888,8 @@ public static final int pango_font_metrics_get_underline_thickness(int /*long*/
+@@ -14901,8 +14901,8 @@ public static final int pango_font_metrics_get_underline_thickness(int /*long*/
}
}
/** @method flags=dynamic */
@@ -28468,7 +28495,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_font_metrics_get_underline_position(metrics);
-@@ -14898,8 +14898,8 @@ public static final int pango_font_metrics_get_underline_position(int /*long*/ m
+@@ -14911,8 +14911,8 @@ public static final int pango_font_metrics_get_underline_position(int /*long*/ m
}
}
/** @method flags=dynamic */
@@ -28479,7 +28506,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_font_metrics_get_strikethrough_thickness(metrics);
-@@ -14908,8 +14908,8 @@ public static final int pango_font_metrics_get_strikethrough_thickness(int /*lon
+@@ -14921,8 +14921,8 @@ public static final int pango_font_metrics_get_strikethrough_thickness(int /*lon
}
}
/** @method flags=dynamic */
@@ -28490,7 +28517,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_font_metrics_get_strikethrough_position(metrics);
-@@ -14918,8 +14918,8 @@ public static final int pango_font_metrics_get_strikethrough_position(int /*long
+@@ -14931,8 +14931,8 @@ public static final int pango_font_metrics_get_strikethrough_position(int /*long
}
}
/** @param metrics cast=(PangoFontMetrics *) */
@@ -28501,7 +28528,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_font_metrics_unref(metrics);
-@@ -14928,8 +14928,8 @@ public static final void pango_font_metrics_unref(int /*long*/ metrics) {
+@@ -14941,8 +14941,8 @@ public static final void pango_font_metrics_unref(int /*long*/ metrics) {
}
}
/** @param language cast=(const char *),flags=no_out */
@@ -28512,7 +28539,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_language_from_string(language);
-@@ -14938,8 +14938,8 @@ public static final int /*long*/ pango_language_from_string(byte[] language) {
+@@ -14951,8 +14951,8 @@ public static final int /*long*/ pango_language_from_string(byte[] language) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28523,7 +28550,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_layout_context_changed(layout);
-@@ -14948,8 +14948,8 @@ public static final void pango_layout_context_changed(int /*long*/ layout) {
+@@ -14961,8 +14961,8 @@ public static final void pango_layout_context_changed(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28534,7 +28561,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_layout_get_alignment(layout);
-@@ -14958,8 +14958,8 @@ public static final int pango_layout_get_alignment(int /*long*/ layout) {
+@@ -14971,8 +14971,8 @@ public static final int pango_layout_get_alignment(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28545,7 +28572,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_layout_get_context(layout);
-@@ -14968,8 +14968,8 @@ public static final int /*long*/ pango_layout_get_context(int /*long*/ layout) {
+@@ -14981,8 +14981,8 @@ public static final int /*long*/ pango_layout_get_context(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28556,7 +28583,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_layout_get_attributes(layout);
-@@ -14978,8 +14978,8 @@ public static final int /*long*/ pango_layout_get_attributes(int /*long*/ layout
+@@ -14991,8 +14991,8 @@ public static final int /*long*/ pango_layout_get_attributes(int /*long*/ layout
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28567,7 +28594,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_layout_get_indent(layout);
-@@ -14988,8 +14988,8 @@ public static final int pango_layout_get_indent(int /*long*/ layout) {
+@@ -15001,8 +15001,8 @@ public static final int pango_layout_get_indent(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28578,7 +28605,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_layout_get_iter(layout);
-@@ -14998,8 +14998,8 @@ public static final int /*long*/ pango_layout_get_iter(int /*long*/ layout) {
+@@ -15011,8 +15011,8 @@ public static final int /*long*/ pango_layout_get_iter(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28589,7 +28616,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_layout_get_justify(layout);
-@@ -15008,8 +15008,8 @@ public static final boolean pango_layout_get_justify(int /*long*/ layout) {
+@@ -15021,8 +15021,8 @@ public static final boolean pango_layout_get_justify(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28600,7 +28627,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_layout_get_line(layout, line);
-@@ -15018,8 +15018,8 @@ public static final int /*long*/ pango_layout_get_line(int /*long*/ layout, int
+@@ -15031,8 +15031,8 @@ public static final int /*long*/ pango_layout_get_line(int /*long*/ layout, int
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28611,7 +28638,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_layout_get_line_count(layout);
-@@ -15032,8 +15032,8 @@ public static final int pango_layout_get_line_count(int /*long*/ layout) {
+@@ -15045,8 +15045,8 @@ public static final int pango_layout_get_line_count(int /*long*/ layout) {
* @param attrs cast=(PangoLogAttr **)
* @param n_attrs cast=(int *)
*/
@@ -28622,7 +28649,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_layout_get_log_attrs(layout, attrs, n_attrs);
-@@ -15046,8 +15046,8 @@ public static final void pango_layout_get_log_attrs(int /*long*/ layout, int /*l
+@@ -15059,8 +15059,8 @@ public static final void pango_layout_get_log_attrs(int /*long*/ layout, int /*l
* @param width cast=(int *)
* @param height cast=(int *)
*/
@@ -28633,7 +28660,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_layout_get_size(layout, width, height);
-@@ -15056,8 +15056,8 @@ public static final void pango_layout_get_size(int /*long*/ layout, int[] width,
+@@ -15069,8 +15069,8 @@ public static final void pango_layout_get_size(int /*long*/ layout, int[] width,
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28644,7 +28671,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_layout_get_spacing(layout);
-@@ -15066,8 +15066,8 @@ public static final int pango_layout_get_spacing(int /*long*/ layout) {
+@@ -15079,8 +15079,8 @@ public static final int pango_layout_get_spacing(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28655,7 +28682,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_layout_get_tabs(layout);
-@@ -15076,8 +15076,8 @@ public static final int /*long*/ pango_layout_get_tabs(int /*long*/ layout) {
+@@ -15089,8 +15089,8 @@ public static final int /*long*/ pango_layout_get_tabs(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28666,7 +28693,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_layout_get_text(layout);
-@@ -15086,8 +15086,8 @@ public static final int /*long*/ pango_layout_get_text(int /*long*/ layout) {
+@@ -15099,8 +15099,8 @@ public static final int /*long*/ pango_layout_get_text(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28677,7 +28704,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_layout_get_width(layout);
-@@ -15099,8 +15099,8 @@ public static final int pango_layout_get_width(int /*long*/ layout) {
+@@ -15112,8 +15112,8 @@ public static final int pango_layout_get_width(int /*long*/ layout) {
* @param layout cast=(PangoLayout*)
* @param pos flags=no_in
*/
@@ -28688,7 +28715,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_layout_index_to_pos(layout, index, pos);
-@@ -15109,8 +15109,8 @@ public static final void pango_layout_index_to_pos(int /*long*/ layout, int inde
+@@ -15122,8 +15122,8 @@ public static final void pango_layout_index_to_pos(int /*long*/ layout, int inde
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -28699,7 +28726,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_layout_iter_free(iter);
-@@ -15123,8 +15123,8 @@ public static final void pango_layout_iter_free(int /*long*/ iter) {
+@@ -15136,8 +15136,8 @@ public static final void pango_layout_iter_free(int /*long*/ iter) {
* @param ink_rect flags=no_in
* @param logical_rect flags=no_in
*/
@@ -28710,7 +28737,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_layout_iter_get_line_extents(iter, ink_rect, logical_rect);
-@@ -15133,8 +15133,8 @@ public static final void pango_layout_iter_get_line_extents(int /*long*/ iter, P
+@@ -15146,8 +15146,8 @@ public static final void pango_layout_iter_get_line_extents(int /*long*/ iter, P
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -28721,7 +28748,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_layout_iter_get_index(iter);
-@@ -15143,8 +15143,8 @@ public static final int pango_layout_iter_get_index(int /*long*/ iter) {
+@@ -15156,8 +15156,8 @@ public static final int pango_layout_iter_get_index(int /*long*/ iter) {
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -28732,7 +28759,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_layout_iter_get_run(iter);
-@@ -15153,8 +15153,8 @@ public static final int /*long*/ pango_layout_iter_get_run(int /*long*/ iter) {
+@@ -15166,8 +15166,8 @@ public static final int /*long*/ pango_layout_iter_get_run(int /*long*/ iter) {
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -28743,7 +28770,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_layout_iter_next_line(iter);
-@@ -15163,8 +15163,8 @@ public static final boolean pango_layout_iter_next_line(int /*long*/ iter) {
+@@ -15176,8 +15176,8 @@ public static final boolean pango_layout_iter_next_line(int /*long*/ iter) {
}
}
/** @param iter cast=(PangoLayoutIter*) */
@@ -28754,7 +28781,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_layout_iter_next_run(iter);
-@@ -15177,8 +15177,8 @@ public static final boolean pango_layout_iter_next_run(int /*long*/ iter) {
+@@ -15190,8 +15190,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
*/
@@ -28765,7 +28792,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_layout_line_get_extents(line, ink_rect, logical_rect);
-@@ -15191,8 +15191,8 @@ public static final void pango_layout_line_get_extents(int /*long*/ line, PangoR
+@@ -15204,8 +15204,8 @@ public static final void pango_layout_line_get_extents(int /*long*/ line, PangoR
* @param index_ cast=(int *)
* @param trailing cast=(int *)
*/
@@ -28776,7 +28803,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_layout_line_x_to_index(line, x_pos, index_, trailing);
-@@ -15201,8 +15201,8 @@ public static final boolean pango_layout_line_x_to_index(int /*long*/ line, int
+@@ -15214,8 +15214,8 @@ public static final boolean pango_layout_line_x_to_index(int /*long*/ line, int
}
}
/** @param context cast=(PangoContext *) */
@@ -28787,7 +28814,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_layout_new(context);
-@@ -15211,8 +15211,8 @@ public static final int /*long*/ pango_layout_new(int /*long*/ context) {
+@@ -15224,8 +15224,8 @@ public static final int /*long*/ pango_layout_new(int /*long*/ context) {
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28798,7 +28825,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_layout_set_alignment(layout, alignment);
-@@ -15224,8 +15224,8 @@ public static final void pango_layout_set_alignment (int /*long*/ layout, int al
+@@ -15237,8 +15237,8 @@ public static final void pango_layout_set_alignment (int /*long*/ layout, int al
* @param layout cast=(PangoLayout *)
* @param attrs cast=(PangoAttrList *)
*/
@@ -28809,7 +28836,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_layout_set_attributes(layout, attrs);
-@@ -15234,8 +15234,8 @@ public static final void pango_layout_set_attributes(int /*long*/ layout, int /*
+@@ -15247,8 +15247,8 @@ public static final void pango_layout_set_attributes(int /*long*/ layout, int /*
}
}
/** @method flags=dynamic */
@@ -28820,7 +28847,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_layout_set_auto_dir(layout, auto_dir);
-@@ -15247,8 +15247,8 @@ public static final void pango_layout_set_auto_dir(int /*long*/ layout, boolean
+@@ -15260,8 +15260,8 @@ public static final void pango_layout_set_auto_dir(int /*long*/ layout, boolean
* @param context cast=(PangoLayout *)
* @param descr cast=(PangoFontDescription *)
*/
@@ -28831,7 +28858,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_layout_set_font_description(context, descr);
-@@ -15257,8 +15257,8 @@ public static final void pango_layout_set_font_description(int /*long*/ context,
+@@ -15270,8 +15270,8 @@ public static final void pango_layout_set_font_description(int /*long*/ context,
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28842,7 +28869,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_layout_set_indent(layout, indent);
-@@ -15267,8 +15267,8 @@ public static final void pango_layout_set_indent(int /*long*/ layout, int indent
+@@ -15280,8 +15280,8 @@ public static final void pango_layout_set_indent(int /*long*/ layout, int indent
}
}
/** @param layout cast=(PangoLayout*) */
@@ -28853,7 +28880,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_layout_set_justify(layout, justify);
-@@ -15280,8 +15280,8 @@ public static final void pango_layout_set_justify(int /*long*/ layout, boolean j
+@@ -15293,8 +15293,8 @@ public static final void pango_layout_set_justify(int /*long*/ layout, boolean j
* @param context cast=(PangoLayout *)
* @param setting cast=(gboolean)
*/
@@ -28864,7 +28891,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_layout_set_single_paragraph_mode(context, setting);
-@@ -15290,8 +15290,8 @@ public static final void pango_layout_set_single_paragraph_mode(int /*long*/ con
+@@ -15303,8 +15303,8 @@ public static final void pango_layout_set_single_paragraph_mode(int /*long*/ con
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28875,7 +28902,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_layout_set_spacing(layout, spacing);
-@@ -15303,8 +15303,8 @@ public static final void pango_layout_set_spacing(int /*long*/ layout, int spaci
+@@ -15316,8 +15316,8 @@ public static final void pango_layout_set_spacing(int /*long*/ layout, int spaci
* @param layout cast=(PangoLayout *)
* @param tabs cast=(PangoTabArray *)
*/
@@ -28886,7 +28913,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_layout_set_tabs(layout, tabs);
-@@ -15317,8 +15317,8 @@ public static final void pango_layout_set_tabs(int /*long*/ layout, int /*long*/
+@@ -15330,8 +15330,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)
*/
@@ -28897,7 +28924,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_layout_set_text(layout, text, length);
-@@ -15327,8 +15327,8 @@ public static final void pango_layout_set_text(int /*long*/ layout, byte[] text,
+@@ -15340,8 +15340,8 @@ public static final void pango_layout_set_text(int /*long*/ layout, byte[] text,
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28908,7 +28935,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_layout_set_width(layout, width);
-@@ -15337,8 +15337,8 @@ public static final void pango_layout_set_width(int /*long*/ layout, int width)
+@@ -15350,8 +15350,8 @@ public static final void pango_layout_set_width(int /*long*/ layout, int width)
}
}
/** @param layout cast=(PangoLayout *) */
@@ -28919,7 +28946,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_layout_set_wrap(layout, wrap);
-@@ -15351,8 +15351,8 @@ public static final void pango_layout_set_wrap (int /*long*/ layout, int wrap) {
+@@ -15364,8 +15364,8 @@ public static final void pango_layout_set_wrap (int /*long*/ layout, int wrap) {
* @param index cast=(int *)
* @param trailing cast=(int *)
*/
@@ -28930,7 +28957,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_layout_xy_to_index(layout, x, y, index, trailing);
-@@ -15361,8 +15361,8 @@ public static final boolean pango_layout_xy_to_index(int /*long*/ layout, int x,
+@@ -15374,8 +15374,8 @@ public static final boolean pango_layout_xy_to_index(int /*long*/ layout, int x,
}
}
/** @param tab_array cast=(PangoTabArray *) */
@@ -28941,7 +28968,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_tab_array_get_size(tab_array);
-@@ -15375,8 +15375,8 @@ public static final int pango_tab_array_get_size(int /*long*/ tab_array) {
+@@ -15388,8 +15388,8 @@ public static final int pango_tab_array_get_size(int /*long*/ tab_array) {
* @param alignments cast=(PangoTabAlign **)
* @param locations cast=(int **)
*/
@@ -28952,7 +28979,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_tab_array_get_tabs(tab_array, alignments, locations);
-@@ -15385,8 +15385,8 @@ public static final void pango_tab_array_get_tabs(int /*long*/ tab_array, int /*
+@@ -15398,8 +15398,8 @@ public static final void pango_tab_array_get_tabs(int /*long*/ tab_array, int /*
}
}
/** @param tab_array cast=(PangoTabArray *) */
@@ -28963,7 +28990,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_tab_array_free(tab_array);
-@@ -15398,8 +15398,8 @@ public static final void pango_tab_array_free(int /*long*/ tab_array) {
+@@ -15411,8 +15411,8 @@ public static final void pango_tab_array_free(int /*long*/ tab_array) {
* @param initial_size cast=(gint)
* @param positions_in_pixels cast=(gboolean)
*/
@@ -28974,7 +29001,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _pango_tab_array_new(initial_size, positions_in_pixels);
-@@ -15413,8 +15413,8 @@ public static final int /*long*/ pango_tab_array_new(int initial_size, boolean p
+@@ -15426,8 +15426,8 @@ public static final int /*long*/ pango_tab_array_new(int initial_size, boolean p
* @param alignment cast=(PangoTabAlign)
* @param location cast=(gint)
*/
@@ -28985,7 +29012,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
_pango_tab_array_set_tab(tab_array, tab_index, alignment, location);
-@@ -15425,8 +15425,8 @@ public static final void pango_tab_array_set_tab(int /*long*/ tab_array, int tab
+@@ -15438,8 +15438,8 @@ public static final void pango_tab_array_set_tab(int /*long*/ tab_array, int tab
/**
* @method flags=dynamic
*/
@@ -28996,7 +29023,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _ubuntu_menu_proxy_get();
-@@ -15440,8 +15440,8 @@ public static final int /*long*/ ubuntu_menu_proxy_get() {
+@@ -15453,8 +15453,8 @@ public static final int /*long*/ ubuntu_menu_proxy_get() {
* @param relationship cast=(AtkRelationType)
* @param target cast=(AtkObject *)
*/
@@ -29007,7 +29034,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _atk_object_add_relationship(object, relationship, target);
-@@ -15455,8 +15455,8 @@ public static final boolean atk_object_add_relationship (int /*long*/ object, in
+@@ -15468,8 +15468,8 @@ public static final boolean atk_object_add_relationship (int /*long*/ object, in
* @param relationship cast=(AtkRelationType)
* @param target cast=(AtkObject *)
*/
@@ -29018,7 +29045,7 @@ index 62bc7a8..eb1efa2 100644
lock.lock();
try {
return _atk_object_remove_relationship(object, relationship, target);
-@@ -15480,5 +15480,5 @@ public static final int access (byte [] path, int amode) {
+@@ -15493,5 +15493,5 @@ public static final int access (byte [] path, int amode) {
* @param s1 cast=(const char*)
* @param s2 cast=(const char*)
*/
@@ -39712,7 +39739,7 @@ index 1c81599..8b89a82 100644
public static final int sizeof = WebKitGTK.JSClassDefinition_sizeof();
}
diff --git a/org/eclipse/swt/internal/webkit/WebKitGTK.java b/org/eclipse/swt/internal/webkit/WebKitGTK.java
-index 52ba697..b051d46 100644
+index c648f6d..6767170 100644
--- a/org/eclipse/swt/internal/webkit/WebKitGTK.java
+++ b/org/eclipse/swt/internal/webkit/WebKitGTK.java
@@ -90,8 +90,8 @@ protected static byte [] ascii (String name) {
@@ -40368,6 +40395,17 @@ index 52ba697..b051d46 100644
}
/** @method flags=dynamic */
+-public static final native int /*long*/ _webkit_download_get_network_request (int /*long*/ download);
+-public static final int /*long*/ webkit_download_get_network_request (int /*long*/ download) {
++public static final native long /*int*/ _webkit_download_get_network_request (long /*int*/ download);
++public static final long /*int*/ webkit_download_get_network_request (long /*int*/ download) {
+ lock.lock();
+ try {
+ return _webkit_download_get_network_request (download);
+@@ -754,8 +754,8 @@ public static final int /*long*/ webkit_download_get_network_request (int /*long
+ }
+
+ /** @method flags=dynamic */
-public static final native int _webkit_download_get_status (int /*long*/ download);
-public static final int webkit_download_get_status (int /*long*/ download) {
+public static final native int _webkit_download_get_status (long /*int*/ download);
@@ -40375,7 +40413,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_download_get_status (download);
-@@ -754,8 +754,8 @@ public static final int webkit_download_get_status (int /*long*/ download) {
+@@ -765,8 +765,8 @@ public static final int webkit_download_get_status (int /*long*/ download) {
}
/** @method flags=dynamic */
@@ -40386,7 +40424,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_download_get_suggested_filename (download);
-@@ -765,8 +765,8 @@ public static final int /*long*/ webkit_download_get_suggested_filename (int /*l
+@@ -776,8 +776,8 @@ public static final int /*long*/ webkit_download_get_suggested_filename (int /*l
}
/** @method flags=dynamic */
@@ -40397,7 +40435,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_download_get_total_size (download);
-@@ -776,8 +776,8 @@ public static final long webkit_download_get_total_size (int /*long*/ download)
+@@ -787,8 +787,8 @@ public static final long webkit_download_get_total_size (int /*long*/ download)
}
/** @method flags=dynamic */
@@ -40408,7 +40446,18 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_download_get_uri (download);
-@@ -787,8 +787,8 @@ public static final int /*long*/ webkit_download_get_uri (int /*long*/ download)
+@@ -798,8 +798,8 @@ public static final int /*long*/ webkit_download_get_uri (int /*long*/ download)
+ }
+
+ /** @method flags=dynamic */
+-public static final native int /*long*/ _webkit_download_new (int /*long*/ request);
+-public static final int /*long*/ webkit_download_new (int /*long*/ request) {
++public static final native long /*int*/ _webkit_download_new (long /*int*/ request);
++public static final long /*int*/ webkit_download_new (long /*int*/ request) {
+ lock.lock();
+ try {
+ return _webkit_download_new (request);
+@@ -809,8 +809,8 @@ public static final int /*long*/ webkit_download_new (int /*long*/ request) {
}
/** @method flags=dynamic */
@@ -40419,7 +40468,18 @@ index 52ba697..b051d46 100644
lock.lock();
try {
_webkit_download_set_destination_uri (download, destination_uri);
-@@ -798,8 +798,8 @@ public static final void webkit_download_set_destination_uri (int /*long*/ downl
+@@ -820,8 +820,8 @@ public static final void webkit_download_set_destination_uri (int /*long*/ downl
+ }
+
+ /** @method flags=dynamic */
+-public static final native void _webkit_download_start (int /*long*/ download);
+-public static final void webkit_download_start (int /*long*/ download) {
++public static final native void _webkit_download_start (long /*int*/ download);
++public static final void webkit_download_start (long /*int*/ download) {
+ lock.lock();
+ try {
+ _webkit_download_start (download);
+@@ -831,8 +831,8 @@ public static final void webkit_download_start (int /*long*/ download) {
}
/** @method flags=dynamic */
@@ -40430,7 +40490,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_get_default_session ();
-@@ -842,8 +842,8 @@ public static final int webkit_minor_version () {
+@@ -875,8 +875,8 @@ public static final int webkit_minor_version () {
}
/** @method flags=dynamic */
@@ -40441,7 +40501,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_network_request_get_message (request);
-@@ -853,8 +853,8 @@ public static final int /*long*/ webkit_network_request_get_message (int /*long*
+@@ -886,8 +886,8 @@ public static final int /*long*/ webkit_network_request_get_message (int /*long*
}
/** @method flags=dynamic */
@@ -40452,7 +40512,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_network_request_get_uri (request);
-@@ -864,8 +864,8 @@ public static final int /*long*/ webkit_network_request_get_uri (int /*long*/ re
+@@ -897,8 +897,8 @@ public static final int /*long*/ webkit_network_request_get_uri (int /*long*/ re
}
/** @method flags=dynamic */
@@ -40463,7 +40523,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_network_request_new (uri);
-@@ -875,8 +875,8 @@ public static final int /*long*/ webkit_network_request_new (byte[] uri) {
+@@ -908,8 +908,8 @@ public static final int /*long*/ webkit_network_request_new (byte[] uri) {
}
/** @method flags=dynamic */
@@ -40474,7 +40534,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_soup_auth_dialog_get_type ();
-@@ -886,8 +886,8 @@ public static final int /*long*/ webkit_soup_auth_dialog_get_type () {
+@@ -919,8 +919,8 @@ public static final int /*long*/ webkit_soup_auth_dialog_get_type () {
}
/** @method flags=dynamic */
@@ -40485,7 +40545,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_data_source_get_data (data_source);
-@@ -897,8 +897,8 @@ public static final int /*long*/ webkit_web_data_source_get_data (int /*long*/ d
+@@ -930,8 +930,8 @@ public static final int /*long*/ webkit_web_data_source_get_data (int /*long*/ d
}
/** @method flags=dynamic */
@@ -40496,7 +40556,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_data_source_get_encoding (data_source);
-@@ -908,8 +908,8 @@ public static final int /*long*/ webkit_web_data_source_get_encoding (int /*long
+@@ -941,8 +941,8 @@ public static final int /*long*/ webkit_web_data_source_get_encoding (int /*long
}
/** @method flags=dynamic */
@@ -40507,7 +40567,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_frame_get_data_source (frame);
-@@ -919,8 +919,8 @@ public static final int /*long*/ webkit_web_frame_get_data_source (int /*long*/
+@@ -952,8 +952,8 @@ public static final int /*long*/ webkit_web_frame_get_data_source (int /*long*/
}
/** @method flags=dynamic */
@@ -40518,7 +40578,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_frame_get_global_context (frame);
-@@ -930,8 +930,8 @@ public static final int /*long*/ webkit_web_frame_get_global_context (int /*long
+@@ -963,8 +963,8 @@ public static final int /*long*/ webkit_web_frame_get_global_context (int /*long
}
/** @method flags=dynamic */
@@ -40529,7 +40589,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_frame_get_load_status (frame);
-@@ -941,8 +941,8 @@ public static final int webkit_web_frame_get_load_status (int /*long*/ frame) {
+@@ -974,8 +974,8 @@ public static final int webkit_web_frame_get_load_status (int /*long*/ frame) {
}
/** @method flags=dynamic */
@@ -40540,7 +40600,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_frame_get_parent (frame);
-@@ -952,8 +952,8 @@ public static final int /*long*/ webkit_web_frame_get_parent (int /*long*/ frame
+@@ -985,8 +985,8 @@ public static final int /*long*/ webkit_web_frame_get_parent (int /*long*/ frame
}
/** @method flags=dynamic */
@@ -40551,7 +40611,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_frame_get_title (frame);
-@@ -963,8 +963,8 @@ public static final int /*long*/ webkit_web_frame_get_title (int /*long*/ frame)
+@@ -996,8 +996,8 @@ public static final int /*long*/ webkit_web_frame_get_title (int /*long*/ frame)
}
/** @method flags=dynamic */
@@ -40562,7 +40622,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_frame_get_type ();
-@@ -974,8 +974,8 @@ public static final int /*long*/ webkit_web_frame_get_type () {
+@@ -1007,8 +1007,8 @@ public static final int /*long*/ webkit_web_frame_get_type () {
}
/** @method flags=dynamic */
@@ -40573,7 +40633,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_frame_get_uri (frame);
-@@ -985,8 +985,8 @@ public static final int /*long*/ webkit_web_frame_get_uri (int /*long*/ frame) {
+@@ -1018,8 +1018,8 @@ public static final int /*long*/ webkit_web_frame_get_uri (int /*long*/ frame) {
}
/** @method flags=dynamic */
@@ -40584,7 +40644,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_frame_get_web_view (frame);
-@@ -996,8 +996,8 @@ public static final int /*long*/ webkit_web_frame_get_web_view (int /*long*/ fra
+@@ -1029,8 +1029,8 @@ public static final int /*long*/ webkit_web_frame_get_web_view (int /*long*/ fra
}
/** @method flags=dynamic */
@@ -40595,7 +40655,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
_webkit_web_policy_decision_download (decision);
-@@ -1007,8 +1007,8 @@ public static final void webkit_web_policy_decision_download (int /*long*/ decis
+@@ -1040,8 +1040,8 @@ public static final void webkit_web_policy_decision_download (int /*long*/ decis
}
/** @method flags=dynamic */
@@ -40606,7 +40666,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
_webkit_web_policy_decision_ignore (decision);
-@@ -1018,8 +1018,8 @@ public static final void webkit_web_policy_decision_ignore (int /*long*/ decisio
+@@ -1051,8 +1051,8 @@ public static final void webkit_web_policy_decision_ignore (int /*long*/ decisio
}
/** @method flags=dynamic */
@@ -40617,7 +40677,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_view_can_go_back (web_view);
-@@ -1029,8 +1029,8 @@ public static final int webkit_web_view_can_go_back (int /*long*/ web_view) {
+@@ -1062,8 +1062,8 @@ public static final int webkit_web_view_can_go_back (int /*long*/ web_view) {
}
/** @method flags=dynamic */
@@ -40628,7 +40688,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_view_can_go_forward (web_view);
-@@ -1040,8 +1040,8 @@ public static final int webkit_web_view_can_go_forward (int /*long*/ web_view) {
+@@ -1073,8 +1073,8 @@ public static final int webkit_web_view_can_go_forward (int /*long*/ web_view) {
}
/** @method flags=dynamic */
@@ -40639,7 +40699,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_view_can_show_mime_type (web_view, mime_type);
-@@ -1051,8 +1051,8 @@ public static final int webkit_web_view_can_show_mime_type (int /*long*/ web_vie
+@@ -1084,8 +1084,8 @@ public static final int webkit_web_view_can_show_mime_type (int /*long*/ web_vie
}
/** @method flags=dynamic */
@@ -40650,7 +40710,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
_webkit_web_view_execute_script (web_view, script);
-@@ -1062,8 +1062,8 @@ public static final void webkit_web_view_execute_script (int /*long*/ web_view,
+@@ -1095,8 +1095,8 @@ public static final void webkit_web_view_execute_script (int /*long*/ web_view,
}
/** @method flags=dynamic */
@@ -40661,7 +40721,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_view_get_dom_document (web_view);
-@@ -1073,8 +1073,8 @@ public static final int /*long*/ webkit_web_view_get_dom_document (int /*long*/
+@@ -1106,8 +1106,8 @@ public static final int /*long*/ webkit_web_view_get_dom_document (int /*long*/
}
/** @method flags=dynamic */
@@ -40672,7 +40732,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_view_get_load_status (web_view);
-@@ -1084,8 +1084,8 @@ public static final int webkit_web_view_get_load_status (int /*long*/ web_view)
+@@ -1117,8 +1117,8 @@ public static final int webkit_web_view_get_load_status (int /*long*/ web_view)
}
/** @method flags=dynamic */
@@ -40683,7 +40743,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_view_get_main_frame (web_view);
-@@ -1095,8 +1095,8 @@ public static final int /*long*/ webkit_web_view_get_main_frame (int /*long*/ we
+@@ -1128,8 +1128,8 @@ public static final int /*long*/ webkit_web_view_get_main_frame (int /*long*/ we
}
/** @method flags=dynamic */
@@ -40694,7 +40754,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_view_get_progress (web_view);
-@@ -1106,8 +1106,8 @@ public static final double webkit_web_view_get_progress (int /*long*/ web_view)
+@@ -1139,8 +1139,8 @@ public static final double webkit_web_view_get_progress (int /*long*/ web_view)
}
/** @method flags=dynamic */
@@ -40705,7 +40765,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_view_get_settings (web_view);
-@@ -1117,8 +1117,8 @@ public static final int /*long*/ webkit_web_view_get_settings (int /*long*/ web_
+@@ -1150,8 +1150,8 @@ public static final int /*long*/ webkit_web_view_get_settings (int /*long*/ web_
}
/** @method flags=dynamic */
@@ -40716,7 +40776,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_view_get_title (web_view);
-@@ -1128,8 +1128,8 @@ public static final int /*long*/ webkit_web_view_get_title (int /*long*/ web_vie
+@@ -1161,8 +1161,8 @@ public static final int /*long*/ webkit_web_view_get_title (int /*long*/ web_vie
}
/** @method flags=dynamic */
@@ -40727,7 +40787,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_view_get_type ();
-@@ -1139,8 +1139,8 @@ public static final int /*long*/ webkit_web_view_get_type () {
+@@ -1172,8 +1172,8 @@ public static final int /*long*/ webkit_web_view_get_type () {
}
/** @method flags=dynamic */
@@ -40738,7 +40798,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_view_get_uri (web_view);
-@@ -1150,8 +1150,8 @@ public static final int /*long*/ webkit_web_view_get_uri (int /*long*/ web_view)
+@@ -1183,8 +1183,8 @@ public static final int /*long*/ webkit_web_view_get_uri (int /*long*/ web_view)
}
/** @method flags=dynamic */
@@ -40749,7 +40809,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_view_get_window_features (web_view);
-@@ -1161,8 +1161,8 @@ public static final int /*long*/ webkit_web_view_get_window_features (int /*long
+@@ -1194,8 +1194,8 @@ public static final int /*long*/ webkit_web_view_get_window_features (int /*long
}
/** @method flags=dynamic */
@@ -40760,7 +40820,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
_webkit_web_view_go_back (web_view);
-@@ -1172,8 +1172,8 @@ public static final void webkit_web_view_go_back (int /*long*/ web_view) {
+@@ -1205,8 +1205,8 @@ public static final void webkit_web_view_go_back (int /*long*/ web_view) {
}
/** @method flags=dynamic */
@@ -40771,7 +40831,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
_webkit_web_view_go_forward (web_view);
-@@ -1183,8 +1183,8 @@ public static final void webkit_web_view_go_forward (int /*long*/ web_view) {
+@@ -1216,8 +1216,8 @@ public static final void webkit_web_view_go_forward (int /*long*/ web_view) {
}
/** @method flags=dynamic */
@@ -40782,7 +40842,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
_webkit_web_view_load_string (web_view, content, mime_type, encoding, base_uri);
-@@ -1194,8 +1194,8 @@ public static final void webkit_web_view_load_string (int /*long*/ web_view, byt
+@@ -1227,8 +1227,8 @@ public static final void webkit_web_view_load_string (int /*long*/ web_view, byt
}
/** @method flags=dynamic */
@@ -40793,7 +40853,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
_webkit_web_view_load_uri (web_view, uri);
-@@ -1205,8 +1205,8 @@ public static final void webkit_web_view_load_uri (int /*long*/ web_view, byte[]
+@@ -1238,8 +1238,8 @@ public static final void webkit_web_view_load_uri (int /*long*/ web_view, byte[]
}
/** @method flags=dynamic */
@@ -40804,7 +40864,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _webkit_web_view_new ();
-@@ -1216,8 +1216,8 @@ public static final int /*long*/ webkit_web_view_new () {
+@@ -1249,8 +1249,8 @@ public static final int /*long*/ webkit_web_view_new () {
}
/** @method flags=dynamic */
@@ -40815,7 +40875,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
_webkit_web_view_reload (web_view);
-@@ -1227,8 +1227,8 @@ public static final void webkit_web_view_reload (int /*long*/ web_view) {
+@@ -1260,8 +1260,8 @@ public static final void webkit_web_view_reload (int /*long*/ web_view) {
}
/** @method flags=dynamic */
@@ -40826,7 +40886,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
_webkit_web_view_stop_loading (web_view);
-@@ -1246,14 +1246,14 @@ public static final native int JSClassDefinition_sizeof ();
+@@ -1279,14 +1279,14 @@ public static final native int JSClassDefinition_sizeof ();
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
@@ -40844,7 +40904,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _SoupCookie_expires (cookie);
-@@ -1267,8 +1267,8 @@ public static final int /*long*/ SoupCookie_expires (int /*long*/ cookie) {
+@@ -1300,8 +1300,8 @@ public static final int /*long*/ SoupCookie_expires (int /*long*/ cookie) {
* @param message cast=(SoupMessage *)
* @param method cast=(const char *)
*/
@@ -40855,7 +40915,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
_SoupMessage_method (message, method);
-@@ -1281,8 +1281,8 @@ public static final void SoupMessage_method (int /*long*/ message, int /*long*/
+@@ -1314,8 +1314,8 @@ public static final void SoupMessage_method (int /*long*/ message, int /*long*/
* @method flags=getter
* @param message cast=(SoupMessage *)
*/
@@ -40866,7 +40926,7 @@ index 52ba697..b051d46 100644
lock.lock();
try {
return _SoupMessage_request_body (message);
-@@ -1295,8 +1295,8 @@ public static final int /*long*/ SoupMessage_request_body (int /*long*/ message)
+@@ -1328,8 +1328,8 @@ public static final int /*long*/ SoupMessage_request_body (int /*long*/ message)
* @method flags=getter
* @param message cast=(SoupMessage *)
*/
@@ -42030,7 +42090,7 @@ index e602bc9..baca3ab 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 c4b4978..b870bfc 100644
+index e9ee34b..9efcdfc 100644
--- a/org/eclipse/swt/widgets/Combo.java
+++ b/org/eclipse/swt/widgets/Combo.java
@@ -57,9 +57,9 @@ import org.eclipse.swt.events.*;
@@ -42421,7 +42481,7 @@ index c4b4978..b870bfc 100644
if (imContext != 0) display.addWidget (imContext, this);
}
-@@ -1658,7 +1658,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
+@@ -1659,7 +1659,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
return super.setBounds (x, y, width, newHeight, move, resize);
}
@@ -42430,7 +42490,7 @@ index c4b4978..b870bfc 100644
super.setFontDescription (font);
if (entryHandle != 0) OS.gtk_widget_modify_font (entryHandle, font);
OS.g_object_set (textRenderer, OS.font_desc, font, 0);
-@@ -1828,7 +1828,7 @@ public void setSelection (Point selection) {
+@@ -1829,7 +1829,7 @@ public void setSelection (Point selection) {
if (selection == null) error (SWT.ERROR_NULL_ARGUMENT);
if ((style & SWT.READ_ONLY) != 0) return;
if (entryHandle != 0) {
@@ -42439,7 +42499,7 @@ index c4b4978..b870bfc 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);
-@@ -1884,7 +1884,7 @@ public void setText (String string) {
+@@ -1877,7 +1877,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)) {
@@ -42448,7 +42508,7 @@ index c4b4978..b870bfc 100644
string = verifyText (string, 0, (int)/*64*/OS.g_utf16_strlen (ptr, -1));
if (string == null) return;
}
-@@ -1964,9 +1964,9 @@ boolean translateTraversal (GdkEventKey keyEvent) {
+@@ -1957,9 +1957,9 @@ boolean translateTraversal (GdkEventKey keyEvent) {
switch (key) {
case OS.GDK_KP_Enter:
case OS.GDK_Return: {
@@ -42460,7 +42520,7 @@ index c4b4978..b870bfc 100644
OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);
if (preeditString [0] != 0) {
int length = OS.strlen (preeditString [0]);
-@@ -1985,7 +1985,7 @@ String verifyText (String string, int start, int end) {
+@@ -1978,7 +1978,7 @@ String verifyText (String string, int start, int end) {
event.text = string;
event.start = start;
event.end = end;
@@ -47195,7 +47255,7 @@ index 5eaf82f..7db8f17 100644
GtkRequisition requisition = new GtkRequisition();
OS.gtk_widget_size_request (vBarHandle, requisition);
diff --git a/org/eclipse/swt/widgets/Shell.java b/org/eclipse/swt/widgets/Shell.java
-index e4f6baf..1f9a3ee 100644
+index a5dc684..ceb09be 100644
--- a/org/eclipse/swt/widgets/Shell.java
+++ b/org/eclipse/swt/widgets/Shell.java
@@ -118,7 +118,7 @@ import org.eclipse.swt.events.*;
@@ -47616,10 +47676,10 @@ index e4f6baf..1f9a3ee 100644
}
- int /*long*/ oldTooltip = OS.gtk_widget_get_tooltip_text (rootWidget);
+ long /*int*/ oldTooltip = OS.gtk_widget_get_tooltip_text (rootWidget);
+ boolean same = false;
if (buffer == null && oldTooltip == 0) {
- return;
- } else if (buffer != null && oldTooltip != 0) {
-@@ -2411,12 +2411,12 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
+ 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.
*/
@@ -47636,7 +47696,7 @@ index e4f6baf..1f9a3ee 100644
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);
-@@ -2443,9 +2443,9 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
+@@ -2446,9 +2446,9 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
char [] chars = fixMnemonic (string, false);
buffer = Converter.wcsToMbcs (null, chars, true);
}
@@ -47648,7 +47708,7 @@ index e4f6baf..1f9a3ee 100644
if (string == null && oldTooltip == 0) {
return;
} else if (string != null && oldTooltip != 0) {
-@@ -2473,7 +2473,7 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
+@@ -2476,7 +2476,7 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
* where it's deprecated.
*/
OS.gtk_tooltips_force_window (tooltipsHandle);
@@ -47657,7 +47717,7 @@ index e4f6baf..1f9a3ee 100644
if (tipWindow != 0 && tipWindow != tooltipWindow) {
OS.g_signal_connect (tipWindow, OS.size_allocate, display.sizeAllocateProc, shellHandle);
tooltipWindow = tipWindow;
-@@ -2489,9 +2489,9 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
+@@ -2492,9 +2492,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];
@@ -47669,7 +47729,7 @@ index e4f6baf..1f9a3ee 100644
OS.gdk_window_get_user_data (window, user_data);
if (tipWidget == user_data [0]) {
/*
-@@ -2505,7 +2505,7 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
+@@ -2508,7 +2508,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);
@@ -50889,7 +50949,7 @@ index e470cd5..f16ac9a 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 735b54c..153dc0d 100644
+index bc01024..ed98002 100644
--- a/org/eclipse/swt/widgets/ToolItem.java
+++ b/org/eclipse/swt/widgets/ToolItem.java
@@ -38,8 +38,8 @@ import org.eclipse.swt.events.*;
@@ -50903,7 +50963,7 @@ index 735b54c..153dc0d 100644
ToolBar parent;
Control control;
Image hotImage, disabledImage;
-@@ -200,8 +200,8 @@ void createHandle (int index) {
+@@ -203,8 +203,8 @@ void createHandle (int index) {
* disabled when it does not contain menu. The fix is to
* find the arrow button handle and enable it.
*/
@@ -50998,25 +51058,23 @@ index 735b54c..153dc0d 100644
/*
* Feature in GTK. If the item is a radio/check button
* with only image, then that image does not appear in
-@@ -582,7 +582,7 @@ int /*long*/ gtk_create_menu_proxy (int /*long*/ widget) {
+@@ -582,12 +582,12 @@ int /*long*/ gtk_create_menu_proxy (int /*long*/ widget) {
if (imageList != null) {
int index = imageList.indexOf (image);
if (index != -1) {
- int /*long*/ pixbuf = imageList.getPixbuf (index);
+ long /*int*/ pixbuf = imageList.getPixbuf (index);
byte[] label = null;
- int [] showImages = new int [1];
- /*
-@@ -590,7 +590,7 @@ int /*long*/ gtk_create_menu_proxy (int /*long*/ widget) {
- * warnings to the console. If there is no text then the tooltip text
- * will be used for overflow menu items.
- */
--// int /*long*/ settings = OS.gtk_settings_get_default();
-+// long /*int*/ settings = OS.gtk_settings_get_default();
- // if (settings != 0) {
- // OS.g_object_get (settings, OS.gtk_menu_images, showImages, 0);
- // }
-@@ -613,8 +613,8 @@ int /*long*/ gtk_create_menu_proxy (int /*long*/ widget) {
+ int [] showImages = new int []{1};
+- int /*long*/ settings = OS.gtk_settings_get_default();
++ long /*int*/ settings = OS.gtk_settings_get_default();
+ if (settings != 0) {
+- int /*long*/ property = OS.g_object_class_find_property(OS.G_OBJECT_GET_CLASS(settings), OS.gtk_menu_images);
++ long /*int*/ property = OS.g_object_class_find_property(OS.G_OBJECT_GET_CLASS(settings), OS.gtk_menu_images);
+ if (property != 0) OS.g_object_get (settings, OS.gtk_menu_images, showImages, 0);
+ }
+
+@@ -609,8 +609,8 @@ int /*long*/ gtk_create_menu_proxy (int /*long*/ widget) {
else {
label = Converter.wcsToMbcs(null, text, true);
}
@@ -51027,7 +51085,7 @@ index 735b54c..153dc0d 100644
OS.gtk_image_menu_item_set_image (menuItem, menuImage);
OS.gtk_tool_item_set_proxy_menu_item (widget, buffer, menuItem);
/*
-@@ -631,7 +631,7 @@ int /*long*/ gtk_create_menu_proxy (int /*long*/ widget) {
+@@ -627,7 +627,7 @@ int /*long*/ gtk_create_menu_proxy (int /*long*/ widget) {
return 0;
}
@@ -51036,16 +51094,16 @@ index 735b54c..153dc0d 100644
parent.gtk_enter_notify_event (widget, event);
drawHotImage = (parent.style & SWT.FLAT) != 0 && hotImage != null;
if (drawHotImage) {
-@@ -639,7 +639,7 @@ int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {
+@@ -635,7 +635,7 @@ int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {
if (imageList != null) {
int index = imageList.indexOf (hotImage);
- if (index != -1) {
+ if (index != -1 && imageHandle != 0) {
- int /*long*/ pixbuf = imageList.getPixbuf (index);
+ long /*int*/ pixbuf = imageList.getPixbuf (index);
- imageHandle = OS.gtk_image_new_from_pixbuf (pixbuf);
- OS.gtk_widget_show (imageHandle);
- OS.gtk_tool_button_set_icon_widget (handle, imageHandle);
-@@ -649,7 +649,7 @@ int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {
+ OS.gtk_image_set_from_pixbuf(imageHandle, pixbuf);
+ }
+ }
+@@ -643,7 +643,7 @@ int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {
return 0;
}
@@ -51054,7 +51112,7 @@ index 735b54c..153dc0d 100644
GdkEvent event = new GdkEvent ();
OS.memmove (event, gdkEvent, GdkEvent.sizeof);
switch (event.type) {
-@@ -665,18 +665,18 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
+@@ -659,18 +659,18 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
return 0;
}
@@ -51076,16 +51134,16 @@ index 735b54c..153dc0d 100644
parent.gtk_leave_notify_event (widget, event);
if (drawHotImage) {
drawHotImage = false;
-@@ -685,7 +685,7 @@ int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) {
+@@ -679,7 +679,7 @@ int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) {
if (imageList != null) {
int index = imageList.indexOf (image);
- if (index != -1) {
+ if (index != -1 && imageHandle != 0) {
- int /*long*/ pixbuf = imageList.getPixbuf (index);
+ long /*int*/ pixbuf = imageList.getPixbuf (index);
- imageHandle = OS.gtk_image_new_from_pixbuf (pixbuf);
- OS.gtk_widget_show (imageHandle);
- OS.gtk_tool_button_set_icon_widget (handle, imageHandle);
-@@ -696,12 +696,12 @@ int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) {
+ OS.gtk_image_set_from_pixbuf(imageHandle, pixbuf);
+ }
+ }
+@@ -688,12 +688,12 @@ int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) {
return 0;
}
@@ -51100,7 +51158,7 @@ index 735b54c..153dc0d 100644
return parent.gtk_mnemonic_activate (widget, arg1);
}
-@@ -716,7 +716,7 @@ void hookEvents () {
+@@ -708,7 +708,7 @@ void hookEvents () {
*/
eventHandle = OS.gtk_bin_get_child(handle);
if ((style & SWT.DROP_DOWN) != 0 && OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) {
@@ -51109,7 +51167,7 @@ index 735b54c..153dc0d 100644
eventHandle = OS.g_list_nth_data(list, 0);
if (arrowHandle != 0) OS.g_signal_connect_closure (arrowHandle, OS.clicked, display.closures [CLICKED], false);
}
-@@ -745,7 +745,7 @@ void hookEvents () {
+@@ -737,7 +737,7 @@ void hookEvents () {
OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [BUTTON_RELEASE_EVENT], 0, display.closures [BUTTON_RELEASE_EVENT], false);
OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [EVENT_AFTER], 0, display.closures[EVENT_AFTER], false);
@@ -51118,7 +51176,7 @@ index 735b54c..153dc0d 100644
OS.g_signal_connect_closure_by_id (topHandle, display.signalIds [MAP], 0, display.closures [MAP], true);
}
-@@ -927,7 +927,7 @@ public void setDisabledImage (Image image) {
+@@ -919,7 +919,7 @@ public void setDisabledImage (Image image) {
*/
public void setEnabled (boolean enabled) {
checkWidget();
@@ -51127,7 +51185,7 @@ index 735b54c..153dc0d 100644
if (OS.GTK_WIDGET_SENSITIVE (topHandle) == enabled) return;
OS.gtk_widget_set_sensitive (topHandle, enabled);
if (enabled) {
-@@ -961,7 +961,7 @@ boolean setFocus () {
+@@ -953,7 +953,7 @@ boolean setFocus () {
return OS.gtk_widget_child_focus (handle, OS.GTK_DIR_TAB_FORWARD);
}
@@ -51136,15 +51194,15 @@ index 735b54c..153dc0d 100644
if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font);
}
-@@ -1015,7 +1015,7 @@ public void setImage (Image image) {
+@@ -1007,7 +1007,7 @@ public void setImage (Image image) {
} else {
imageList.put (imageIndex, image);
}
- int /*long*/ pixbuf = imageList.getPixbuf (imageIndex);
+ long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
- imageHandle = OS.gtk_image_new_from_pixbuf (pixbuf);
- OS.gtk_widget_show (imageHandle);
+ OS.gtk_image_set_from_pixbuf(imageHandle, pixbuf);
} else {
+ OS.gtk_image_set_from_pixbuf(imageHandle, 0);
diff --git a/org/eclipse/swt/widgets/ToolTip.java b/org/eclipse/swt/widgets/ToolTip.java
index 725ba5a..7153dbb 100644
--- a/org/eclipse/swt/widgets/ToolTip.java
--
Debian packaging for swt-gtk.
More information about the pkg-java-commits
mailing list